1 files changed, 82 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2012-April/004381.html b/zarb-ml/mageia-sysadm/2012-April/004381.html
new file mode 100644
index 000000000..c147a5931
--- /dev/null
+++ b/zarb-ml/mageia-sysadm/2012-April/004381.html
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+ <HEAD>
+   <TITLE> [Mageia-sysadm] Storage space on mageia servers
+   </TITLE>
+   <LINK REL="Index" HREF="index.html" >
+   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20Storage%20space%20on%20mageia%20servers&In-Reply-To=%3C201204031621.28813.alien%40rmail.be%3E">
+   <META NAME="robots" CONTENT="index,nofollow">
+   <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
+   <LINK REL="Previous"  HREF="004385.html">
+   <LINK REL="Next"  HREF="004382.html">
+ </HEAD>
+ <BODY BGCOLOR="#ffffff">
+   <H1>[Mageia-sysadm] Storage space on mageia servers</H1>
+    <B>Maarten Vanraes</B> 
+    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20Storage%20space%20on%20mageia%20servers&In-Reply-To=%3C201204031621.28813.alien%40rmail.be%3E"
+       TITLE="[Mageia-sysadm] Storage space on mageia servers">alien at rmail.be
+       </A><BR>
+    <I>Tue Apr  3 16:21:28 CEST 2012</I>
+    <P><UL>
+        <LI>Previous message: <A HREF="004385.html">[Mageia-sysadm] Storage space on mageia servers
+</A></li>
+        <LI>Next message: <A HREF="004382.html">[Mageia-sysadm] Storage space on mageia servers
+</A></li>
+         <LI> <B>Messages sorted by:</B> 
+              <a href="date.html#4381">[ date ]</a>
+              <a href="thread.html#4381">[ thread ]</a>
+              <a href="subject.html#4381">[ subject ]</a>
+              <a href="author.html#4381">[ author ]</a>
+         </LI>
+       </UL>
+    <HR>  
+<!--beginarticle-->
+<PRE>Op dinsdag 03 april 2012 14:59:17 schreef nicolas vigier:
+[...]
+&gt;<i> To do that, I think a simple solution would be to use WebDAV :
+</I>[...]
+
+not really on-topic, but is there a good webdav client? i remember being asked 
+in $dayjob to do it, but i gave up on webdav... (of course it might be because 
+the users would be using windows maybe)
+</PRE>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!--endarticle-->
+    <HR>
+    <P><UL>
+        <!--threads-->
+	<LI>Previous message: <A HREF="004385.html">[Mageia-sysadm] Storage space on mageia servers
+</A></li>
+	<LI>Next message: <A HREF="004382.html">[Mageia-sysadm] Storage space on mageia servers
+</A></li>
+         <LI> <B>Messages sorted by:</B> 
+              <a href="date.html#4381">[ date ]</a>
+              <a href="thread.html#4381">[ thread ]</a>
+              <a href="subject.html#4381">[ subject ]</a>
+              <a href="author.html#4381">[ author ]</a>
+         </LI>
+       </UL>
+
+<hr>
+<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
+mailing list</a><br>
+</body></html>
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index bb832b366..c2e65c829 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -1,61 +1,112 @@
 # KTranslator Generated File
-# KTranslator Generated File
-# SOME DESCRIPTIVE TITLE.
-# Copyright (c) 1999 MandrakeSoft
-# FIRST AUTHOR <EMAIL@ADDRESS>, 1999.
+# Copyright (c) 1999-2000 MandrakeSoft
+# Schalk. W. Cronj� <schalkc@ntaba.co.za>, 2000
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-04 18:38+0200\n"
-"PO-Revision-Date: 2000-05-17 16:26+0100\n"
-"Last-Translator: Schalk. W. Cronj� <schalkc@ntaba.co.za>\n"
-"Language-Team: Afrikaans <mandrake@af.org.za>\n"
+"POT-Creation-Date: 2000-10-09 15:58+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KTranslator v 0.4.0\n"
+"Content-Transfer-Encoding:8bit\n"
+"X-Generator: KTranslator v 0.6.0\n"
 
-#: ../../Xconfigurator.pm_.c:116 ../../Xconfigurator.pm_.c:236
-msgid "Generic"
-msgstr "Generies"
-
-#
-#: ../../Xconfigurator.pm_.c:172
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Videokaart"
 
-#: ../../Xconfigurator.pm_.c:172
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Selekteer 'n videokaart"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Kies 'n X-bediener"
 
-#
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X-bediener"
 
-#: ../../Xconfigurator.pm_.c:198
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Watter tipe XFree-konfigurasie verlang u?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"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:234 ../../Xconfigurator.pm_.c:257
+#, 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:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s met 3D-hardwareversnelling"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"Hierdie kaart kan ondersteuning vir 3D-hardewareversnelling onder XFree86 %s "
+"bied,\n"
+"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:248
+#, 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 ""
+"Hierdie kaart kan ondersteuning vir 3D-hardewareversnelling onder XFree86 %s "
+"bied,\n"
+"MAAR LET DAAROP DAT DIT EKSPERIMENTEEL IS EN DIE REKENAAR MAG VRIES."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s met EKSPERIMENTELE 3D-hardewareversnelling"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "XFree-konfigurasie"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Kies die geheue grootte van u videokaart"
 
-#: ../../Xconfigurator.pm_.c:225
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Selekteer opsies vir bediener"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Kies 'n monitor"
 
-#
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -77,41 +128,40 @@ msgstr ""
 "monitor spesifiseer nie, dit kan die monitor beskadig. Indien u twyfel,\n"
 "kies konservatief."
 
-#: ../../Xconfigurator.pm_.c:246
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Horisontale verfristempo"
 
-#: ../../Xconfigurator.pm_.c:246
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Vertikale verfristempo"
 
-#: ../../Xconfigurator.pm_.c:285
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Monitor is nie opgestel nie"
 
-#: ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Grafikakaart is nog nie konfigureer nie"
 
-#: ../../Xconfigurator.pm_.c:291
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Resolusie is nog nie gekies nie"
 
-#: ../../Xconfigurator.pm_.c:304
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Wil u die konfigurasie toets?"
 
-#: ../../Xconfigurator.pm_.c:308
-msgid "Warning: testing is dangerous on this graphic card"
+#
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Waarskuwing: Toetsing is gevaarlik met hierdie videokaart"
 
-#
-#: ../../Xconfigurator.pm_.c:311
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Toets konfigurasie"
 
-#
-#: ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -119,189 +169,172 @@ msgstr ""
 "\n"
 "probeer van die parameters verander"
 
-#
-#: ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Daar was 'n fout:"
 
-#: ../../Xconfigurator.pm_.c:373
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "uitgang binne %ds"
 
-#
-#: ../../Xconfigurator.pm_.c:377
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "Is dit korrek?"
 
-#
-#: ../../Xconfigurator.pm_.c:385
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Hier is fout, probeer van die parameters verander"
 
-#: ../../Xconfigurator.pm_.c:393 ../../Xconfigurator.pm_.c:574
-msgid "Automatic resolutions"
-msgstr "Outomatiese resolusies"
-
-#: ../../Xconfigurator.pm_.c:394
-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"
-msgstr ""
-"Ek gaan nou probeer m die beskikbare resolusies te kry.\n"
-"Die skerm sal 'n paar maal flits...\n"
-"U kan die skerm afsit indien u wil, ek sal biep wanneer ek klaar is"
-
-#: ../../Xconfigurator.pm_.c:452 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Resolusie"
 
-#
-#: ../../Xconfigurator.pm_.c:487
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Kies die resolusie en kleurdiepte"
 
-#: ../../Xconfigurator.pm_.c:489
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Videokaart: %s"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 bediener: %s"
 
-#: ../../Xconfigurator.pm_.c:499
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Vertoon almal"
 
-#
-#: ../../Xconfigurator.pm_.c:523
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Resolusies"
 
-#: ../../Xconfigurator.pm_.c:575
-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?"
-msgstr ""
-"Ek kan probeer om al die beskikbare resolusies te kry (bv. 800x600).\n"
-"Soms kan die rekenaar ophang.\n"
-"Wil u probeer?"
-
-#: ../../Xconfigurator.pm_.c:580
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Geen geldige modes was gevind nie\n"
-"Probeer 'n ander videokaart of monitor"
-
-#: ../../Xconfigurator.pm_.c:920
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Sleutelbord uitleg: %s\n"
 
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Muistipe: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Muistoestel: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HoriSink: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertVerfris: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Videokaart: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Video geheue: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "Kleurdiepte: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Resolusie: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 bediener: %s\n"
 
-#: ../../Xconfigurator.pm_.c:943
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86-drywer: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "X-Window konfigurasie word opgestel"
 
-#: ../../Xconfigurator.pm_.c:957
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Verander monitor"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Verander videokaart"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Verander bedienerinstellings"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Verander resolusie"
 
-#: ../../Xconfigurator.pm_.c:961
-msgid "Automatical resolutions search"
-msgstr "Outomatiese resolusie soektog"
-
-#: ../../Xconfigurator.pm_.c:965
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Vertoon inligting"
 
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Toets weer"
 
-#: ../../Xconfigurator.pm_.c:967 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Verlaat"
 
-#: ../../Xconfigurator.pm_.c:971 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Wat wil u doen?"
 
-#: ../../Xconfigurator.pm_.c:978
-msgid "Forget the changes?"
-msgstr "Vergeet van die veranderinge?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"Behou die veranderinge?\n"
+"Huidige konfigurasie is:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:996
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Teken asb. weer in %s om veranderinge te aktiveer"
 
-#: ../../Xconfigurator.pm_.c:1012
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Teken uit en gebruik dan Ctrl-Alt-Backspace"
 
-#: ../../Xconfigurator.pm_.c:1015
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X met herlaai"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -309,235 +342,223 @@ msgstr ""
 "Ek kan u rekenaar so opstel om X outomaties te laai.\n"
 "Wil u X begin met 'n herlaai?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Outointeken"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+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."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Kies die verstek gebruiker:"
+
+#
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "Kies die vensterbestuurder om te loop:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 kleure (8 bis)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32-duisend kleure (15 bis)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65-duisend kleure (16 bis)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16-miljoen kleure (24 bis)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 biljoen kleure (32 bis)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16MB of meer"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standaard VGA,  640x480 teen 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 teen 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514-aanpasbaar, 1024x768 teen 87Hz interverweef (nie 800x600 nie)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Hod frekwensie SVGA, 1024x768 teen 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frekwensie wat 1280x1024 kan doen teen 60Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frekwensie wat 1280x1024 kan doen teen 74Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frekwensie wat 1280x1024 kan doen teen 76Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor wat 1600x1220 kan doen teen 70Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor wat 1600x1220 kan doen teen 76Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "krul"
-
-#
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "Verstek"
-
-#
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "das"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "brunette"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "meisie"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "blondine"
-
-#
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "outowonder"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Eerste sektor van herlaaipartisie"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Eerste sektor van skyf (MBR)"
 
-#
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "LILO/grub installasie"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "SILO installasie"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Waar wil u die herlaaistelsel installeer"
 
-#
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub installasie"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Niks"
 
-#
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Watter herlaaistelsel(s) wil u gebruik?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Herlaaiprogram installasie"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Herlaaitoestel"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (werk nie op 'n ou BIOS nie)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Kompak"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "kompak"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Wagperiode voro verstekstelsel gelaai word"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Videomodus"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Wagperiode voro verstekstelsel gelaai word"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Wagwoord"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Wagwoord (weer)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Beperk instruksielynopsies"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "beperk"
 
-#
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Herlaaistelsel hoofopsies"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Probeer asb. weer"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Die wagwoorde stem nie ooreen nie."
 
-#
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -545,169 +566,352 @@ msgstr ""
 "Hier is die huidige inskrywings\n"
 "U kan byvoeg or verwyder soos nodig."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Voeg by"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Klaar"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Watter tipe inskrywing wil u byvoeg?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Ander bedryfstelsel (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Ander bedryfstelsel (windows...)"
 
-#
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Watter tipe inskrywing wil u byvoeg?"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Beeld"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Basis"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Aanlas"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Lees-skryf"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Tabel"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Onveilig"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Etiket"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Verstek"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "OK"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Verwyder inskrywing"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Le� etiket word nie toegelaat nie"
 
-#
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Hierdie etiket is alreeds in gebruik"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Het %s %s koppelvlakke gevind"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Beskik u oor nog?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Het u enige %s koppelvlakke?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Nee"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Ja"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Drywer vir %s kaart %s in installasieproses"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(module %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Watter %s drywer meot ek probeer?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"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"
+"ophang, maar dit sal nie skade veroorsaak nie."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Aftas"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Spesifieer opsies"
+
+#: ../../any.pm_.c:551
+#, 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:557
+#, 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"
+"Opsies is in die formaat ``naam=waarde naam2=waarde2 ...''.\n"
+"Bv. ``io=0x300 irq-7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Module opsies:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Laai van module %s het gefaal.\n"
+"Wil u ander parameters probeer?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+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"
+"\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
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Welkom by GRUB, die bedryfstelselkieskaart!"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr ""
+"Gebruik die %c en %c sleutels om die inskrywing te kies wat uitgelig moet "
+"word."
+
+#: ../../bootloader.pm_.c:598
+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."
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "instruksies voor herlaai, of 'c' vir 'n instruksielyn."
+
+#: ../../bootloader.pm_.c:600
+#, 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:604
+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
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Werkskerm"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Beginkieskaart"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d minute"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 minuut"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekondes"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Skep"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Ontheg"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Uitwis"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Formatteer"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:590
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Verstel Grootte"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Tipe"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Hegpunt"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Skryf /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Skakel oor na kundige gebruiksvlak"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Skakel oor na normale gebruiksvlak"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Herstel vanaf lOer"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Stoor in lOer"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "Assistent"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Herstel vanaf floppie"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Stoor op floppie"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Verwydeer almal"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Formatteer almal"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Outo-allokeer"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Alle primOre partisies is gebruik"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Ek kan nie meer partisies byvoeg nie"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -715,60 +919,63 @@ msgstr ""
 "Om meer partisies te verkry, verwyder asb. een om 'n ektensiepartisiete kan "
 "skep"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Reddingspartisietabel"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Herroep"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Skryf partisietabel"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Herlaai"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "teruglus"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Leeg"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
-msgstr ""
+msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Ander"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Ruilarea"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Leeg"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Ander"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "LOersteltipes:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Detail"
 
-#
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -780,17 +987,17 @@ msgstr ""
 "Ek stel voor u verstel eers die grootte van di� partisie\n"
 "(kliek daarop en kliek dan op \"Verstel Grootte\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Rugsteun u data eers asb."
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
 #: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Lees noukeurig!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -799,77 +1006,77 @@ msgstr ""
 "Indien u beplan om 'aboot' te gebruik, los spasie aan die begin\n"
 "van die skyf. (2048 sektors is genoeg)."
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Wees versigtig: hierdie is 'n gevaarlike operasie"
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Fout"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:680
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Hegpunt:"
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Toestel:"
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS-skyfletter: %s ('n raaiskoot)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Tipe:"
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Begin: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Grootte: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektore"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Silinder %d na silinder %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Geformateer\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Nie geformatter\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Geheg\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Teruglus l�er(s): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -877,80 +1084,79 @@ msgstr ""
 "Verstekpartisie vir herlaai\n"
 "  (vir MS_DOS doeleindes, nie LILO s'n nie)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Vlak %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Blokgrootte %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-skywe %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Teruglus l�ernaam: %s"
 
-#
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Kliek asb. op 'n partisie"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Grootte: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometrie: %s silinders, %s koppe, %s sektore\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Partisietabeltipe: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "op bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Heg"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Aktief"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Voeg by RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Verwyder uit RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Verander RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Gebruik vir teruglus"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Kies aksie"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -963,7 +1169,7 @@ msgstr ""
 "gebruik\n"
 "nie, dan het u nie /boot nodig nie."
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -976,26 +1182,26 @@ msgstr ""
 "gebruik,moet u\n"
 "asb. 'n /boot partisie skep,"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "U het 'n sagteware RAID-partisie as wortel (/).\n"
 "Geen herlaaistelsel sal dit kan hanteer sonder 'n /boot partisie nie.\n"
-"Onthou om 'n /boot by te voeg indien u LILO of grub gebruik."
+"Onthou om 'n /boot by te voeg."
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Gebruik ``%s'' instede."
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Gebruik ``Ontheg'' eerste"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -1003,37 +1209,43 @@ msgstr ""
 "Alle data om hierdie partisie %s sal uitgewis word na verandering van die "
 "partisietipe"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Wil u in elk geval voortgaan?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Verlaat, maar moenie iets stoor nie"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Wil u verlaat, sonder om die partisietabel op te dateer?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Verander partisietipe"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Watter partisietipe verlang u?"
+#
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "Watter drukkerstelsel verlang u?"
+
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
+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:483
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Waar wil u teruglusl�er %s heg?"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Waar wil u toestel %s heg?"
 
-#: ../../diskdrake.pm_.c:489
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1041,39 +1253,38 @@ msgstr ""
 "Kan nie hegpunt ontset nie, omdat hierdie partisie vir teruglus\n"
 "gebruik word. Verwyder eers die teruglus."
 
-#: ../../diskdrake.pm_.c:508
+#: ../../diskdrake.pm_.c:515
 #, 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:510
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Formatering"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Teruglusl�er %s word geformateer"
 
-#: ../../diskdrake.pm_.c:512 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Partisie %s word formateer"
 
-#: ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Na formatering van alle partisies"
 
-#: ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "alle data om hierdie partisies sal verloor word"
 
-#: ../../diskdrake.pm_.c:527
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Skuif"
 
-#
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Na watter skyf wil u skuif?"
 
@@ -1081,7 +1292,6 @@ msgstr "Na watter skyf wil u skuif?"
 msgid "Sector"
 msgstr "Sektor"
 
-#
 #: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Na watter sektor wil u skuif?"
@@ -1103,81 +1313,83 @@ msgstr "Partisietabel van skyf %s gaan opdateer word!"
 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:569 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "FAT l�erstelselgrense word bereken"
 
-#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:618
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Grootteverandering"
 
-#
-#: ../../diskdrake.pm_.c:585
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Watter partisie se grootte wil u verander?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "Alle data om hierdie partisie moet gerugsteun word."
 
-#: ../../diskdrake.pm_.c:587
+#: ../../diskdrake.pm_.c:599
 #, 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.pm_.c:597
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Kies die nuwe grootte"
 
-#: ../../diskdrake.pm_.c:597 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:652
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Kies 'n nuwe grootte"
 
-#: ../../diskdrake.pm_.c:672
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Kies sektor: "
 
-#: ../../diskdrake.pm_.c:676 ../../diskdrake.pm_.c:750
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Grootte in MB: "
 
-#: ../../diskdrake.pm_.c:679 ../../diskdrake.pm_.c:753
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "LOerstelseltipe: "
 
-#: ../../diskdrake.pm_.c:682
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Voorkeure: "
 
-#: ../../diskdrake.pm_.c:729 ../../install_steps.pm_.c:132
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Hierdie partisie kan nie vir teruglus gebruik word nie."
 
-#: ../../diskdrake.pm_.c:739
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Teruglus"
 
-#: ../../diskdrake.pm_.c:749
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Teruglus l�ernaam:"
 
-#: ../../diskdrake.pm_.c:775
+#: ../../diskdrake.pm_.c:790
 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.pm_.c:776
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "L�er bestaan alreeds. Moet dit gebruik word?"
 
-#: ../../diskdrake.pm_.c:798 ../../diskdrake.pm_.c:814
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Selekteer lOer"
 
-#: ../../diskdrake.pm_.c:807
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1185,11 +1397,11 @@ msgstr ""
 "Die rugsteunpartisietabel het nie dieselfde grootte nie\n"
 "Wil u voortgaan?"
 
-#: ../../diskdrake.pm_.c:815
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1197,77 +1409,77 @@ msgstr ""
 "Sit 'n floppie in die aandrywer.\n"
 "Alle data op hierdie floppie sal verloor word."
 
-#: ../../diskdrake.pm_.c:830
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Partisietabel Reddingspoging"
 
-#: ../../diskdrake.pm_.c:841
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "toestel"
 
-#: ../../diskdrake.pm_.c:842
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "vlak"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "blokgrootte"
 
-#: ../../diskdrake.pm_.c:855
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Kies 'n bestaande RAID om by toe te voeg"
 
-#: ../../diskdrake.pm_.c:856
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "nuut"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formatering ban %s het gefaal"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, 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:186
-msgid "nfs mount failed"
-msgstr "NFS heg het gefaal"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "heg het gefaal"
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "fout met onthegting van %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Hegpunte moet met 'n / begin"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, 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:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Sirkul�re heg %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr "Hierdie l�ergids moet altyd in die wortell�erstelsel bly"
+
+#: ../../fsedit.pm_.c:259
 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:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Four om %s in skryfmode te open: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1275,75 +1487,81 @@ msgstr ""
 "'n Fout het voorgekom - geen geldige toestelle om die nuwe lOerstelsels op "
 "teskep, is gevind nie. Deursoek asb. die hardeware vir die oorsaak."
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "U get geen partisies nie!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../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:10
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Kies die sleutelborduitleg uit die bostaande lys"
-
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "Kies die sleutelborduitleg uit die bostaande lys"
+
+#: ../../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
+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"
-"  - 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"
-msgstr ""
-"Kies \"Installeer\" indien daar geen vorige weergawe van Linux\n"
-"op is nie, of indien u 'n multidistribusie wil realiseer.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Kies \"Opgradeer\" indien u 'n vorige weergawe van Mandrake\n"
-"Linux wil opgradeer:\n"
-"5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
-"2000\n"
-"of 7.0 (Air).\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"
-"Selekteer:\n"
+"\t* Recommanded: 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"
-"  - Outomaties (aanbevole): Indien u nooit Llinux vantevore installeerhet "
-"nie,kies hierdie een. LW:\n"
-"  netwerk sal nie opgestel word. Gebruik \"LinuxConf\"  na installasie om "
-"die netwerk op te stel.\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"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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.\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1351,12 +1569,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Selekteer:\n"
 "\n"
@@ -1366,33 +1585,31 @@ msgstr ""
 "  - 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.\n"
+"  MOET ASB. NIE HIERDIE OPSIE KIES INDIEN U NIE WEET WAT U DOEN NIE."
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "Die verskillende opsies vir u rekenaar se gebruik (indien u \"Afgemeet\" \n"
 "of  \"Kundige\" sou kies) is die volgende:\n"
@@ -1409,160 +1626,366 @@ msgstr ""
 "     SMB, drukkerbediening, NIS magtiging ens.\n"
 "     Moenie vensterstelsels soos KDE en GNOME verwag nie.\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
+#, fuzzy
 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"
+"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 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"
+"\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."
+
+#: ../../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"
+"\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"
-"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"
+"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"
-"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"
+"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"
-"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."
+"\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."
 msgstr ""
-"DrakX will probeer om eers te kyk vir een of meer bekende PCI\n"
-"SCSI kaarte. Indien iets gevind word, en die drywers daarvoor\n"
-"bekend is, sal dit outomaties bygevoeg word.\n"
+
+#: ../../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"
+"\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"
-"Indien u 'n ISA SCSI kaart het, of 'n onbekende PCI SCSI kaart, of\n"
-"geen SCSI kaart nie, sa; u gevra word of daar enige SCSI kaarte is.\n"
-"Indien daar geen is nie, antwoord \"Nee\". Indien daar wel is, antwoord\n"
-"\"Ja\" en 'n lys van kaarte sal gegee word waaruit u moet kies.\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"
-"Na seleksie van die drywer, sal DrakX of vra vir opsies. Probeer eers\n"
-"dat die drywer die hardeware ondervra; dit werk gewoonlik.\n"
 "\n"
+"   * Undo: you can use this option to cancel your changes.\n"
 "\n"
-"Indien nie, moenie die dokumentasie van u hardeware vergeet nie; ook nie\n"
-"enige inligting van Windows (indien u dit gennstalleer het). Hierdie is\n"
-"opsies wat u die drywer moet verskaf."
+"\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"
+msgstr ""
 
-#
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:218
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"For information, each partition is listed as follows: \"Name\", "
+"\"Capacity\".\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"
+"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\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"
+"\"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"
-"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"
+"\"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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"- Ctrl-d  to delete a partition\n"
+"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"- Ctrl-m  to set the mount point\n"
+"\n"
+"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
+"\"secondary hard drive\", etc..."
 msgstr ""
-"U kan nou kies watter partisie(s) gebruik kan word om Linux-Mandrake\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 "
-"geskep\n"
-"word. Hierdie operasie bestan uit die logiese verdeling van die hardeskyf "
-"in\n"
-"aparte bruikbare areas\n"
+
+#: ../../help.pm_.c:252
+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:257
+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"
-"Indien u nuwe partisies moet skep, gebruik \"Outo-allokasie\" om outomaties\n"
-"partisies vir Linux te skep. U kan die skyf vir partisionering selekteer "
-"deur\n"
-"op \"hda\" te kliek vir die eerste IDE hardeskyf, hdb vir die tweede of "
-"\"sda\"\n"
-"vir die eerste SCSI skyf ens.\n"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
+msgstr ""
+
+#: ../../help.pm_.c:267
+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"
-"Twee algemene partisies is die \"root\" partisie (/), wat die wortel is\n"
-"van die l�ergidsstelsel, en /boot, wat die nodige l�ers bevat om die\n"
-"bedryfstelsel aan die gang te kry wanneer die rekenaar aangesit word.\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"
-"Omdat die gevolge van hierdie proses onomkeerbaar is, kan partisionering "
-"baie\n"
-"intimiderend en stresvol vir die onervare gebruiker wees. DiskDrake maak "
-"di�\n"
-"proses heelwat makliker. Lees die dokumentasie en neem u tyd voor u "
-"voortgaan.\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"
-"U kan enige opsie gebruik deur die sleutelbord te gebruik. Navigeer deur "
-"diepartisies met\n"
-"Tab en die pyltjies. Wanneer 'n partisie gekies is, gebruik:\n"
+"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-c om 'n partisie te skep (wanneer 'n le� partisie gekies is)\n"
+"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"- Ctrl-d om 'n partisie uit te vee\n"
+"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"- Ctrl-m om 'n partisie te heg\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 ""
+
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:303
 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."
+"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 ""
-"Enige partisies wat nuut geskep is, moet eers formateer word voor gebruik.\n"
-"(Formateering beteken die skep van 'n lOerstelsel). U kan nou kies om ook\n"
-"bestaande partisies te herformateer en die data daarop te vernietig.\n"
-"NOTA: Dit is nie nodig om alle bestaande partisies te herformateer nie,\n"
-"veral indien daar data op is wat u wil hou. 'n Tipiese voorbeeld is /home."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
+#, 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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"
@@ -1574,132 +1997,153 @@ msgstr ""
 "pakketkeuses\"\n"
 "kies waarna u deur meer as 'n 1000 pakkette sal moet blaai....."
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:358
+#, 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 ""
 "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:155
+#: ../../help.pm_.c:363
 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."
+"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 ""
-"Die gekose pakette gaan nou installeer word. Hierdie proses\n"
-"sal 'n paar minute neem. Indien u 'n opgradering gekies, kan dit\n"
-"nog langer neem voordat die opgradering begin."
 
-#
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:371
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"Indien DrakX nie u muis kon vind nie, of as u wil sien\n"
-"wat gedoen is, sal u moet die bg. lys van muistoestelle gepresenteer\n"
-"word.\n"
-"\n"
-"\n"
-"Indien u met DrakX saamstem, spring na die afdeling wat u\n"
-"verlang deur op die kierkaart links te kliek. Andersins kies\n"
-"'n muistoetsel in die kieskaart wat u dink die beste klop met die\n"
-"muis wat u het.\n"
-"\n"
-"In geval van 'n seriaalmuis, moet u ook vir DrakX die seriaalpoort\n"
-"gee."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
-"Kies asb. die korrekte poort. ONthou dat COM1 onder MS Windows \n"
-"ttyS0 onder Linux is."
+"Kies asb. die korrekte poort. Onthou dat COM1 onder MS Windows \n"
+"ttyS0 onder GNU/Linux is."
 
-#
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
-"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"
+"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 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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"Hierdie afdeling is vir die konfigurasie van 'n lokaalareanetwerk\n"
-"of 'n modem.\n"
-"\n"
-"Kies \"LAN\" en DrakX sal probeer om 'n Ethernetkaart in u rekenaar\n"
-"te vind. PCI-kaarte sal heelwaarskynlik outomaties gevind en\n"
-"inisialiseer word. Indien u 'n ISA-kaart het sal daar 'n kieslys\n"
-"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"
-"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"
-"adresse kies.\n"
-"\n"
-"\n"
-"Kies \"Uitbel met Modem\" en die internetkonneksie vir 'n modem\n"
-"sal opgestel word. DrakX sal u modem probeer bepaal. Indien di� faal\n"
-"sal u die modem en korrekte seriaalpoort moet selekteer."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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"
@@ -1717,7 +2161,22 @@ msgstr ""
 "Indien u\n"
 "     twyfel, vra die netwerkadministrateur of ISP.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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:441
+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:445
 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."
@@ -1725,7 +2184,7 @@ msgstr ""
 "U kan nou die opbelopsie invul. Indien u\n"
 "twyfel kry die korrekte inligting van u ISP."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1734,13 +2193,15 @@ msgstr ""
 "vra\n"
 "die netwerkadministrateur of ISP."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1752,30 +2213,42 @@ msgstr ""
 "\n"
 "Let wel: U moet 'n spie�l en pakkette selekteer n.a.l plaaslike wetgewing."
 
-#
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
-"U kan u u tydsone kies.\n"
+"U kan nou u tydsone kies.\n"
 "\n"
 "\n"
-"Linux beheer tyd in GMT (Greenwichmeridiaantyd) en vertaal dit dan\n"
+"GNU/Linux beheer tyd in GMT (Greenwichmeridiaantyd) en vertaal dit dan\n"
 "in u lokale tyd volgends die gekose tydsone."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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"
@@ -1784,74 +2257,159 @@ msgstr ""
 "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:257
+#: ../../help.pm_.c:486
+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:490
 msgid ""
-"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"
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"Linux kan verskeie drukkers gebruik. Elkeen van hierdie tipes\n"
-"verlang 'n ander opstelling.\n"
+
+#: ../../help.pm_.c:505
+msgid ""
+"GNU/Linux can deal with many types of printer. Each of these types requires\n"
+"a different setup.\n"
 "\n"
 "\n"
-"Indien u drukker direk aan die rekenaar gekoppel is, selekteer\n"
-"\"Lokale Drukker\". U moet dan die korrekte poort uitwys\n"
-"en die gepaslike filter selekteer.\n"
+"If your printer is physically connected to your computer, select \"Local\n"
+"printer\".\n"
 "\n"
 "\n"
-"Indien u 'n drukker om 'n ander Unix-rekenaar wil gebruik, kies\n"
-"\"Eksterne lpd\". In hierdie geval moet u die naam van die drukkertou\n"
-"op die ander rekenaar ken.\n"
+"If you want to access a printer located on a remote Unix machine, select\n"
+"\"Remote printer\".\n"
 "\n"
 "\n"
-"Indien u toegang tot 'n SMB drukker (op 'n Windows-rekenaar) verlang,\n"
-"moet u die SMB/NETBIOS naam (nie TCP/IP-naam nie) ken en moontlik ook die\n"
-"IP-adres. Daarby moet u ook 'n gebruikerskode, werkgroep en wagwoord en die\n"
-"drukkernaam voorsien. Dieselfde geld vir 'n Netware-drukker, behalwe dat u\n"
-"die werkgroep hoef te voorsien nie."
+"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:286
+#: ../../help.pm_.c:521
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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 ""
+
+#: ../../help.pm_.c:542
+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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
+"\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"
@@ -1866,7 +2424,7 @@ msgstr ""
 "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:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1874,7 +2432,7 @@ msgstr ""
 "Om 'n veiliger stelsel te bou, moet u \"Gebruik skadul�er\" \n"
 "en \"Gebruik MD5 wagwoorde\" kies."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1882,8 +2440,7 @@ msgstr ""
 "Indien u netwerk NIS gebruik, kies \"Gebruik NIS\". Indien u twyfel vra\n"
 "die netwerkadministrateur."
 
-#
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1923,35 +2480,29 @@ msgstr ""
 "Derhalwe moet u aanteken met die gebruikerskode wat u hier skep en 'root'\n"
 "net vir admintratiewe doeleindes gebruik."
 
-# ../help.pm_.c:240 ../help.pm_.c:481 msgid ""
-#
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Dit word sterk aanbeveel dat u \"Ja\" antwoord. Indien u Windows sou\n"
-"herinstalleer, sal dit die herlaaisektor oorskryf. Indien u die die "
-"herlaaiskyf\n"
-"gemaak het nie, sal u nie weer in Linux kan inkom nie."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
-"U moet aandui waar u die informasie om Linux te laai, wil plaas.\n"
+"U moet aandui waar u die informasie om Linux te herlaai, wil plaas.\n"
 "\n"
 "\n"
-"Behalwe as u werklik weet wat u doen moet u MBR kies."
+"Behalwe as u werklik weet wat u doen moet u \"Eerste sektor van skyf (MBR)\" "
+"kies."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1959,10 +2510,10 @@ 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:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1972,8 +2523,8 @@ msgid ""
 "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 (Die LInux LOader) en Grub is herlaaistelsels. Beide kan Linux of enige "
-"ander\n"
+"LILO (Die LInux LOader) en Grub is herlaaistelsels. Beide kan GNU/Linux of "
+"enige ander\n"
 "bedryfstelsel wat op u rekenar teenwoordig is, laai. Gewoonlik word hierdie\n"
 "beryfstelsels reg bespeur en bygevoeg. Indien nie, kan u 'n inskrywing maak\n"
 "op hierdie skerm. Maak seker u kies die korrekte paramters.\n"
@@ -1984,7 +2535,8 @@ msgstr ""
 "inskrywings kan uitvee. Maar dan het u die nodige herlaaiskywe nodig om die\n"
 "betrokke bedryfstelsels te laai."
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -2001,7 +2553,9 @@ msgid ""
 "\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."
 msgstr ""
 "LILO en Grub hoof opsies is:\n"
@@ -2023,10 +2577,62 @@ msgstr ""
 "      * normaal: selekteer normale 80x25 mode.\n"
 "      * syfer: die ooreenstemmende teksmode."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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."
+
+#: ../../help.pm_.c:692
+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."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2038,7 +2644,8 @@ msgid ""
 "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 Linux grafiese omgewing. Vir hierdie doeleindes, moet u 'n videokaart\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"
@@ -2047,7 +2654,7 @@ msgstr ""
 "aans�. Indien die stelling u nie pas nie, kom terug en verander so veel\n"
 "keer soos nodig."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2055,7 +2662,7 @@ msgstr ""
 "Indien iets verkeerd is in die X-konfigurasie, gebruik hierdie opsies om\n"
 "die X-vensterstelsel reg op te stel."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2063,42 +2670,47 @@ msgstr ""
 "Indien u verkies om 'n grafiese intekenarea te kry, kies \"Ja\", andersins "
 "\"Nee\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\n"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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"
+"\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."
 msgstr ""
 "U kan nou 'n paar diverse opsies vir u stelsel kies.\n"
 "\n"
@@ -2132,9 +2744,9 @@ msgstr ""
 "\n"
 "  - NumLock: Indien u NumLock wil aansit by herlaaityd, selekteer hierdie "
 "opsie. Dit sal\n"
-"     nier noodwendig NumLock onder X aansit nie."
+"     nie noodwendig NumLock onder X aansit nie."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2147,193 +2759,134 @@ msgstr ""
 "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:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Kies u taal"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Kies installasieklas"
 
-#
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Hardeskyfdeteksie."
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Stel muistoestel op"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Kies u sleutelbord"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Arbitr�re items"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Stel l�erstelsels op"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Formateer partisies"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Kies pakkette om te installeer"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Installeer stelsel"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Stel netwerk op"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Kriptografie"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Stel tydsone op"
 
-#
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Konfigureer dienste"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Stel drukker op"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Kies 'root' se wagwoord"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Voeg 'n gebruiker by"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Maar 'n herlaaiskyf"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Installeer herlaaistelsel"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Stel X op"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Outoinstalleer floppie"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Verlaay installasie"
 
-#: ../../install2.pm_.c:337
-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 ""
-"U moet 'n wortelpartisie definieer.\n"
-"Skep 'n partisie of kliek op 'n bestaande een.\n"
-"Kies dan Hegpunt en stel dit dan '/'."
-
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Ek kan nie u partisietabel lees nie, dit is te korrup.\n"
-"Ek sal die nodige partisies skoonmak."
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Fout met lees van l�er $f"
 
-#: ../../install_any.pm_.c:351
-msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
-msgstr ""
-"DrakX kon nie die partisietabel korrek interpreteer nie.\n"
-"Gaan aan op u eie risiko!"
+#
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "Toets asb. die muis"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Deursoek wortell�erstelsel"
+#
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Toets asb. die muis"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Inligting"
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
+#: ../../install_interactive.pm_.c:23
 #, c-format
-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."
-
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Geen basisl�erstelsel gevind nie"
-
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Kan nie uitsaau sonder 'n NIS-domein nie"
-
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Fout met lees van l�er $f"
-
-#: ../../install_steps.pm_.c:75
 msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
+"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
+"You can find some information about them at: %s"
 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:174
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Duplikaat hegpunt %s"
+"Sekere hardeware op u rekenaar benodig geslote drywers.\n"
+" U kan inligting hieroorvind by %s"
 
-#: ../../install_steps.pm_.c:321
+#: ../../install_interactive.pm_.c:41
 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"
+"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 ""
-"Sekere belangrike pakkette het nie korrek ge�nstalleer nie.\n"
-"�f die CDROM-aandrywer �f die CD is foutief.\n"
-"Toets die CD op 'n werkende Linux installasie met \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
-
-#: ../../install_steps.pm_.c:388
-#, c-format
-msgid "Welcome to %s"
-msgstr "Welkom by %s"
-
-#: ../../install_steps.pm_.c:740
-msgid "No floppy drive available"
-msgstr "Geen sagteskyaandrywer beskikbaar nie"
-
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
-#, c-format
-msgid "Entering step `%s'\n"
-msgstr "Gaan stap '%s' binne\n"
+"U moet 'n wortelpartisie definieer.\n"
+"Skep 'n partisie of kliek op 'n bestaande een.\n"
+"Kies dan Hegpunt en stel dit dan '/'."
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
+#: ../../install_interactive.pm_.c:46
 msgid "You must have a swap partition"
 msgstr "U moet oor 'n ruilpartisie beskik"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:47
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -2343,100 +2896,73 @@ msgstr ""
 "\n"
 "Wil u steeds voortgaan?"
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Kies die grootte van die installasie"
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Gebruik beskikbare spasie"
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Totale grootte: "
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "Nie genoeg spasie beskikbaar om nuwe partisies toe te ken nie"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Weergawe: %s\n"
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "Gebruik bestaande partisies"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "Groote: %d KB\n"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "Daar is geen bestaande partisies om te gebruik nie"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Kies die pakkette wat u wil installeer"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Gebruik vir die Windows-partisie vir teruglus"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "In watter partisie wil u Linux4Win plaas?"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Installasie"
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Kies die groottes"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Besig met installasie"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Basispartisiegrootte in MB:"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Wag asb.,"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Ruilpartisiegrootte in MB: "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Tyd oor "
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "Gebruik die beskikbare spasie op die Windowspartisie"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Totale tyd "
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Watter partisie se grootte wil u verander?"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Berei installasie voor"
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "Windowsl�erstelselgrense word bereken"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Installing package %s"
-msgstr "Installeer pakket %s"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Gaan steeds voort?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Daar was 'n fout met pakkette:"
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Gebruik bestaande konfigurasie vir X11?"
-
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Kies asb. een van die volgende installasieklasse:"
-
-#
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "U het geen Windowspartisies nie!"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"Die FAT-verstellingsprogram kan nie u partisie hanteer nie.\n"
+"Fout: %s"
 
-#
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "U het nie genoeg plek vir Lnx4win nie"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr "U Windows-partisie is te gefragmenteer. Loop eers 'defrag' asb."
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_interactive.pm_.c:113
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
 "dangerous. If you have not already done so, you should first exit the\n"
 "installation, run scandisk under Windows (and optionally run defrag), then\n"
 "restart the installation. You should also backup your data.\n"
@@ -2452,37 +2978,158 @@ msgstr ""
 "hierdie installasie. Rugstuen ook u data. Insien u skeer is van u saak, kies "
 "OK."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Outomatiese grootteverandering het gefaal"
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "Watter grootte wil u vir Windows behou?"
 
-#
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "In watter partisie wil u Linux4Win plaas?"
+#: ../../install_interactive.pm_.c:123
+#, c-format
+msgid "partition %s"
+msgstr "partisie %s"
 
-#
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Kies die groottes"
+#: ../../install_interactive.pm_.c:129
+#, c-format
+msgid "FAT resizing failed: %s"
+msgstr "FAT-grootteverandering het gefaal: %s"
 
-#
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Basispartisiegrootte in MB:"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+"Daar is geen FAT partisies om te verander of om as teruglus (nie genoeg "
+"spasie nie) te gebruik nie"
 
-#
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Ruilpartisiegrootte in MB: "
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "Wis hele skyf"
+
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Verwyder Windows(TM)"
+
+#: ../../install_interactive.pm_.c:153
+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:156
+#, 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:164
+msgid "Expert mode"
+msgstr "Kundige modus"
+
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "Gebruik diskdrake"
+
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "Gebruik fdisk"
+
+#: ../../install_interactive.pm_.c:171
+#, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"U het nou partisie %s partisioneer.\n"
+"Wanneer u klaar is, stoor u veranderinge met 'w'."
+
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Gebruik die beskikbare spasie op die Windowspartisie"
+
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Ek kan nie meer partisies byvoeg nie"
+
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "Die DrakX partisioneringsassistent het die volgende oplossings:"
+
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Partisionering het misluk: %s"
+
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Netwerk op pad op"
+
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Netwerk op pad af"
+
+#: ../../install_steps.pm_.c:74
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+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:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Duplikaat hegpunt %s"
+
+#: ../../install_steps.pm_.c:375
+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 ""
+"Sekere belangrike pakkette het nie korrek ge�nstalleer nie.\n"
+"�f die CDROM-aandrywer �f die CD is foutief.\n"
+"Toets die CD op 'n werkende Linux installasie met \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
+
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Welkom by %s"
+
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Geen sagteskyaandrywer beskikbaar nie"
+
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Gaan stap '%s' binne\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"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. "
+"Daarvoor moet u\n"
+"'F1' druk wanneer u vanaf die CDROM herlaai en dan 'text' op die "
+"instruksielyn intik."
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Kies asb. een van die volgende installasieklasse:"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2496,7 +3143,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:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2511,62 +3158,102 @@ 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:333
+#: ../../install_steps_gtk.pm_.c:228
 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:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Persentasie pakkette om te installeer"
 
-#
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Kies die pakkette wat u wil installeer"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Installasie"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Outomatiese afhanklikhede"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Maak boom oop"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Maak boom toe"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Skakel tussen plat- en groepsortering"
 
-#
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Foutiewe pakket"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Naam: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Weergawe: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Groote: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Belangrikheid: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Totale grootte: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+"U kan nie hierdie pakket selekteer nie, omdat daar nie meer spasie "
+"beskikbaar is nie"
+
+#
+#: ../../install_steps_gtk.pm_.c:386
+msgid "The following packages are going to be installed"
+msgstr "Die volgende pakkette gaan installeer word"
+
+#
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "Dei volgende pakkette gaan verwyder word"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "U kan nie hierdie pakket selekteer/deselekteer nie"
+
+#: ../../install_steps_gtk.pm_.c:416
 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:473
+#: ../../install_steps_gtk.pm_.c:418
 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:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2574,46 +3261,89 @@ msgstr ""
 "Hierdie pakket moet opgradeer word\n"
 "Is u seker u wil dit deselekteer?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 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:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-"U kan nie hierdie pakket selekteer nie, omdat daar nie meer spasie "
-"beskikbaar is nie"
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Dei volgende pakkette gaan installeer/verwyder word"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "U kan nie hierdie pakket selekteer/deselekteer nie"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Besig met installasie"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Skatting"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Wag asb.,"
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Tyd oor "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Totale tyd "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Berei installasie voor"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pakkette"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Installeer pakket %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:596
+#
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "Aanvaar "
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2629,190 +3359,388 @@ msgstr ""
 "hieroor beskik nie, druk Kanselleer om installasies vanaf di� CDROM te vermy."
 
 #
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "Weier"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Gaan steeds voort?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Daar was 'n fout met pakkette:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Daar was 'n fout met die installasie van die pakkette:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "'n Fout het voorgekom"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Kies asb. 'n taal om te gebruik."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Sleutelbord"
 
-#
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Wat is u sleutelborduitleg?"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 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:91
-msgid "Root Partition"
-msgstr "Basispartisie"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "Alles"
 
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Wat is die basispartisie (/) van u stelsel?"
-
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Installasieklas"
 
-#
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Watter installasieklas verlang u?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Installeer/Opgradeer"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr "Is hierdie 'n installasie or opgradering?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
+msgstr "Is hierdie 'n installasie of reddingspoging?"
 
-#
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Outomaties"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Aanbevole"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Aangepaste"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Kundige"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
-"Is u 'n kundige? U sal sal teogelaat word om kragtige, maar\n"
-"gevaarlike keuses uit te oefen."
+"Is u 'n kundige? U sal sal toegelaat word om kragtige, maar\n"
+"gevaarlike keuses uit te oefen\n"
+"\n"
+"U sal vrae gevra word soos: \"Gebruik skaduwagwoorde?\"\n"
+"Is u reg vir sulke vrae?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Opgradeer"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Normaal"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "Werkstasie"
 
-#
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Ontwikkeling"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Bediener"
 
-#
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
 msgstr "Wat is die gebruik van u stelsel?"
 
-#
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Wat is u muistoestel?"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Muispoort"
 
-#
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 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:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Stel PCMCIA op..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "IDE word opgestel"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "geen beskikbare partisies"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Watter partisie moet u wortelpartisie wees?"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Kies die hegpunte"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Ek kan nie u partisietabel lees nie, dit is te korrup.\n"
+"Ek sal die nodige partisies skoonmaak, maar alle data sal vernietig word.\n"
+"Die ander opsie is om DrakX te belet om die partisietabel te verander.\n"
+"(fout is %s)\n"
+"\n"
+"Will u al die partisies verwyder?\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DrakX kon nie die partisietabel korrek interpreteer nie.\n"
+"Gaan aan op u eie risiko!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Basispartisie"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Wat is die basispartisie (/) van u stelsel?"
+
+#: ../../install_steps_interactive.pm_.c:352
 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:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Kies die partisies om te formatteer"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Toets vir foutiewe areas?"
 
-#
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Partisies word formateer"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "L�er %s word geskep en formatteer"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 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:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Soek vir beskikbare pakkette"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Soek vir pakkette om op te gradeer."
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr "U stelsel het nie genoeg plek vir 'n installasie of opgradering nie"
+#: ../../install_steps_interactive.pm_.c:433
+#, 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:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "Klaar (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "Minimum (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Aanbevole (%dMB)"
+
+#
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "Aangepaste"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "Kies die grootte van die installasie"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Kies pakketgroepe"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Individuele pakketseleksie"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2822,12 +3750,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:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CDROM getiteld \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2835,178 +3763,11 @@ msgstr ""
 "Installeer nou pakket %s\n"
 "%d%%"
 
-#
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Postinstallasiekonfigurasie"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Behou die huidige IP konfigurasie"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Herkonfigureer netwerk nou"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Moenie netwerk opstel nie"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Netwerkkonfigurasie"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Plaaslike netwerk is opsgestel: Wil u?"
-
-#
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Wil u die netwerk vir u stelsel opstel?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "geen netwerkkaart gevind nie"
-
-#
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Modemkonfigurasie"
-
-#
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "Wil u 'n opbelkonneksie (modem) vir u stelsel opstel?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Konfigureer netwerktoestel %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Gee asb die IP-konfigurasie vir hierdie rekenaar.\n"
-"Elke item moet as 'n IP-adres in dotdesimalenotasie\n"
-"(1.2.3.4) gegee word."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Outomatiese IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP adres:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Netmasker:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP-adres moet in 1.2.3.4. formaat wees"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Stel netwerk op"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Tik asb die rekenaarnaam in.\n"
-"Dit moet 'n volle gekwalifiseerde naam wees,\n"
-"bv. ``myne.mywerk.co.za''.\n"
-"U mag ook die netwerkhek byvoeg indien daar een is"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS bediener:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Netwerkhektoestel:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Netwerkhek:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Rekenaarnaam:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Soekj vir 'n modem?"
-
-#
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Op watter seriaalpoort is u modem gekoppel?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Opbelopsies"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Konneksienaam"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Telefoonnommer"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Aantekenkode"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Magtiging"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Skriptipe"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Terminaaltipe"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Domeinnaam"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Eerste DNS bediener"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Tweede DNS bediener"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3076,90 +3837,94 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 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:588
+#: ../../install_steps_interactive.pm_.c:676
 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:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Kies die pakkette wat u wil installeer"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
-msgstr "Wat isu tydsone?"
+msgstr "Wat is u tydsone?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Is die hardewareklok gestel vir GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "Watter drukkerstelsel verlang u?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Geen wagwoord"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Gebruik skadul�er"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "skadu's"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "gebruik MD5 wagwoorde"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Gebruik NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "geel bladsye"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, 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:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "NIS-bemagtiging"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS-domein"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS-bediener"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Aanvaar gebruiker"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Voeg gebruiker by"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s alreeds bygevoeg)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3169,64 +3934,88 @@ msgstr ""
 "Tik 'n gebruiker in\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Regte naam"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Gebruikerskode"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Dop"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikoon"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Die wagwoorde is te eenvoudig"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Gee asb. 'n gebruikerskode"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "Die gebruikerskode maag alleenlikui kleinletter, nommers, '-' en '_' bestaan"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Hierdie genruikerskode bestaan alreeds"
 
-#
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"'n Spesiale herlaaiskyf voorsien ;n metode waarby u Linux kan laai sonder\n"
+"die gebruik van 'n normale herlaaistelsel. Dit is veral bruikbaar wanneer\n"
+"u nie SILO op u stelsel wil installeer nie, 'n ander bedryfstelsel SILO\n"
+"verwyder of SILO nie met u stelsel werk nie. Hierdie herlaaiskyf kan ook\n"
+"met die Mandrake reddingsbeeld gebruik word, wat dit makliker maak om van\n"
+"ernstige stelselfalings te herstel.\n"
+"\n"
+"Indien u 'n herlaaiskyf wil maak,\n"
+"plaas 'n skyf in die aandrywer en druk \"OK\"."
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Eerste sagteskyfaandrywer"
 
-#
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Tweede sagteskyfaandrywer"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Mis hierdie stap"
 
-#
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3247,69 +4036,32 @@ 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:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Jammer, geen sagteskyfaandrywer beskikbaar nie"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 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:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Sit 'n skyf in aandrywer %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Herlaaiskyf word geskryf"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "LILO installasie het gefaal a.g.v. hierdie fout: "
-
-#
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Wil u SILO gebruik?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "SILO hoofopsies"
-
-#
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"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"
-"U kan byvoeg or verwyder soos nodig."
-
-#
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Partisie"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Hierdie etiket is alreeds in gebruik"
-
-#
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "SILO installasie het gefaal a.g.v. hierdie fout: "
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Herlaaistelsel word voorberei"
 
-#
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
-msgstr "Wil u 'aboot' gebruik?"
+msgstr "Wil u aboot gebruik?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3317,129 +4069,120 @@ msgstr ""
 "Die 'aboot' installasie het gefaal. Wil u 'n installasie afwurg al\n"
 "word die eerste partisie vernietig?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Instaanbedinerkonfigurasie"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP instaanbediener"
+#: ../../install_steps_interactive.pm_.c:925
+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:932
-msgid "FTP proxy"
-msgstr "FTP instaanbediener"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Instaanbediener moet begin met http://"
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Instaanbediener moet begin met ftp://"
-
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Krakers welkom"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Swak"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Laag"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Medium"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Hoog"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Parano�es"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Diverse vrae"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(kan data korrupteer)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Gebruik skyfoptimisasie?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Gebruik sekuriteitsvlak"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Presiese RAM grootte indien nodig (%d MB bespeur)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Outohegting van verwyderbare media"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Maak /tmp skoon met elke herlaai"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Ontsper multiprofiele"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Aansit van NumLock met herlaai"
 
-#
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Gee die geheuegrootte in MB"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr ""
 "Superhegting (supermount) kan nie met 'n ho� sekuriteitsvlak gebruik word nie"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX sal konfigurasiel�ers maak vir beide XFree 3.3 en XFree 4.0.\n"
-"By verstek sal die 3.3 bediener gebruik word omdat dit meer videokaarte "
-"ondersteun.\n"
-"\n"
-"Wil u XFree 4.0 probeer?"
+"Warskuwing: IN HIERDIE SEKURITEITSVLAK, kan ROOT nie by die KONSOLE AANTEKEN "
+"nie.\n"
+"OM 'root' te wees moet u eers as 'n gewone gebruiker aanteken en dan "
+"'su'.Hierdie is spesifiek vir bedienergebruik. U is gewaarsku!"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Soek vir PCI-toestelle?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"Wees versigtig, met NumLock aan sal heelwat sleutels as syfers eerder as "
+"karakters na vore kom. (Bv 'n 'p' mag dalk '6' wees)"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Gebruik bestaande konfigurasie vir X11?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 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:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sit 'n le� floppie in aandrywer %s"
 
-#
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Outoinstallasieskyf word geskep."
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3449,7 +4192,7 @@ msgstr ""
 "\n"
 "Wil u werklik nou aborteer?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3469,153 +4212,18 @@ msgstr ""
 "Inligting oor stelskonfigurasie is beskikbaar in die postinstallasie-\n"
 "hoofstuk in die Offisi�le Liux-Mandrake Gebruikersgids."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Stelselafsluiting"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Drywer vir %s kaart %s in installasieproses"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(module %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Watter %s drywer meot ek probeer?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"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"
-"ophang, maar dit sal nie skade veroorsaak nie."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Aftas"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Spesifieer opsies"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "U kan die opsies vir module %s hier intik."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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"
-"Opsies is in die formaat ``naam=waarde naam2=waarde2 ...''.\n"
-"Bv. ``io=0x300 irq-7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Module opsies:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Laai van module %s het gefaal.\n"
-"Wil u ander parameters probeer?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Wil u PCMCIA-kaarte soek?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Stel PCMCIA op..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Soek vir %s-toestelle?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Het %s %s koppelvlakke gevind"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Beskik u oor nog?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Het u enige %s koppelvlakke?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Nee"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Sien hardeware inligting"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Netwerk op pad op"
-
-#
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Netwerk op pad af"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake Installasie %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 " <Tab>/<Alt-Tab> tussen elemente  | <Space> selekteer | <F12> volgende skerm "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"U het nou die %s hardeskyf partisioneer.\n"
-"Wanneer u klaar is, stoor u veranderinge met 'w'."
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Wag asb."
 
@@ -3625,7 +4233,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Vaagheid (%s). Wees meer presies\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Swak keuse, probeer weer\n"
 
@@ -3639,465 +4247,962 @@ msgstr " ? (verstek %s) "
 msgid "Your choice? (default %s) "
 msgstr "U keuse? (verstek %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "U keuse? (Verstek %s tik 'none' vir geen)"
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "Tseggies"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Duits"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Spaans"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Finnies"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Frans"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norweegs"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Pools"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Russies"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "VK sleutelbord"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "VSA sleutelbord"
 
-#
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armenies (oud)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armenies (tikmasjien)"
 
-#
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armenies (Foneties)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "Azerbaidjani (latyns)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "Azerbaidjani (kirillies)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belgies"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulgaars"
 
-#
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasiliaans (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
-#, fuzzy
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
-msgstr "Bulgaars"
+msgstr "Belarussies"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Switsers (Duitse uitleg)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Switsers (Franse uitleg)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Duits (geen dooie sleutels)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Deens"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak (VSA)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (Norweegs)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Estoniaans"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgies (Russiese uitleg)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgies (Latynse uitleg)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Grieks"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Kroaties"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Israelies"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Israelies (Foneties)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Iranies"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Yslandies"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Italiaans"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "Japanees 106 sleutels"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Latyns-Amerikaans"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Nederlands"
 
-#
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lituanies AZERTY (oud)"
 
-#
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lituanies AZERTY (nuut)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lituanies \"nommerry\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituanies \"foneties\" QWERTY"
 
-#
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Pools (QWERTY uitleg)"
 
-#
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Pools (QWERTZ uitleg)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanadees (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Russue (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Sweeds"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Sloveens"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slovaaks"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Thai sleutelbord"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turks (tradisionele \"F\" model)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turks (moderne \"Q\" modem)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukranies"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "VSA internasionale sleutelbord"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vi�tnamees \"nommerry\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Jugoslaavs (latynse uitleg)"
 
-# 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.
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - Muis"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "Standaard"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Generies"
+
 #
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "Wiel"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "seriaal"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Generiese 2-knop muis"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Generiese 3-knop muis"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Reeks (seriaal)"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Muis (seriaal, ou C7 tipe)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Geen muis"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2 knoppies"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3 knoppies"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "niks"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Geen muis"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "Volgende ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Is dit korrek?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Internetkonfigurasie"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Wil u nou aan die internet konnekteer?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Konfigureer internetkonneksie"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Hoe wil u aan die internet konnekteer?"
+
+#: ../../netconnect.pm_.c:107
+#, 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"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "ISDN Konfigurasie"
+
+#: ../../netconnect.pm_.c:141
+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:158
+msgid "Connection Configuration"
+msgstr "Konneksiekonfigurasie"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "Vul asb. die velde hieronder in"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "Kaart IRQ"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "Kaartgeheue (DMA)"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "Kaart I/O"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "Kaart IO_0"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "Kaart IO_1"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "U persoonlike telefoonnommer"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "Voorsienernaam (bv voorsiener.co.za)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Voorsiener se telefoonnommer"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "Voorsiener DNS 1"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "Voorsiener DNS 2"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "Belmetode"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "Gebruikerskode"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Wagwoord"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Bevestig wagwoord"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "Europa"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Europa (EDSS1)"
+
+#
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "Res van die w�reld"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "Res vd w�reld - geen D-Kanaal (bruikhuurlyne)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "Watter protokol verlang u?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "Ek weet nie"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "Oor watter tipe kaart beskik u?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "Gaan voort"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "Aborteer"
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
 "\n"
+"Indien u 'n ISA-kaart het, behoort die waardes op die volgende skerm reg te "
+"wees.\n"
+"\n"
+"Indien u 'n PCMCIA kaart het, moet u die IRQ en I/O van u kaart weet.\n"
+
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "Wat is u ISDN-kaart?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "Ek het 'n ISDN-kaart gevind\n"
+
+#: ../../netconnect.pm_.c:287
+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 ""
-"Welkom by LILO die bedryfstelselkeuseprogram!\n"
+"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:299
+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:331
+#, 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:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Kies die netwerkkoppelvlak"
+
+#: ../../netconnect.pm_.c:336
+#, 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:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "Netwerkkoppelvlak"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
-"Om die moontlikehede te vertoon, druk <TAB>.\n"
+"Do you agree?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Ek gaan nou die netwerkkoppelvlak herlaai. Stem u saam?"
+
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "ADSL konfigurasie"
+
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "Wil u die konneksie by herlaaityd aanskakel?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Soekj vir 'n modem?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Op watter seriaalpoort is u modem gekoppel?"
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Opbelopsies"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Konneksienaam"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "Telefoonnommer"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Aantekenkode"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Magtiging"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Skriptipe"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Terminaaltipe"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Domeinnaam"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Eerste DNS bediener"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Tweede DNS bediener"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
 "\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"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Konnekteer aan die internet / Konfigureer LAN"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
 "\n"
+"You can reconfigure your connection."
+msgstr "Konfigureer internetkonneksie"
 
-# 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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Welkom by GRUB, die bedryfstelselkieskaart!"
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Hoe wil u aan die internet konnekteer?"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
 msgstr ""
-"Gebruik die %c en %c sleutels om die inskrywing te kies wat uitgelig moet "
-"word."
 
-#: ../../lilo.pm_.c:433
-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."
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Hoe wil u aan die internet konnekteer?"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "instruksies voor herlaai, of 'c' vir 'n instruksielyn."
+#: ../../netconnect.pm_.c:590
+msgid "Connect to Internet"
+msgstr "Konnekteer aan die internet"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Die uitgeligte inskrywing sal outomaties in %ds gelaai word."
+#: ../../netconnect.pm_.c:592
+msgid "Disconnect from Internet"
+msgstr "Diskonnekteer van die internet"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "nie genoeg spasie in /boot nie"
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Konfigureer internetkonneksie"
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Werkskerm"
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "Internetkonneksie en konfigurasie"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Beginkieskaart"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+#, 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?"
 
-#
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - Muis"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Konfigureer internetkonneksie"
 
-#
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB-muis"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Konfigureer internetkonneksie"
 
-#
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB-muis (2 knoppe)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Interne ISDN-kaart"
 
-#
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB-muis (3+ knoppe)"
+#: ../../netconnect.pm_.c:668
+msgid "External ISDN modem"
+msgstr "Eksterne ISDN-kaart"
 
-#
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB-muis"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "Konnekteer aan die internet"
 
-#
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB-muis (2 knoppe)"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "Watter tipe is u ISDN-konneksie?"
+
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Konfigureer internetkonneksie"
+
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "Frankryk"
+
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "Ander lande"
 
 #
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB-muis (3+ knoppe)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "In watter land is u?"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Generiese Muis (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "Alcatel modem"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "ECI modem"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Generiese 3-knop muis (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "Indien u ADSL-modem 'n Alcatel is, kies Alcatel, andersins ECI."
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "gebruik pppoe"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "moenie pppoe gebruik nie"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only 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'"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Konfigureer internetkonneksie"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"Watter DCHP-kli�nt wil u gebruik?\n"
+"Verstek is dhcpd"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Konfigureer internetkonneksie"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "Stel plaaslike netwerk op"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Netwerkkonfigurasie"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Busmuis"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Wil u die konfigurasie toets?"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Busmuis"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "Sper netwerkstelsel"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Busmuis"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Konnekteer aan die internet / Konfigureer LAN"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB Muis"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "Plaaslike netwerk is alreeds opgestel: Wil u?"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB Muis (3 knoppe of meer)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "Hoe wil u aan die internet konnekteer?"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Geen muis"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Netwerkkonfigurasie"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A of beter (seriaal)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
+"Nou dat u internetkonfigurasie opgestel is,\n"
+"moet u die rekenaar opstel om dit te deel.\n"
+"LW: U benodig 'n ware netwerkkaart om 'n lokalearea netwerk (LAN) op te "
+"stel.\n"
+"\n"
+"Wil u internetdeling opstel?\n"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Reeks (seriaal)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "geen netwerkkaart gevind nie"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (seriaal)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Stel netwerk op"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (seriaal)"
+#: ../../network.pm_.c:274
+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''."
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (seriaal)"
+#
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "Rekenaarnaam"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (seriaal)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+"WAARSKUWING: Die toestel is alreeds opgestel om aan die internette "
+"konnekteer.\n"
+"Druk OK om die toetsel so te hou.\n"
+"Veranderinge aan onderstaande velde sal hierdie konfigurasie oorskryf."
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (seriaal)"
+#: ../../network.pm_.c:302
+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 ""
+"Gee asb die IP-konfigurasie vir hierdie rekenaar.\n"
+"Elke item moet as 'n IP-adres in dotdesimalenotasie\n"
+"(1.2.3.4) gegee word."
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (seriaal)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Konfigureer netwerktoestel %s"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Muis (seriaal, ou C7 tipe)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Outomatiese IP"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (seriaal)"
+#
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "IP adres"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Generiese Muis (seriaal)"
+#
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "Netmasker"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft aanpasbaar (seriaal)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Generiese 3-knop Muis (seriaal)"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+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:341
+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 ""
+"Tik asb die rekenaarnaam in.\n"
+"Dit moet 'n volle gekwalifiseerde naam wees,\n"
+"bv. ``myne.mywerk.co.za''.\n"
+"U mag ook die netwerkhek byvoeg indien daar een is"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (seriaal)"
+#
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "DNS bediener"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Is dit korrek?"
+#
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "Portaal"
+
+#
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "Netwerkportaaltoestel"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "Instaanbedienerkonfigurasie"
 
-#: ../../partition_table.pm_.c:527
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP instaanbediener"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP instaanbediener"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Instaanbediener moet begin met http://"
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Instaanbediener moet begin met ftp://"
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
-msgstr ""
+msgstr "Ekstensiepartisie word nie op hierdie platform ondersteun nie"
 
-#: ../../partition_table.pm_.c:545
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4107,21 +5212,21 @@ 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:634
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fout met die les van l�er %s"
 
-#: ../../partition_table.pm_.c:641
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Herstel van l�er %s het gefaal: %s"
 
-#: ../../partition_table.pm_.c:643
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Korrupte rugsteunl�er"
 
-#: ../../partition_table.pm_.c:664
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Fout in die skryf van %s"
@@ -4142,59 +5247,68 @@ msgstr "belangrik"
 msgid "very nice"
 msgstr "baie oulik"
 
-#
 #: ../../pkgs.pm_.c:25
 msgid "nice"
 msgstr "oulik"
 
-#
 #: ../../pkgs.pm_.c:26 ../../pkgs.pm_.c:27
 msgid "interesting"
 msgstr "interessant"
 
-#
 #: ../../pkgs.pm_.c:28 ../../pkgs.pm_.c:29 ../../pkgs.pm_.c:30
 #: ../../pkgs.pm_.c:31
 msgid "maybe"
 msgstr "moontlik"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (belangrik)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (baie oulik)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (oulik)"
 
+#: ../../printer.pm_.c:19
+msgid "Local printer"
+msgstr "Plaaslike drukker"
+
 #
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Vertoon minder"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "Eksterne drukker"
 
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Vertoon meer"
+#
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "Verwyder CUPS-bediener"
 
-#: ../../printer.pm_.c:244
-msgid "Local printer"
-msgstr "Plaaslike drukker"
+#
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "Eksterne lpd-bediener"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "Eksterne lpd"
+#
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "Netwerkdrukker (sok)"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "Drukkertoestel URI"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Toestel word afgetas..."
@@ -4208,12 +5322,11 @@ msgstr "Toets poorte"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "'n Drukker, model \"%s\", is opgespoor op "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Plaaslikte drukkertoestel"
 
-#
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4221,16 +5334,15 @@ msgstr ""
 "Watter toestel is die drukker aan gekoppel?\n"
 "(let op dat /dev/lp0 ekwiwalent is aan LPT1:)\n"
 
-#
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Drukkertoestel:"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Eksterne lpd drukkeropsies"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4240,20 +5352,19 @@ msgstr ""
 "van die drukkkerbediener en die naam van die drukkertou\n"
 "nodig."
 
-#
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Eksterne bediener:"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Eksterne drukkertou"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) drukkeropsies"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4266,31 +5377,27 @@ msgstr ""
 "nie); moontlik die IP adres van die drukkerbediener; die drukkernaam; \n"
 "toepaslike gebruikerskode en wagwoord; werkgroepnaam."
 
-#
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "SMB-bedienernaam"
 
-#
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "SMB-bediener IP:"
 
-#
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Drukkernaam:"
 
-#
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Werkgroep:"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "NetWare drukkeropsies"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4302,135 +5409,154 @@ msgstr ""
 "rekenaarnaam nie); moontlik die IP adres van die drukkerbediener;\n"
 "die drukkernaam; toepaslike gebruikerskode en wagwoord."
 
-#
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Drukkerbediener"
 
-#
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Drukkertounaam"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "Sokdrukkeropsies"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"Om aan 'n sokdrukker te konnekteer, moet u die rekenaarnaam van die\n"
+"drukker voorsien en dalk ook 'n poortnommer."
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "Drukkerrekenaarnaam"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "Poort"
+
+#: ../../printerdrake.pm_.c:155
+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:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Oor watter tipe drukker beskik u?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Wil u drukwerk toets?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Toetsbladsy(e) word gedruk..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\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:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"Toetsbladsy(e) is na die drukkerstelsel gestuur.\n"
+"Dit mag 'n tydjie neem voordat drukwerk begin.\n"
+"Het dit reg gedruk?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Ja, druk die ASCII toetsbladsy"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Ja, druk die PostScript toetsbladsy"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Ja, druk albei toetsbladsye"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Stel drukker op"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Oor watter tipe drukker beskik u?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Drukkeropsies"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Papiergrootte"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Stoot papier uit na voltooiing?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Uniprint dryweropsies"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Kleurdiepte opsies"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Druk teks as PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Omgekeerde bladsyorde"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Korrigeer trapsgewyse teks?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Aantal bladsye per uitsetblad?"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Regs/Links kantlyne in punte (1/72 van 'n duim)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Bo/Onder kantlyne in punte (1/72 van 'n duim)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Ekstra GhostScriptopsies"
 
-#
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Ekstra teksopsies"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Wil u drukwerk toets?"
-
-#
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Toetsbladsy(e) word gedruk..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\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:222
-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?"
-msgstr ""
-"Toetsbladsy(e) is na die drukkerstelsel gestuur.\n"
-"Dit mag 'n tydjie neem voordat drukwerk begin.\n"
-"Het dit reg gedruk?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Drukker"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Wil u 'n drukker opstel?"
 
-#
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4438,21 +5564,67 @@ msgstr ""
 "Hier is die bestaande drukkertoue.\n"
 "U kan byvoeg or verwyder soos nodig."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "CUPS word gelaai"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr "CUPS-drywerdatagbasis word gelees"
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Kies drukkerkonneksie"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Hoe is die drukker gekonekteer?"
 
 #
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "Kies eksterne drukkerkonneksie"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+"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:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Verwyder drukkertou"
 
-#
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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?"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "Drukkernaam"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "Beskrywing"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "Ligging"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4463,48 +5635,45 @@ msgstr ""
 "(baie keer 'lp') and 'n gekoppelde spoelgids. Watter naam en\n"
 "spoelgids moet gebruik word?"
 
-#
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Naam van drukkertou"
 
-#
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Spoelgids"
 
-#
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Drukkerkonneksie"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, 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:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Kan nie l�er $file skryf nie"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid het gefaal"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid het gefaal. Dalk is 'raidtools' nie beskikbaar nie."
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Nie genoeg partisies vir RAID vlak %d nie\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron is skeduleerder vir periodiese instruksies."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4514,7 +5683,7 @@ msgstr ""
 "Dit kan ook gebruik word om die rekenaar af te bring wanneer die battery "
 "swak is."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4522,7 +5691,7 @@ msgstr ""
 "Loop instruksies deur 'at' geskeduleer op die tyd deur 'at' gespesifiseer. "
 "Loop ookinstruksiebondels wanneer die stelsellas laag genoeg is."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4535,7 +5704,7 @@ msgstr ""
 "by die standaard UNIX cron, insluitende beter sekuriteit en 'n kragtiger "
 "konfigurasie."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4546,7 +5715,7 @@ msgstr ""
 "Midnight Commander. Dit laat muisgebaseerde knip-en-plak aksies op die\n"
 "konsole toe asook opspringkieskaarte."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4554,7 +5723,7 @@ msgstr ""
 "Apache is 'n WWW-bediener.\n"
 "Dit kan HTML-l�ers uitstuur en CGI's hanteer"
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4570,7 +5739,7 @@ msgstr ""
 "waarvoor\n"
 "inetd verantwoordelik is."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4582,7 +5751,7 @@ msgstr ""
 "dit\n"
 "op meeste rekenaars ongesper laat."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4590,7 +5759,7 @@ 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:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4598,7 +5767,7 @@ msgstr ""
 "named (BIND) is die domeinnaamdiens (DNS) wat gebruik word om\n"
 "rekenaarname na IP-adresse toe om te skakel."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4606,7 +5775,7 @@ msgstr ""
 "Heg en ontheg all netwerkl�erstels (NFS), SMB (Lan Manger/Windows)\n"
 "en NCP (Netware) hegpunte."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4614,7 +5783,7 @@ msgstr ""
 "Aktiveer/Deaktiveer all netwerkkoppelvlakke wat opgestel is om by\n"
 "herlaaityf te begin."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4624,7 +5793,7 @@ msgstr ""
 "Hierdie diens voorsien NFS-bedienerfunksionaliteit. Dit word via\n"
 "die /etc/exports l�er opgestel."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4632,7 +5801,7 @@ 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:47
+#: ../../services.pm_.c:48
 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 "
@@ -4644,7 +5813,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:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4655,7 +5824,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:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4663,7 +5832,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:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4671,7 +5840,7 @@ msgstr ""
 "Stoor en herstel die stelselentropiepoel vir ho� kwaliteit,\n"
 "lukraaknommergenerasie."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4681,7 +5850,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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4689,7 +5858,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:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4697,7 +5866,7 @@ msgstr ""
 "Die 'rusers' protokol laat netwerkgebruikers toe om te bepaal wie\n"
 "aangeteken is op ander samewerkende rekenaars."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4706,7 +5875,7 @@ msgstr ""
 "ingeteken is op 'n rkeneaar wat die 'rwho' diensprogram loop.  (Amper soos "
 "'finger')."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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."
@@ -4714,70 +5883,220 @@ 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:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr "Hierdie skrip laai de nodige modules vir 'n USB-muis."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "Stop en begin die X-fontbediener met herlaaityd en afsittyd."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Kies watter dienste moet outomaties begin met herlaaityd."
 
-# 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
-#
-# 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.
-#
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Welkom by SILO 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"
-"\n"
+"Ek kan nie u partisietabel lees nie, dit is te korrup.\n"
+"Ek sal die nodige partisies skoonmak."
 
-#
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Stel LILO/GRUB op"
 
-#
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Maar 'n herlaaiskyf"
 
-#
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Formatteer floppie"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Keuse"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "LILO installasie het gefaal a.g.v. hierdie fout: "
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Internetkonneksiedeling is ontsper"
+
+#: ../../standalone/drakgw_.c:104
+#, fuzzy
+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"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Tabel"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Stel X op"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Internetkonneksiedeling is gesper"
+
+#: ../../standalone/drakgw_.c:123
+#, fuzzy
+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"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Tabel"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "Konfigurasiel�erinhoud is onverstaanbaar"
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "Internetkonneksiedeling"
+
+#: ../../standalone/drakgw_.c:152
+#, fuzzy
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+"Nou dat u internetkonfigurasie opgestel is,\n"
+"moet u die rekenaar opstel om dit te deel.\n"
+"LW: U benodig 'n ware netwerkkaart om 'n lokalearea netwerk (LAN) op te "
+"stel.\n"
+"\n"
+"Wil u internetdeling opstel?\n"
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Belmetode"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "Daar is geen netwerkkaart op hierdie rekenaar nie!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Geen ethernetkaart is op die stelsel gevind nie. Gebruik asb. die "
+"hardewarekonfigurasieprogram."
+
+#
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"Daar is net een konfigureerde netwerkkaart op u stelsel.\n"
+"\n"
+"$interface\n"
+"\n"
+"Wil u dit gebruik vir die LAN?"
+
+#: ../../standalone/drakgw_.c:223
+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:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"Waarskuwing! Die netwerkkaart is alreeds opgestel.]nWil u dit ooropstel?"
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr "Moontlike LAN-adresbotsing gevind in konfigurasie $_!\n"
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "Vuurmuurkonfigurasie gevind!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+"Waarskuwing! 'n Bestaande vuurmuurkonfigurasie is bespeur. U sal dalk na "
+"dietyd self regstellings moet aanbring. Gaan voort?"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+"Skrips word konfigureer, sagterware installeer en bedieners afgeskop..."
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "IDE word opgestel"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "Kon nie ipchains RPM m.b.v.  urpmi installeer nie."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "Kon nie dhcp RPM m.b.v. urpmi installeer nie."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "Kon nie linuxconf RPM m.b.v. urpmi installeer nie."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "Kon nie bind RPM m.b.v. urpmi installeer nie."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "Kon nie caching-nameserver RPM m.b.v. urpmi installeer nie.  "
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Geluk!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4834,37 +6153,47 @@ msgstr ""
 "Hierdie is Vlak-4 sekuriteit, maar die stelsel is afgeslote.\n"
 "Sekuriteitseienskappe is maksimaal."
 
-#
 #: ../../standalone/draksec_.c:49
 msgid "Setting security level"
 msgstr "Sekuriteitsvlak word gestel."
 
-#
 #: ../../standalone/drakxconf_.c:21
 msgid "Choose the tool you want to use"
 msgstr "Kies die instrument wat u wil gebruik"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Wat is u sleutelborduitleg?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Verander resolusie"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Wat is u muistoestel?"
+#: ../../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."
+
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "Geen 'serial_usb' gevind nie\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Emuleer derde knop?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Aan watter seriaalpoort is u muis gekoppel?"
 
-#
 #: ../../standalone/rpmdrake_.c:25
 msgid "reading configuration"
 msgstr "Konfigurasie word gelees"
@@ -4879,17 +6208,14 @@ msgstr "L�er"
 msgid "Search"
 msgstr "Soek"
 
-#
 #: ../../standalone/rpmdrake_.c:49 ../../standalone/rpmdrake_.c:56
 msgid "Package"
 msgstr "Pakket"
 
-#
 #: ../../standalone/rpmdrake_.c:51
 msgid "Text"
 msgstr "Teks"
 
-#
 #: ../../standalone/rpmdrake_.c:53
 msgid "Tree"
 msgstr "Boom"
@@ -4902,17 +6228,14 @@ msgstr "Gesorteer volgens"
 msgid "Category"
 msgstr "Kategorie"
 
-#
 #: ../../standalone/rpmdrake_.c:58
 msgid "See"
 msgstr "Sien"
 
-#
 #: ../../standalone/rpmdrake_.c:59 ../../standalone/rpmdrake_.c:163
 msgid "Installed packages"
 msgstr "Installeerde pakkette"
 
-#
 #: ../../standalone/rpmdrake_.c:60
 msgid "Available packages"
 msgstr "Beskikbare pakkette"
@@ -4925,12 +6248,10 @@ msgstr "Wys net eindnodes"
 msgid "Expand all"
 msgstr "Brei alles uit"
 
-#
 #: ../../standalone/rpmdrake_.c:68
 msgid "Collapse all"
 msgstr "Trek alles in"
 
-#
 #: ../../standalone/rpmdrake_.c:70
 msgid "Configuration"
 msgstr "Konfigurasie"
@@ -4943,7 +6264,6 @@ msgstr "Voeg pakketareas by"
 msgid "Update location"
 msgstr "Dateer area op"
 
-#
 #: ../../standalone/rpmdrake_.c:79 ../../standalone/rpmdrake_.c:328
 msgid "Remove"
 msgstr "Verwyder "
@@ -4952,7 +6272,6 @@ msgstr "Verwyder "
 msgid "Configuration: Add Location"
 msgstr "Konfigurasie: Voeg area by"
 
-#
 #: ../../standalone/rpmdrake_.c:103
 msgid "Find Package"
 msgstr "Soek pakket"
@@ -4969,12 +6288,10 @@ msgstr "Skakel tussen installeerde en beskikbare"
 msgid "Files:\n"
 msgstr "L�ers:\n"
 
-#
 #: ../../standalone/rpmdrake_.c:161 ../../standalone/rpmdrake_.c:209
 msgid "Uninstall"
 msgstr "Verwyder"
 
-#
 #: ../../standalone/rpmdrake_.c:163
 msgid "Choose package to install"
 msgstr "Kies pakket om te installeer"
@@ -4987,12 +6304,10 @@ msgstr "Afhanklikhede word getoets"
 msgid "Wait"
 msgstr "Wag"
 
-#
 #: ../../standalone/rpmdrake_.c:209
 msgid "The following packages are going to be uninstalled"
 msgstr "Die volgende pakkette gaan verwyder word"
 
-#
 #: ../../standalone/rpmdrake_.c:210
 msgid "Uninstalling the RPMs"
 msgstr "RPM's word verwyder."
@@ -5041,7 +6356,6 @@ msgstr "Wat soek vir?"
 msgid "Give a name (eg: `extra', `commercial')"
 msgstr "Gee 'n (engelse) naam (bv. 'extra')"
 
-#
 #: ../../standalone/rpmdrake_.c:291
 msgid "Directory"
 msgstr "L�ergids"
@@ -5088,3 +6402,849 @@ msgstr "Eindnodes word gesoek"
 #: ../../standalone/rpmdrake_.c:360
 msgid "Finding leaves takes some time"
 msgstr "Soek van eindnodes neem 'n tydjie"
+
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Internetkonfigurasie"
+
+#, fuzzy
+msgid "Internet"
+msgstr "interessant"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Kantoor"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multimedia"
+
+msgid "KDE"
+msgstr "KDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multimedia"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Dokumentasie"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Kies die grootte van die installasie"
+
+#~ msgid "Total size: "
+#~ msgstr "Totale grootte: "
+
+#~ msgid "Reconfigure local network"
+#~ msgstr "Herkonfigureer netwerk nou"
+
+#~ 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"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "Alles is opgestel.\n"
+
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Konnekteer aan die internet met 'n 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"
+
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Konnekteer aan die internet met 'n kabelmodem"
+
+#~ msgid ""
+#~ "Time (secs) of inactivity after which\n"
+#~ "it hangs up. (leave blank to disable it)"
+#~ 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)"
+
+#~ msgid "What do you wish to do?"
+#~ msgstr "Wat wil u doen?"
+
+#~ msgid "Install/Rescue"
+#~ msgstr "Installasie/Redding"
+
+#~ msgid "Rescue"
+#~ msgstr "Redding"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Watter partisietipe verlang u?"
+
+#
+#~ 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ 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 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 WERKLIK WEET WAAROOR DIT GAAN "
+#~ "NIE!\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "U kan nou kies watter partisie(s) gebruik kan word om Linux-Mandrake\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 "
+#~ "geskep\n"
+#~ "word. Hierdie operasie bestan uit die logiese verdeling van die hardeskyf "
+#~ "in\n"
+#~ "aparte bruikbare areas\n"
+#~ "\n"
+#~ "\n"
+#~ "Indien u nuwe partisies moet skep, gebruik \"Outo-allokasie\" om outomaties\n"
+#~ "partisies vir Linux te skep. U kan die skyf vir partisionering selekteer "
+#~ "deur\n"
+#~ "op \"hda\" te kliek vir die eerste IDE hardeskyf, hdb vir die tweede of "
+#~ "\"sda\"\n"
+#~ "vir die eerste SCSI skyf ens.\n"
+#~ "\n"
+#~ "\n"
+#~ "Twee algemene partisies is die \"root\" partisie (/), wat die wortel is\n"
+#~ "van die l�ergidsstelsel, en /boot, wat die nodige l�ers bevat om die\n"
+#~ "bedryfstelsel aan die gang te kry wanneer die rekenaar aangesit word.\n"
+#~ "\n"
+#~ "\n"
+#~ "Omdat die gevolge van hierdie proses onomkeerbaar is, kan partisionering "
+#~ "baie\n"
+#~ "intimiderend en stresvol vir die onervare gebruiker wees. DiskDrake maak "
+#~ "di�\n"
+#~ "proses heelwat makliker. Lees die dokumentasie en neem u tyd voor u "
+#~ "voortgaan.\n"
+#~ "\n"
+#~ "\n"
+#~ "U kan enige opsie gebruik deur die sleutelbord te gebruik. Navigeer deur "
+#~ "diepartisies met\n"
+#~ "Tab en die pyltjies. Wanneer 'n partisie gekies is, gebruik:\n"
+#~ "\n"
+#~ "- Ctrl-c om 'n partisie te skep (wanneer 'n le� partisie gekies is)\n"
+#~ "\n"
+#~ "- Ctrl-d om 'n partisie uit te vee\n"
+#~ "\n"
+#~ "- Ctrl-m om 'n partisie te heg\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."
+#~ msgstr ""
+#~ "Enige partisies wat nuut geskep is, moet eers formateer word voor gebruik.\n"
+#~ "(Formateering beteken die skep van 'n lOerstelsel). U kan nou kies om ook\n"
+#~ "bestaande partisies te herformateer en die data daarop te vernietig.\n"
+#~ "NOTA: Dit is nie nodig om alle bestaande partisies te herformateer nie,\n"
+#~ "veral indien daar data op is wat u wil hou. 'n Tipiese voorbeeld is /home."
+
+#~ 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."
+#~ msgstr ""
+#~ "Die gekose pakette gaan nou installeer word. Hierdie proses\n"
+#~ "sal 'n paar minute neem. Indien u 'n opgradering gekies, kan dit\n"
+#~ "nog langer neem voordat die opgradering begin."
+
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Indien DrakX nie u muis kon vind nie, of as u wil sien\n"
+#~ "wat gedoen is, sal u moet die bg. lys van muistoestelle gepresenteer\n"
+#~ "word.\n"
+#~ "\n"
+#~ "\n"
+#~ "Indien u met DrakX saamstem, spring na die afdeling wat u\n"
+#~ "verlang deur op die kierkaart links te kliek. Andersins kies\n"
+#~ "'n muistoetsel in die kieskaart wat u dink die beste klop met die\n"
+#~ "muis wat u het.\n"
+#~ "\n"
+#~ "In geval van 'n seriaalmuis, moet u ook vir DrakX die seriaalpoort\n"
+#~ "gee."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "Hierdie afdeling is vir die konfigurasie van 'n lokaalareanetwerk\n"
+#~ "of 'n modem.\n"
+#~ "\n"
+#~ "Kies \"LAN\" en DrakX sal probeer om 'n Ethernetkaart in u rekenaar\n"
+#~ "te vind. PCI-kaarte sal heelwaarskynlik outomaties gevind en\n"
+#~ "inisialiseer word. Indien u 'n ISA-kaart het sal daar 'n kieslys\n"
+#~ "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"
+#~ "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"
+#~ "adresse kies.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kies \"Uitbel met Modem\" en die internetkonneksie vir 'n modem\n"
+#~ "sal opgestel word. DrakX sal u modem probeer bepaal. Indien di� faal\n"
+#~ "sal u die modem en korrekte seriaalpoort moet selekteer."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "GNU/Linux kan verskeie drukkers gebruik. Elkeen van hierdie tipes\n"
+#~ "verlang 'n ander opstelling. Let asb. daarop dat die verstek drukkernaam "
+#~ "'lp' is.\n"
+#~ "U moet so 'n drukker skep.  U kan egter addisionele name bysit deur dit met "
+#~ "die '|' karakterte skei.\n"
+#~ "Derhalwe kan u dus die drukker 'n meer betekenisvolle naam ook toeken.\n"
+#~ "Die drukker met 'lp' in die naam sal die verstek drukker wees.\n"
+#~ "\n"
+#~ "\n"
+#~ "Indien u drukker direk aan die rekenaar gekoppel is, selekteer\n"
+#~ "\"Lokale Drukker\". U moet dan die korrekte poort uitwys\n"
+#~ "en die gepaslike filter selekteer.\n"
+#~ "\n"
+#~ "\n"
+#~ "Indien u 'n drukker om 'n ander Unix-rekenaar wil gebruik, kies\n"
+#~ "\"Eksterne lpd\". In hierdie geval moet u die naam van die drukkertou\n"
+#~ "op die ander rekenaar ken.\n"
+#~ "\n"
+#~ "\n"
+#~ "Indien u toegang tot 'n SMB drukker (op 'n Windows-rekenaar) verlang,\n"
+#~ "moet u die SMB/NETBIOS naam (nie TCP/IP-naam nie) ken en moontlik ook die\n"
+#~ "IP-adres. Daarby moet u ook 'n gebruikerskode, werkgroep en wagwoord en die\n"
+#~ "drukkernaam voorsien. Dieselfde geld vir 'n Netware-drukker, behalwe dat u\n"
+#~ "die werkgroep hoef te voorsien nie."
+
+# ../help.pm_.c:240 ../help.pm_.c:481 msgid ""
+#~ 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."
+#~ msgstr ""
+#~ "Dit word sterk aanbeveel dat u \"Ja\" antwoord. Indien u Windows sou\n"
+#~ "herinstalleer, sal dit die herlaaisektor oorskryf. Indien u die die "
+#~ "herlaaiskyf\n"
+#~ "gemaak het nie, sal u nie weer in GNU/Linux kan inkom nie."
+
+#~ msgid "Move your wheel!"
+#~ msgstr "Draai u wiel!"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Vergeet van die veranderinge?"
+
+#~ msgid "Cable connection"
+#~ msgstr "Kabelkonneksie"
+
+#~ msgid "Host name:"
+#~ msgstr "Rekenaarnaam:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Wat is u muistoestel?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Outomatiese resolusies"
+
+#~ 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"
+#~ msgstr ""
+#~ "Ek gaan nou probeer m die beskikbare resolusies te kry.\n"
+#~ "Die skerm sal 'n paar maal flits...\n"
+#~ "U kan die skerm afsit indien u wil, ek sal biep wanneer ek klaar is"
+
+#~ 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?"
+#~ msgstr ""
+#~ "Ek kan probeer om al die beskikbare resolusies te kry (bv. 800x600).\n"
+#~ "Soms kan die rekenaar ophang.\n"
+#~ "Wil u probeer?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Geen geldige modes was gevind nie\n"
+#~ "Probeer 'n ander videokaart of monitor"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Outomatiese resolusie soektog"
+
+#~ msgid "dhcpd"
+#~ msgstr "dhcpd"
+
+#~ msgid "pump"
+#~ msgstr "pump"
+
+#~ msgid "dhcpxd"
+#~ msgstr "dhcpxd"
+
+#~ msgid "dhcp-client"
+#~ msgstr "DHCP-kli�nt"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB-muis"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB-muis (2 knoppe)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB-muis (3+ knoppe)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB-muis"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB-muis (2 knoppe)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB-muis (3+ knoppe)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Generiese Muis"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Busmuis"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Busmuis"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech Busmuis"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB Muis"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB Muis (3 knoppe of meer)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A of beter (seriaal)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (seriaal)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (seriaal)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (seriaal)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Generiese Muis (seriaal)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsoft aanpasbaar (seriaal)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Generiese 3-knop Muis (seriaal)"
+
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse (seriaal)"
+
+#~ 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"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "NFS heg het gefaal"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Socket"
+#~ msgstr "Sok"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Kriptografie"
+
+#~ 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?"
+#~ msgstr ""
+#~ "DrakX sal konfigurasiel�ers maak vir beide XFree 3.3 en XFree 4.0.\n"
+#~ "By verstek sal die 4.0 bediener gebruik word indien u videokaart  "
+#~ "ondersteun. word\n"
+#~ "\n"
+#~ "Wil u XFree 3.3 behou?"
+
+#~ msgid "Configure LAN"
+#~ msgstr "Konfigureer LAN"
+
+#~ msgid "End configuration"
+#~ msgstr "Be�indig konfigurasie"
+
+#~ msgid "Do not set up networking"
+#~ msgstr "Moenie netwerk opstel nie"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "Wil u die netwerk vir u stelsel opstel?"
+
+#~ msgid "Show less"
+#~ msgstr "Vertoon minder"
+
+#~ msgid "Show more"
+#~ msgstr "Vertoon meer"
+
+#~ msgid "curly"
+#~ msgstr "krul"
+
+#~ msgid "default"
+#~ msgstr "Verstek"
+
+#~ msgid "tie"
+#~ msgstr "das"
+
+#~ msgid "brunette"
+#~ msgstr "brunette"
+
+#~ msgid "girl"
+#~ msgstr "meisie"
+
+#~ msgid "woman-blond"
+#~ msgstr "blondine"
+
+#~ msgid "automagic"
+#~ msgstr "outowonder"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Wat is u sleutelborduitleg?"
+
+#~ msgid "Normal"
+#~ msgstr "Normaal"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Wil u PCMCIA-kaarte soek?"
+
+#~ 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?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "Soek vir PCI-toestelle?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "Deursoek wortell�erstelsel"
+
+#~ 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 "Can't use broadcast with no NIS domain"
+#~ msgstr "Kan nie uitsaau sonder 'n NIS-domein 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!"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "U het nie genoeg plek vir Lnx4win nie"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "Outomaties"
+
+# 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.
+#~ 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 ""
+#~ "Welkom by LILO 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 dit 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
+#~ 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 ""
+#~ "Welkom by SILO 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"
+#~ "\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "SILO hoofopsies"
+
+#~ msgid ""
+#~ "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"
+#~ "U kan byvoeg or verwyder soos nodig."
+
+#~ msgid "This label is already in use"
+#~ msgstr "Hierdie etiket is alreeds in gebruik"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "SILO installasie het gefaal a.g.v. hierdie fout: "
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX will probeer om eers te kyk vir een of meer bekende PCI\n"
+#~ "SCSI kaarte. Indien iets gevind word, en die drywers daarvoor\n"
+#~ "bekend is, sal dit outomaties bygevoeg word.\n"
+#~ "\n"
+#~ "\n"
+#~ "Indien u 'n ISA SCSI kaart het, of 'n onbekende PCI SCSI kaart, of\n"
+#~ "geen SCSI kaart nie, sa; u gevra word of daar enige SCSI kaarte is.\n"
+#~ "Indien daar geen is nie, antwoord \"Nee\". Indien daar wel is, antwoord\n"
+#~ "\"Ja\" en 'n lys van kaarte sal gegee word waaruit u moet kies.\n"
+#~ "\n"
+#~ "\n"
+#~ "Na seleksie van die drywer, sal DrakX of vra vir opsies. Probeer eers\n"
+#~ "dat die drywer die hardeware ondervra; dit werk gewoonlik.\n"
+#~ "\n"
+#~ "\n"
+#~ "Indien nie, moenie die dokumentasie van u hardeware vergeet nie; ook nie\n"
+#~ "enige inligting van Windows (indien u dit gennstalleer het). Hierdie is\n"
+#~ "opsies wat u die drywer moet verskaf."
+
+#~ msgid "Shutting down"
+#~ msgstr "Stelselafsluiting"
diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po
index db7bc3dc4..c19f9da3f 100644
--- a/perl-install/share/po/be.po
+++ b/perl-install/share/po/be.po
@@ -1,54 +1,114 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 1999 MandrakeSoft.
-# Alexander Bokovoy <bokovoy@minsk.lug.net>, 2000
+# Alexander Bokovoy <ab@avilink.net>, 2000
+# Maryia Davidouskaia <maryia@scientist.com>, 2000
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
-"PO-Revision-Date: 1999-09-24 10:07 +0200\n"
-"Last-Translator: Alexander Bokovoy <bokovoy@minsk.lug.net>\n"
-"Language-Team: by\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
+"PO-Revision-Date: 2000-09-24 12:30 +0100\n"
+"Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
+"Language-Team: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=windows-1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "�i��������"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
-msgstr "�������� �i��������"
+msgstr "�������� �i��������"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
-msgstr "�������� X ������"
+msgstr "�������� X ������"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X ������"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "������ XFree86 %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "���� ����i������� XFree �� ������� ��������?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"��������� 3D-���������� � ����� ��������� �������� ����� � XFree %s.\n"
+"XFree %s ���� ������������� ����� 2D-���������� ��� ����� ���������."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+"���� �i�������� ���� ���� 3D-����������, ���� ��������i������ �����i XFree "
+"%s."
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s � ���������� 3D-����������"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"���� �i�������� ���� ���� 3D-����������, ���� ��������i������ �����i XFree "
+"%s.\n"
+"����� �� �����, ��� ���� ����������������� ��������� I ���� �������I ��\n"
+"���I����� ������ ����'�����. ���� �i�������� ��������i������ XFree %s, ��i\n"
+"����� ��������i��� ����� � 2D-�����������."
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"���� �i�������� ���� ���� 3D-����������, ���� ��������i������ �����i XFree "
+"%s.\n"
+"����� �� �����, ��� ���� ����������������� ��������� I ���� �������I ��\n"
+"���I����� ������ ����'�����."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s � ����������������� ���������� 3D-����������"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "��������� XFree"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "�������� ����� �i��������i"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
-msgstr "�������� ���������� ��������i ��� �������"
+msgstr "�������� ���������� ��������i ��� �������"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
-msgstr "�������� ���i���"
+msgstr "�������� ���i���"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "���i���"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -69,878 +129,1079 @@ msgstr ""
 "�����I �����, ��� ������� ���i ���i��� �� ������� �i�����i����i, ����\n"
 "�� ��������� ��������� ���������i ������ ���i����: � ����i������ �������\n"
 "�� ������ �����i�� ���i���.\n"
-"���i �� ������������, �������� �������������� ��������i."
+"���i �� ������������, �������� �������������� ��������i."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "������� �������������� ��������i"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "������� ������������ ��������i"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
-msgstr "���i��� ������ �� ��������"
+msgstr "���i��� ������ �� ���������"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
-msgstr "���������� ���� �� ���������"
+msgstr "�i�������� ���� �� ������i��������"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
-msgstr "������ ������ ���� �� �������"
+msgstr "������ ������ ���� �� ���������"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
-msgstr "�i ������� ����i������ ��������i?"
+msgstr "�i ������� �������i������ ��������i?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "������������: ����i������� �� ����� �i�������� ����������"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
-msgstr "�������� ��������"
+msgstr "�������� ��������� ��������i"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
 msgstr ""
 "\n"
-"����������� ����i�� ��������� ���������"
+"����������� ����i�� ��������� ���������"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "�������:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
-msgstr "��������� %d ������"
+msgstr "��������� %d ������"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
-msgstr ""
+msgstr "���� ��������� ��������� ��������i?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "�������� �������, ����������� ����i�� ���������"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "������������ ���������� ������ ������"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"��� ������ ������������ ������ ����� ���������� ������ ������. \n"
-"��� ����� ����� �i����... ���i ��� �� ���������� �i����i, i� ����� "
-"���������, ���� ����� ���������� ����� ������ �����."
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "������ ������"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "����� ������ ������ i ����i�i ������"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "�i��������: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "������ XFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "�������� ��"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "������ ������"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"����� ������������ ������i ��������� ������ ������ (����.: 800x600).\n"
-"� �����i ����i� ������� ���� ���� �������i �� �������� ����'����� .\n"
-"������� ������������?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"������������ ������ �� ���������.\n"
-"����������� ������� i���� �i�������� �i ���i���"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "��� ����i�����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "��� ����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "���: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "���i���: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "������� ���.����. ���i����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "������� ����.����. ���i����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "�i��������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
-msgstr "�i���������: %s KB\n"
+msgstr "�i���������: %s ��\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "��������� ����i�i ������: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "������ ������: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "������ XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "������ XFree86: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "���������� ��������i X-Window"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "����i�� ���i���"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "����i�� �i��������"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "����i�� ��������i �������"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "����i�� ������ ������"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "����������� ����� ������ ������"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "I���������"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
-msgstr "��������� i���"
+msgstr "��������� ���� ���"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "�����"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
-msgstr "��� �� ���i�� ����i��?"
+msgstr "��� �� ������� ����i��?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "������ �������i?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"ֳ ������� �� �������� ��������?\n"
+"������� ������������:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
-msgstr "���i �����, ���������i�� � %s ��� ��������i ���������"
+msgstr "���i �����, �������i�� � %s ��� ��������i ���������"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "���i �����, �����i��, � ����� ����������� Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "������ X ��� ������ �i�����"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
 msgstr ""
-"����� ������i�� �i����� ��� ������������ ������� X ����� ������ �i�����.\n"
-"�������, ��� X ��������� ��� ��������?"
+"����� ������i�� �i����� ��� ������������ ������� X ����� ������ �i�����.\n"
+"�������, ��� X �������� ��� ��������?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "����������� ������ � �i�����"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"����� ������i�� �i����� ��� ������������ ������� � �i����� ���\n"
+"������ ����������i��. ���i �� �� ������� ������, ���i��i�� \"������\"."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "�������� �������� ����������i��:"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "�������� �������� �����:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 ������ (8 �i�)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 ������ ������ (15 �i�)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 ����� ������ (16 �i�)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
-msgstr "16 �i�i���� ������ (24 �i��)"
+msgstr "16 �i����� ������ (24 �i��)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 �i�i���� ������ (24 �i��)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
-msgstr "256 kB"
+msgstr "256 ��"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
-msgstr "512 kB"
+msgstr "512 ��"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
-msgstr "1 MB"
+msgstr "1 ��"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
-msgstr "2 MB"
+msgstr "2 ��"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
-msgstr "4 Mb"
+msgstr "4 ��"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
-msgstr "8 Mb"
+msgstr "8 ��"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
-msgstr "16 MB �i �����"
+msgstr "16 �� �i �����"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "���������� VGA, 640x480 ��� 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 ��� 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
-msgstr "������� � 8514, 1024x768 ��� 87 Hz ����������� (���� 800x600)"
+msgstr "������� � 8514, 1024x768 ��� 87 Hz ����������� (���� 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
-msgstr "Non-Interlaced SVGA, 1024x768 ��� 60 Hz, 800x600 ��� 72 Hz"
+msgstr "������������� SVGA, 1024x768 ��� 60 Hz, 800x600 ��� 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
-msgstr "High Frequency SVGA, 1024x768 ��� 70 Hz"
+msgstr "�������������� SVGA, 1024x768 ��� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
-msgstr "Multi-frequency, ��i ������� ��������i���� 1280x1024 ��� 60 Hz"
+msgstr "������������, ��i ������� ��������i���� 1280x1024 ��� 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
-msgstr "Multi-frequency, ��i ������� ��������i���� 1280x1024 ��� 74 Hz"
+msgstr "������������, ��i ������� ��������i���� 1280x1024 ��� 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
-msgstr "Multi-frequency, ��i ������� ��������i���� 1280x1024 ��� 76 Hz"
+msgstr "������������, ��i ������� ��������i���� 1280x1024 ��� 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "���i���, ��i ������� ��������i���� 1600x1200 ��� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "���i���, ��i ������� ��������i���� 1600x1200 ��� 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr ""
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "��������"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-#, fuzzy
-msgid "tie"
-msgstr "�������"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr ""
-
-#: ../../any.pm_.c:19
-#, fuzzy
-msgid "automagic"
-msgstr "����������� IP"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "����� ������ ������������ ��������"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
-msgstr "����� ������ ���������� (MBR)"
+msgstr "����� ������ ������� (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "�������� LILO/GRUB"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "����븢�� SILO"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
-msgstr "���� �� ������� �������i�� ��������� ���������?"
+msgstr "���� �� ������� ���������� ��������� ���������?"
 
-#: ../../any.pm_.c:73
-#, fuzzy
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "�������� LILO/GRUB"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
-msgstr "��������"
+msgstr "����"
 
-#: ../../any.pm_.c:73
-#, fuzzy
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
-msgstr "�� ��i ������ ��������i��?"
+msgstr "��i ��������� ��������� �� ������� �������������?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "����븢�� ����������"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
-msgstr "����������� ����������"
+msgstr "����������� �������"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
-msgstr ""
+msgstr "LBA (�� ������ ��� ������ ����i�� BIOS)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "���������"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "���������"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "�������� ����� ��������� ������� �� ���������"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "�i���-�����"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "�������� ����� ��������� ������� �� ���������"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
-msgstr "������:"
+msgstr "������"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
-msgstr "�������� ������:"
+msgstr "�������� ������"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
-msgstr "����������� ����� ���������� �����"
+msgstr "����������� ����� ���������� �����"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "�����������"
 
-#: ../../any.pm_.c:98
-#, fuzzy
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
-msgstr "������� ����i LILO"
+msgstr "������� ����i ����������� ����������"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "����� ``����������� ����� ���������� �����'' �� ��������������� ��� ������"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "����������� ���� ���"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "�����i �� ���������"
 
-#: ../../any.pm_.c:112
-#, fuzzy
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
 msgstr ""
-"LILO ������� ��������� ������.\n"
-"�� ������ ������ ����, ����� ����i�� i�������."
+"� ���� ������ ��������� ������.\n"
+"�� ������ ������ ����, ����� ����i�� i�������."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "������"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "��������"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "��i ��� ������ ������� ������?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "I���� �� (SunOS,...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "I���� OS (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "��i ��� ������ ������� ������?"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "������"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "��������"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "�������-���i�"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "����i��"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
-msgstr "Unsafe"
+msgstr "����������"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "�����"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
-msgstr "��������"
-
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+msgstr "�� ���������"
+
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "��"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
-msgstr "����i�� �����"
+msgstr "�����i�� ���i�"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "������ ����� �� �����������"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "����� ����� ��� ���������������"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "��������� %s %s i���������"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "�i ���� � ��� i���?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "�i ���� � ��� %s i��������?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "��"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "���"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "�������� �������� ��� %s ����� %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(������ %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "��i ������� %s ������������?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"� ��������� �������� %s �������� �������� ��������� ���������� i���������,\n"
+"��� �������� ���� �� �����������. �i �� ������� �� ������ ��� ���\n"
+"���������� ����i, �i ������i�� �������� �������i������ ������\n"
+"� ������� ���������� i��������i? �������, ����i������� ��������\n"
+"�� �������� ����'�����, ��� ��� �i���� �� �����i��."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "���������"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "�������� ���������"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "�� �� ������ ������ ����i ������ %s."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"�� �� ������ ������ ����i ������ %s.\n"
+"����i - � ������� ``i��=�������� i��2=��������2 ...''.\n"
+"���������, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "����i ������:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"�������� ������ %s �� �������.\n"
+"������� ������������ � i����i ����������i?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Welcome to %s 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"
+
+# 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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Welcome to GRUB the operating system chooser!"
+
+# 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
+#
+#: ../../bootloader.pm_.c:597
+#, 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."
+
+# 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
+#
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Press enter to boot the selected OS, 'e' to edit the"
+
+# 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
+#
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "commands before booting, or 'c' for a command-line."
+
+# 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
+#
+#: ../../bootloader.pm_.c:600
+#, 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:604
+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:696
+msgid "Desktop"
+msgstr "������� ����"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "������� ����"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d ��i�i�"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 ��i�i��"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d ������"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "��������"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "�������i������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "��i�����"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "������i�������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "�������� ������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "���"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
-msgstr "����� ����i�������"
+msgstr "������ ����i�������"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "���i� /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "����� ��������"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "�������� �����"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "��������� � �����"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "��������� � ����"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "������� ���������"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "��������� � �������"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "��������� �� �������"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
-msgstr "�����i�� ��"
+msgstr "�����i�� ��"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "������i������ ��"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
-msgstr "�������i�� ����������"
+msgstr "������������ ����������"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "��� ��������� �������� �����������"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "������ ������� ���������"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr ""
-"��� ����i�� ����� �������, ����i�� ���i� i �������� �������� ������� "
+"��� ����i�� ����� �������, �����i�� ���i� i �������� �������� ������� "
 "(extended)"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
-msgstr "�������� ����i�� ��������"
+msgstr "���������� ����i�� ��������"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "�����"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "���i� ����i�� ��������"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "����������i��"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
-msgstr ""
-
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "�����"
+msgstr "�i��������� �������� �i����� (loopback)"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
-msgstr ""
+msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "����i�"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "�����"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "����i�"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "���� �������� �i�����:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "������������i"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 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"
-"(�������� ������������ MicroSoft Dos/Windows).\n"
-"�������� ��-������ ����i�� ������ ��������\n"
+"����� �� ����� �����i ���i� ���i�i ������� FAT\n"
+"(�������� �������������� MicroSoft Dos/Windows).\n"
+"��������, ��-������, ����i�� ������ ��������\n"
 "(��i��i�� �� ���, � ����� �� \"�������� ������\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
-msgstr "��-������, ����i�� ��������� ���i� ����� ��������"
+msgstr "��-������, ����i�� ���������� ���i� ����� ��������"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "������� �����i��!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 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:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
-msgstr ""
+msgstr "������� �����i��. ����� �������� ������ �����i��"
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "�������"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
-msgstr "����� ����i�������:"
+msgstr "������ ����i�������:"
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "�������:"
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "�i���� ��� DOS-�����: %s (�����)\n"
+msgstr "�i���� ��� DOS-�����: %s (�����)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "���: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "�������: ������ %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "�����: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s �������"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "���i���� � %d �� %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "������i�������\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "�� ��������i������\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "������i������\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
-msgstr ""
+msgstr "����(�) �i��������� �������� �i�����: %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 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:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "�������� %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "����� ��������� %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-����i %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
-msgstr ""
+msgstr "I�� ����� �i��������� �������� �i�����: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "����i�� �� �������"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "�����: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "���������: %s ���i����, %s �������, %s �������\n"
 
-#: ../../diskdrake.pm_.c:267
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:273
+#, c-format
 msgid "Partition table type: %s\n"
-msgstr "���i� ����i�� ��������"
+msgstr "��� ����i�� ��������: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "�� ���� %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "����i�������"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "�������"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "������ �� RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
-msgstr "����i�� � RAID"
+msgstr "�����i�� � RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "����i�� RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
-msgstr ""
+msgstr "������������� ��� �i��������� �������� �i�����"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
-msgstr "�������� �������"
+msgstr "�������� �������"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 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"
+"��������, ��� ������ �������� /boot �� ����� ����� (�� ���i���� > 1024).\n"
 "����� �� �������������� LILO - ���� ���� �� ����� ���������, ����� LILO �� "
 "��������������, i ���� /boot �� ��������."
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -948,218 +1209,230 @@ msgid ""
 "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, �� ����������� ������ "
+"1024-�� ���i���� ��������� �����, � � ��� ���� �������� /boot .\n"
+"���i ����� �������������� �������� �������i LILO, �� ����������� ������\n"
 "������� /boot"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
+"�� ������i RAID ������� �� �������.\n"
+"���� ����������, ��i � ������i��� ��� /boot ��������.\n"
+"������� ������ /boot, ���i �����."
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
-msgstr "���������������� ``%s'' "
+msgstr "�������������� ``%s'' ������"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "�������� ����i�� ``Unmount''"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
+#, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
-msgstr "��� �������� � ����� �������� ������ ��������"
+msgstr "��� �������� � �������� %s ������ �������� ����� ����� ��� ����"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "������� ����������?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "�����i ��� ���������"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "�����i ��� ���i�� ����i�� ��������"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "����i�� ��� ��������"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "���� ��� �������� ��� ��������?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "�������� ����"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr ""
+msgstr "�� �� ������ ����i���� �� �������, ����� ��i� ����� �� 32 ��"
 
-#: ../../diskdrake.pm_.c:484
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:490
+#, c-format
 msgid "Where do you want to mount loopback file %s?"
-msgstr "���� �� ������� �����i������ ���������� %s?"
+msgstr "���� �� ������� �����i������ �i��������� ������� %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
-msgstr "���� �� ������� �����i������ ���������� %s?"
+msgstr "���� �� ������� �����i������ ������� %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
+"������ ���������� ������ ����i�������, ���� ��� ������ ��������������� ���\n"
+"�i��������� �������� �i�����.\n"
+"�������� �����i�� �i��������� �i�����"
 
-#: ../../diskdrake.pm_.c:509
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:515
+#, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "��� �������� � ����� �������� ������ ��������"
+msgstr "��� �������� � �������� %s ������ �������� ����� ��������������"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "������i�������"
 
-#: ../../diskdrake.pm_.c:512
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:518
+#, c-format
 msgid "Formatting loopback file %s"
-msgstr "������i������� �������� %s"
+msgstr "������i������� �i���������� �������� %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
-msgstr "������i������� �������� %s"
+msgstr "������i������� �������� %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
-msgstr "����� ������i������� ��i� ��������"
+msgstr "����� ������i������� ��i� ��������,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
-msgstr "��� �������� � ����� ��������� ������ ��������"
+msgstr "��� �������� � ����� ��������� ������ ��������"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "������������"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "�� ��i ���� ��������i��?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "�� ��i ������ ��������i��?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "�����������"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "������������ �������..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "����i�� ����������� ���������� %s ����� ���i���� �� ����!"
+msgstr "����i�� ����������� ������� %s ����� ���i���� �� ����!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "��� �������i �����i�i � �������, ��������� ����������i���"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "���i����� ���� �������� �i����� FAT"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "�������� ������"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
 #, fuzzy
+msgid "This partition is not resizeable"
+msgstr "������ ����� �������� �� ������� ����i��?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
-msgstr "��� �������� � ����� �������� ������ ��������"
+msgstr "��� �������� � ����� �������� ���i��� ���� �'���i�i������"
 
-#: ../../diskdrake.pm_.c:588
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:599
+#, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "��� �������� � ����� �������� ������ ��������"
+msgstr "��� �������� � �������� %s ������ ��������"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "����� ����� ������"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
-msgstr "MB"
+msgstr "��"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "��������� ������ ��������"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "��������� ������:"
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
-msgstr "����� � MB:"
+msgstr "����� � ��:"
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "��� �������� �i�����:"
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
-msgstr "�������i: "
+msgstr "���������: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
-msgstr ""
+msgstr "���� ������� �� ���� ���� ����������� ��� �i��������� �������� �i�����"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
-msgstr ""
+msgstr "�i��������� �������� �i����� (loopback)"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
-msgstr ""
+msgstr "I�� �i���������� ��������"
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr ""
+"���� ��� ��������������� i���� �i��������� �i������. ���i �����, \n"
+"�������� i���� �����"
 
-#: ../../diskdrake.pm_.c:778
-#, fuzzy
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
-msgstr "����� %s ��� i����"
+msgstr "���� ��� i����. ����������� ���?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
-msgstr "�������� ����"
+msgstr "�������� ����"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
-"��������� ����i�� ����������� ����� ��� i��� �����\n"
+"����i�� ����������� ����������� ����� ��� i��� �����\n"
 "���-���i i��i �������?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "�����!"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1167,129 +1440,161 @@ msgstr ""
 "������ ������� � ��������\n"
 "��� �������� �� ����� ������� ������ ��������"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "���������� ���������� ����i�� ��������"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
-msgstr "����������:"
+msgstr "�������"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "��������"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "����� �����"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
-msgstr "�������� i������ RAID ��� ���������"
+msgstr "�������� i������ RAID ��� ���������"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "����"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s ������� ������i������� %s"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
-msgstr "�� ����� �� ��������i������ %s � ����� %s"
-
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "������� ����i������� nfs"
+msgstr "�� ����� �� ��������i������ %s � ����� %s"
 
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "������� ����i�������: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "������� �������i������� %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "����� ����i������� ���i��� ��������� � /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
-msgstr "��� ���� ������� � ������� ����i������� %s\n"
+msgstr "��� ���� ������� � ������� ����i������� %s\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
-msgstr ""
+msgstr "����i������� ����� %s\n"
+
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr "���� ������� ������ ���������� ������ ��������� �������� ������"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:259
 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:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
-msgstr "������� �������� %s ��� ���i��: %s"
+msgstr "������� �������� %s ��� ���i��: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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 ""
-"�������: ��� ��������� ����� �������� �i���� �� �������� ���������� "
-"����������. �������� ������������ ��� ������ i�������� �������."
+"�������: ��� ��������� ����� �������� �i���� �� ��������� ���������� \n"
+"�������. �������� ������������ ��� ������ i�������� �������."
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "�� �� �������i ��i��i� ��������!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
-msgstr "�������� ���� �������i i ������ �i�����"
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
+msgstr "�������� ���� �������i i ������ �i�����"
+
+#: ../../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:10
+#: ../../help.pm_.c:22
 msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "�������� ��������� ���� ����i����� � ������������ ��i��"
+msgstr "�������� ��������� ���� ����i����� � ������������ ��i��"
 
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:25
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"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
+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"
-"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).\n"
 "\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
-"  - 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"
+"\t* Recommanded: 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"
-"  - 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"
+"\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1297,488 +1602,908 @@ msgid ""
 "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!\n"
+"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����!"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
+"������ ���� �������������� ������ ��������� (���i, �� ������i ��� "
+"����븢�i\n"
+" \"�� ������\" ����� \"�������\") ���������:\n"
+"\n"
+"  - ��������: �������� ���� ���, ���i ��� �������� ����� �������������� "
+"���\n"
+"    ��i���� ����� (������ ������, ����i�i i ����� �����). ����� �� �����,\n"
+"    ��� � ���i� ������� �� ������ ���������� �i ���i� � ����i������, "
+"������\n"
+"    ���������i i ����� �����.\n"
+"\n"
+"  - ��� ���������i: ���� ����� ���� ��� ��� ��������. �������� ���� ���,\n"
+"    ���i �������� ����� �������������� ��� ����������� �������. � �����\n"
+"    ������� � ��� ����� ����� �������� ������ ��� ����i����i, �������i "
+"����,\n"
+"    ������i������� ��������� ���� ����� ���i����� ������ �������.\n"
+"\n"
+"  - ������: �������� ���� ���, ���i ������, �� ���� ����� ����������  "
+"Linux-Mandrake,\n"
+"    ����� �������������� �� ������. ���������, �� ������� ������ (NFS ����� "
+"SMB),\n"
+"    ������ ����� (���� ���� ���� ����������� �� ���� ��������� UNIX lp (Line "
+"Printer) �i SMB),\n"
+"    ������ ���i������i ����������i�� (NIS), ������ ��� �������� i �.�.\n"
+"    � ���i� ������� ����i���� �i����� ���� KDE, GNOME i �.�. ���������� �� "
+"������.\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
+#, fuzzy
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 �������� ��������� �����i ���i� �i �������i �������� PCI\n"
-"i SCSI. ���i ������� ��������, i DrakX ������, ��i �������\n"
-"��� ��� ��������, ����� ������� ����� ���������� ����������.\n"
+"DrakX ����� ���������� ��������� PCI SCSI �������(�).\n"
+"���i DrakX ������� SCSI ������� i ����� ������ ��������� ��� ��� �������, "
+"��\n"
+"���������� ������� ��� (i�) � �i�����.\n"
 "\n"
-"���i �� ����� SCSI ������� �� ISA-, ����� PCI-�����, ��� DrakX �� �����\n"
-"��i ������� ���������� � ����� ������, �i DrakX ������, ��� �� �� �����\n"
-"SCSI �������� �������, � ��� ���������, �i ���� �� � ��� ����� ��.\n"
-"���i � ��� ��� ����, ���������� \"��\". ���i ���� ���i� �i �������i,\n"
-"���������� \"��\". ����� ������ �'��i��� ��i� ��������, � ��i� ���\n"
-"�������� ����� ������� �����������.\n"
+"���i �� ����� �� SCSI �������, ISA SCSI ������� ����� \n"
+"PCI SCSI �������, ��i DrakX �� ���� ���������, � ��� ����������, �i\n"
+"���� ��i SCSI ������� � ����� �i�����. ���i ������ �������� ����,\n"
+"�� ������ ���i����� �� '��'. ���i �� �������� '���', ��i� �������� �����\n"
+"��� ����������� i � ����� �� ������ ������� ��� ������i��� �������.\n"
 "\n"
-"����� ������ ��������, DrakX �������, �i �� ������� �� ������\n"
-"��� ��� ���������� ��������i. �������� ����� ������� ��������� "
-"������������:\n"
-"�������� �� ������ �����.\n"
 "\n"
-"� ���������� �������, �� ��������� ��� i��������� �� �����������i, ����\n"
-"����� �������� �� Windows (���i ��� �������i��� � ����� �i�����), � �������\n"
-"��� ��������i� �� �������� ����� �������. ��� ��������� ��� ��������i, "
-"��i�\n"
-"��������� ������ ��������."
+"���i �� ������i ��� ������i��� ������� ����������, DrakX �����\n"
+"���������� ��� ���������, ��i� �� ������� ��������� ��� ���. ���\n"
+"��������� ������i�� DrakX ������������ ��������� ����� ���������.\n"
+"�������� �� ���� ������i �����.\n"
+"\n"
+"���i �� ����������, ��� ��������� ��������� ������ ����� ���������.\n"
+"��������� ��� �������� ��������� ��� ������ �������� �� ������,\n"
+"��������� ���������� ��������i ��� ��� � Windows (���i ����� �i����� � ���\n"
+"����������), ����i���� ������������ ����� ������ web ����� �������� (���i\n"
+"����� ������ �� Internet)."
 
-#: ../../help.pm_.c:94
-#, fuzzy
+#: ../../help.pm_.c:108
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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 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"
-"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"
+"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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\n"
-msgstr ""
-"����� ����� ���������, ��i� �������� ������������� ��� �������i\n"
-"����� �i����� Linux-Mandrake, ���i ��� ��� ���i ��������� (��� ����������\n"
-"�������� Linux ����� i���� ���������� ����i����). � i���� ��������\n"
-"�������� ��������� ����� ���i��� ���� ���������. ���� �������� ���������� �\n"
-"���i����� ����i��� �������� �������� ����'����� �� �������i\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"
-"��� ��������� �������� ���������: ������� ������� (/), ��i �'�������� "
-"����������\n"
-"������� i�����ii �������� �������� �i�����, i /boot, ��i ������� ���\n"
-"�����, ���������� ��� ������� ����������� �i����� ��� ��������i ����'�����.\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"
-"�������i ���i�i ������ ������� �������� ����������, ����i���� �� ��������\n"
-"���� ���������� ���i���. DiskDrake �������� ���� ������, ���� ����������\n"
-"���i��� ��i�����. �������i�� ������������ i ������������� ������."
+"\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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:160
 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."
+"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"
+"\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"
 msgstr ""
-"��� ���������� �������� ���i��� ���� ��������i������ ��� ������������\n"
-"(������i������� ������� ��������� �������� �i�����). � ����� �i�����i\n"
-"����� ����������i������ ��� i������� �������� ����� ��i������ ��������,\n"
-"��i� ����������� �� i�. ������: ������i������ i������� �������� �� "
-"����������,\n"
-"�����i�� ���i ��� ��������� ����� i ��������, ��i� �� ������� ��������.\n"
-"�������� ��������� /home i /usr/local."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:218
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"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"
-"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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"\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 ""
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:252
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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:155
+#: ../../help.pm_.c:257
 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."
+"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"
-"�������i ��i�i� ����, ���i �� �� ������i ��������� i������� �i�����,\n"
-"� �����i� ������� ���� ���� ����������� ���� �� ������� ���������\n"
-"��� ����i�� �i�����."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:267
 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"
+"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"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\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"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
-msgstr ""
-"���i DrakX ����i���� ������ ���� ���, ������ �������� � ����\n"
-"i��� �����. � ����i������ ������� �������� ����������� �������\n"
-"�������� ���� � ��i�� �����.\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"
-"� ������� ����, ���� ���������� �� ����������� �����, ��� ����������� "
-"������ DrakX\n"
-"����i���� ����� ����������� �����, �� ����� ��� ����������."
+"\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:176
-msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
-"����i���� �������� ����. ���������, ���� COM1 � MS Windows\n"
-"� Linux ��� ����� ttyS0."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:303
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"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"
-"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"
+"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"
-"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"
+"Click on \"OK\" when you are ready to format partitions.\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"
+"\n"
+"Click on \"Cancel\" if you want to choose other partitions to install your "
+"new\n"
+"Linux-Mandrake operating system."
+msgstr ""
+
+#: ../../help.pm_.c:329
+#, fuzzy
+msgid ""
+"You may now select the group of packages you wish to\n"
+"install or upgrade.\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."
+"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 ""
-"���� ������� ���������� ��������� ��������� ����i,\n"
-"(LAN), ����� ������. \n"
+"����� �� ������ ��������� ����� ������, ��i� �� �������\n"
+"���������� �i �����i��.\n"
+"\n"
+"DrakX ����� ��������� ���������, �i ����� �� �������� ����� ��� i� "
+"����븢�i.���i ��,\n"
+"�� ������� ��������� �� �����. ���i �� ������� ��������� ����븢�� � ����� "
+"�������,\n"
+"������ �� ���� ������� ������ � ������� �� ����� ����������. � �i�� ��i��\n"
+"�� ������ ��������� \"����i��� ����� ������\". � ���i� �������\n"
+"�� ������� ����������� ����� ��� �� 1000 ������..."
+
+#: ../../help.pm_.c:341
+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"
-"�������� \"��������� �����\" i DrakX ��������� �����i\n"
-"�� ����� ������ ������� Ethernet. �������� PCI ���i��� ���� ���������\n"
-"i ��������� ����������. �����, ��� ����������i ISA,\n"
-"�������������� �� ������, i ��� ���������� ���i���� �������\n"
-"� ��i��, ��i �'��i��� ����� ������ � ����� �������.\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:358
+#, 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�� �� O�.\n"
+"���i �� ����� �i ������ � ����� CD �����, ��� ���i��i�� �����i��.\n"
+"���i ��������� � CD ����i ��������, �����i�� i� ���������� i ���i��i�� �� �k."
+
+#: ../../help.pm_.c:363
+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"
-"�� i ��� �������� SCSI, �� ������ ������i�� �������� ���������\n"
-"������� ����������, i���� ���������� �������� �������� ��������i,\n"
-"��i� �� ���������� � �����������i �� ������ ������������.\n"
+"Please be patient."
+msgstr ""
+
+#: ../../help.pm_.c:371
+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:376
+#, fuzzy
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
+msgstr ""
+"����i���� �������� ����. ���������, ���� COM1 � MS Windows\n"
+"� Linux ��� ����� ttyS0."
+
+#: ../../help.pm_.c:380
+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"
-"��� �������� Linux-Mandrake �� ����'����, ��i ������ �� ���\n"
-"���������� �����, ���i�i�������� ����i ���������� ��������i��\n"
-"��� ��� ���������� i��������� (IP �����, ����� �������i\n"
-"�i ��������� ��������, i i�� �����). ���i �� ���������\n"
-"��������� �����, ��������� ����, �� ���i��� �������\n"
-"��� ��������i ����������.\n"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\n"
 "\n"
 "\n"
-"�������� \"����������� ���� �����\" ��� ��������i �����������\n"
-"�� ��������� ���������� ����i Internet ���� �����. DrakX ���������\n"
-"������i ��� �����, ��� ���i � ��� ���� �� ����������, ��� �����\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:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
-"����i��:\n"
+"��������:\n"
 "\n"
-"  - IP �����: ���� �� ��� �� �������, ��������� �i�������� ���i�i��������.\n"
+"  - IP �����: ���i �� ��� �� �������, ��������� �i�������� ���i�i��������.\n"
 "\n"
 "\n"
 "  - ����� ����i: \"255.255.255.0\" �������� �'�������� ������i� �������.\n"
-"���i �� �� ��������, ��������� �i�������� ���i�i��������.\n"
+"���i �� �� ��������, ��������� �i�������� ���i�i�������� �i ����������.\n"
 "\n"
 "\n"
-"  - ���� IP: ���i � ����� ����� ��������������� ��������� bootp ����� "
+"  - ���� IP: ���i � ����� ����� ��������������� ��������� bootp ����� "
 "dhcp,\n"
-"�������� ���� �������. � ����� ������� �������� \"IP �����\" ����������. \n"
-"���i �� �� ��������, ��������� �i�������� ���i�i��������.\n"
+"�������� ���� �������. � ����� ������� �������� \"IP �����\" ����������. \n"
+"���i �� �� ��������, ��������� �i�������� ���i�i�������� �i ����������.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"���i � ����� ����� �������������� NIS, �������� \"������������ NIS\". ���i "
+"\n"
+"�� �������, ��������� ���i�i�������� ����i."
+
+#: ../../help.pm_.c:441
+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:445
 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 �� �� �������, ��� �������� "
-"�i����,\n"
+"����� ����� �����i ��������� �������� ���� ����� (dialup). ���i ��\n"
+"�� �������, ��� �������� �i����,\n"
 "����������� �������� ��������� i��������� � ������ ���������� Internet (ISP)."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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������� ������������� proxy, i� ������ ����� �����i �����.\n"
 "���i �� �� �������, �� ��� i��� �������, �����i���� �� ���i�i��������\n"
 "����i �i �� Internet-����������."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
 "���i �������� � Internet ��������� ��������, ����� �������i�� "
 "����������i���\n"
-"�����. ��-������, �������� ��������, � ����� ������� ����� ������ i\n"
-"����� ������ �������� ������ ��� �������i.\n"
+"�����. ��-������, �������� ��������, � ����� ������� ����� ������ i\n"
+"����� ������ �������� ������ ��� �������i.\n"
 "\n"
 "������� �����i��: ���i���� �������� i ������ �������� � ��i��� "
-"������������\n"
+"������������\n"
 "����� ���i��."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
-"����� �������� ������ ���� ������ � ������ ������ ����������.\n"
+"����� �������� ������ ���� ������ � ������ ������ ����������.\n"
 "\n"
 "\n"
-"Linux ������ � ����� �� �����i�� (GMT) i ���������� ��� � ������ ���\n"
-"������ � �������� ���i ������� ������."
+"GNU/Linux ������ � ����� �� �����i�� (GMT) i ���������� ��� � ������� ���\n"
+"������ � ������� ���i ������� ������."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 ""
+"����� �� ������ ������� ������, ��i� ������ ���������� ��� �������� "
+"�i�����.\n"
+"���i ������ ���i ������i �� ����� ������, �� �'��i��� ����������� ��������,\n"
+"���� ��i���� ���� ����� ������.\n"
+"��������� ���� ��������� �� ����� �����, �����i�� ���i �� ��i������� ����\n"
+"������ ������������� �� ������: � ���i� ������� �� ������ �����i�� ����� \n"
+"�����, ��i� ��� ����������."
 
-#: ../../help.pm_.c:257
-#, fuzzy
+#: ../../help.pm_.c:486
 msgid ""
-"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"
+"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:490
+msgid ""
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"Linux ���� �������� �� �����i�i�i �����i ������������ ������. ����� � �����\n"
-"���� �������� ������ �������i.\n"
+
+#: ../../help.pm_.c:505
+msgid ""
+"GNU/Linux can deal with many types of printer. Each of these types requires\n"
+"a different setup.\n"
 "\n"
 "\n"
-"���i ���� ������� ��� ���������� ���������� ���������� �� ������ "
-"����'�����,\n"
-"�������� \"Local printer\". ��� ����� �������� ���������, �� ����� �����\n"
-"���������� ������� i ������� ����������� �i����.\n"
+"If your printer is physically connected to your computer, select \"Local\n"
+"printer\".\n"
 "\n"
 "\n"
-"���i �� ������� �������� ������ �� ��������, ��i �������i��� �� ���������\n"
-"������ Unix, ��������� ������� \"��������� ����� lpd\". ��� ������i�� ���\n"
-"���������, i�� i ������ �� ��������, ��� ��������� ������ i�� ����i �����\n"
-"�� ����� �������.\n"
+"If you want to access a printer located on a remote Unix machine, select\n"
+"\"Remote printer\".\n"
 "\n"
 "\n"
-"��� ������� �� �������� SMB (��i �������i��� �� ��������� ������\n"
-"Windows 9x/NT/2000 �i Unix � �������� Samba), ��������� ������ ��� i��\n"
-"SMB (���� ���� �� �������� � ��� i����� � ����i TCP/IP), i, �������,\n"
-"��� IP ����� i i�� ����������i��, ������� ����� i ������ ������� ��\n"
-"��������, � ������� i�� ��������. ��� � ����� i ��� ��������\n"
-"NetWare, �����i �� ����������� i��������� �� ������� �����."
+"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:286
+#: ../../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"
+"\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 ""
+
+#: ../../help.pm_.c:542
+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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
 #, fuzzy
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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 administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"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 ""
-"�����i�� ������ ���������������i�� (root) ����� �i����� Linux-Mandrake.\n"
-"������ ��������� �����i ������, ��� �����i���, ��� �� �� �����i�i��.\n"
+"�����i�� ������ ���������������i�� (root) ����� �i����� Linux-Mandrake.\n"
+"������ ��������� �����i ������, ��� �����i���, ��� �� �� �����i�i��.\n"
 "\n"
 "\n"
 "Root - ���� ���i�i������� �i�����, �����i ��� ��������� ������� "
 "����i�������\n"
-"�i�����. ����������� �����i �����i�� ���i���� ������! \n"
+"�i�����. D����i �����i�� ���i����� ������! \n"
 "����������� ������������ ������ ������ ���� ���� ��������\n"
-"������ ��� ���������i �i�����, ��� ������������� � ��� ��������\n"
+"������ ��� ���������i �i�����, ��� ������������ � �� ��������\n"
 "i ��� i���� ��������� � �� �i����. ������ ���i��� ���� �������� � �����i\n"
 "�����i���-�������� �i����� i ���� ������ �� ���� 8 �i���. �i���i �� "
 "���i������\n"
-"���!. � ��� �� ��� �� ���i�� ������ ������� ��������� ����� �������:\n"
+"���!. � ��� �� ��� �� ���i�� ������ ������� ��������� ����� ���������:\n"
 "�� ���i��� �����i����� ��� �����i���� ����������."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 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\"."
+"��� ������i�� ������� �i�����, ��������� ������� \"���������� ������� "
+"����\"\n"
+"i \"���������� �����i MD5\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
 msgstr ""
-"���i � ����� ����� �������������� NIS, �������� \"������������ NIS\". ���i "
+"���i � ����� ����� �������������� NIS, �������� \"������������ NIS\". ���i "
 "\n"
 "�� �������, ��������� ���i�i�������� ����i."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1820,47 +2545,41 @@ msgstr ""
 "����� �� ����� i ��������, � �������i�� � ������i root ��������� �����i\n"
 "� �����i ���i�i����������� i ������������ �i�����."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"�������i�� ����������� �������� ��� \"��\"! ���� ���������, ���i ��\n"
-"����������i�� Windows, ��� �������i�� ���������� ������.\n"
-"���i �� �� �������i ���������� ����, �� ����� �� ������� ������i��\n"
-"Linux!"
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
-"��������� �������, ��� �� ������� �������i�� i���������, ���� ���������\n"
+"��������� ���������, ��� �� ������� �������i�� i���������, ���� ���������\n"
 "��� �������i Linux.\n"
 "\n"
 "\n"
-"���i �� �� ������������ ��������� ��������, ��� �� ���i��, \n"
-"�������� \"����� ������ �� ����� (MBR)\"."
+"���i �� �� ��������� ��������� ��������, ��� �� ���i��, \n"
+"�������� \"����� ������ �� ����� (MBR)\"."
 
-#: ../../help.pm_.c:343
-#, fuzzy
+#: ../../help.pm_.c:643
 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"
-"(������-���� �� ������ ������)."
+"���i �� �� ������� ��������, ��� ��������� ������� �'�������� \"/dev/hda\"\n"
+"(�������� ������� IDE ����) �i \"/dev/sda\" (����� SCSI ����)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1870,8 +2589,19 @@ msgid ""
 "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) i Grub - ���� ���������i. ��� ������ ������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���!"
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 #, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
@@ -1889,48 +2619,86 @@ msgid ""
 "\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."
 msgstr ""
-"������� ��������� LILO:\n"
-"  - ���������� �������i: ������� i�� ���������� (����. �������\n"
-"��������� �����), ���� ������� ���������� ������. ���i �� ������� "
+"������� ��������� LILO i Grub:\n"
+"  - ������� �������i: ������� i�� ������� (����. �������\n"
+"��������� �����), ���� ������� ���������� ������. ���i �� ������� "
 "������i�i,\n"
 "�� ���i����� \"/dev/hda\" (����� \"/dev/sda\", ���i � ��� SCSI-����).\n"
 "\n"
 "\n"
-"  - Linear: �������� �i������ ������ ������� ������ ������ �������\n"
-"sector/head/cylinder. �i������ ������ ������������ � ��� ������ �i�����\n"
-"i �� �������� �� ��������i �����. ����� �� �����, ��� ����������� ����i �� \n"
-"������ ���� ��������������i ��� �����������i \"linear\", �������i BIOS ��� \n"
-"���������i ��������i ����� ����������� ������ � ��������i. ��� �����������i\n"
-"\"linear\" � ���i�i�i ������i, /sbin/lilo ���� �������� �������� ��\n"
-"����������� �������i �����, �������i 3D ������ ������� ��������\n"
-"�� ������� �������i.\n"
-"\n"
-"\n"
-"  - Compact: ������� ���������i������ ����i�i �� ������� �������� �������\n"
-"� ���i�� ����i�. ���� ������ ������� ��� �������i i ����� �����.\n"
-"������������ \"compact\" �����i�� ������������� ��� �������� � �������.\n"
-"\n"
-"\n"
-"  - �������� �� �������� ����� ��������� �������: ����� ��� � ��������\n"
-"�������, �� ������� ����� ��������� ����� ����� ��������� ����������� "
+"  - �������� �� �������� ����� ��������� �������: ����� ��� � ��������\n"
+"�������, �� ������� ����� ��������� ����� ����� ��������� ����������� "
 "�������.\n"
 "���� �������� ������� ��� �i����, ��i� ������ ����������� � ��������� �����\n"
-"������ ������ ��������� ����i�����. ��������� �� �����, ���i \"delay\" \n"
-"�� ��������� �i ���������� �� ����.\n"
+"������ ����� ��������� ����i�����. ��������� �� �����, ���i \"��������\" \n"
+"�� ����� ��������� �i ���������� �� ����.\n"
 "\n"
 "\n"
 "  - �i��������: ���i������ �������� ����� VGA, ��i ����� ����������\n"
-"��� ��������. ������� ��������� ��������: \n"
+"��� ��������. ������� ��������� ��������: \n"
 "    * normal: ������� �������� ����� 80x25.\n"
 "    * <number>: ������� ��������� �������� �����."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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���."
+
+#: ../../help.pm_.c:692
+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����, ���i����� \"����� ������ ����� (MBR)\".\n"
+"\n"
+"\n"
+"  - �������� �� �������� ����� ��������� �������: ����� ��� � ��������\n"
+"�������, �� ������� ����� ��������� ����� ����� ��������� ����������� "
+"�������.\n"
+"���� �������� ������� ��� �i����, ��i� ������ ����������� � ��������� �����\n"
+"������ ������ ��������� ����i�����. ��������� �� �����, ���i \"��������\"\n"
+"�� ����� ��������� �i ���������� �� ����."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -1944,15 +2712,15 @@ 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 i ������������ ������� ��������� :)\n"
 "\n"
 "���i ����i��������� ����������, ����� ��������� X  (���i �� ��\n"
 "������i�� DrakX �� ���i�� ������), ��� �� �����i ���������, �i ������\n"
-"�� � ����������i. ���i ��, �� ����� ������� �������� i ������� i�\n"
+"�� � ����������i. ���i ��, �� ����� ������� �������� i ������� i�\n"
 "�����i ��� ��������."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -1960,82 +2728,85 @@ msgstr ""
 "���i ����� �� ��� � ���������� X, ����������� ����� ��������� ��� \n"
 "��������� ��������i X Window System."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
 msgstr ""
-"���i �� ������� ��������� ����i����� ������� (login), �������� \"��\". I���� "
+"���i �� ������� �������� ����i����� ������� (login), �������� \"���\". I���� "
 "- \n"
-"\"���\"."
+"\"��\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 #, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\n"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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"
+"\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"
+"\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."
 msgstr ""
-"����� ������� ������� ��������� ���������� ��������� �i�����.\n"
+"����� ������� ������ ��������� ���������� ��������� �i�����.\n"
 "\n"
 "  - ������������� �����i����� ��������� �����: ���� �������� �������� "
 "������\n"
 "�� ��������� �����, ��� ���� �����i ��� �������� ����������i��,\n"
-"��� ����������� ���������i ������� ��������� ���������i ���������.\n"
-"  - ������� �������� �������: �� ������ ������� �������� ������� ��� ���� \n"
+"��� ����������� ���������i ������� ��������� ���������i ���������.\n"
+"  - ������� �������� ������i: �� ������ ������� �������� ������i ��� ���� \n"
 "�i�����.\n"
 "    �� ���������� i���������� ����������� �� ��������i��.\n"
 "\n"
 "\n"
 "  - �������� ����� RAM : � ��������� �������� Linux �� ���� ��������\n"
 "����i�� ��� ����������� ������, ���� ������ � �i�����. � ����� �������\n"
-"�������i�� �������� �����. �����: ����������� � 2-4�� �����������.\n"
+"�������� �������� �����. �����: ����������� � 2-4�� �����������.\n"
 "\n"
 "\n"
 "  - ������������ ����i������� ������� ����������i��: ���i �� ������� �� \n"
 "����i������ ���������� ������� ����������i�i, (CD-ROM, Floppy, Zip) "
-"��������i \"mount\n"
-"i \"umount\", �������� ���� ��������. \n"
+"��������i \"mount\" �i \"umount\", �������� ���� ��������. \n"
 "\n"
 "\n"
-"  - �������� Num Lock ��� �������: ���i �� �������, ��� Number Lock ��� "
+"  - �������� Num Lock ��� �������: ���i �� �������, ��� Number Lock ��� "
 "��������\n"
-"����� �������i, �������� ���� �������� (�����: Num Lock �� ���� �� ����� "
+"����� �������i, �������� ���� �������� (�����: Num Lock ���� ���� i �� "
 "��������\n"
 "��� X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2050,338 +2821,375 @@ msgstr ""
 "���i �� ������� ����������i�� ��� i���� ����������� �i�����, ������� \n"
 "���������� i��������i."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "����� ����"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "���� �������i"
 
-#: ../../install2.pm_.c:45
-#, fuzzy
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
-msgstr "������������� �����i����� ��������� �����?"
+msgstr "���������� ��������� �����"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "��������� ���i"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "����� ����i�����"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "������"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
-msgstr "�����. �������� �i����"
+msgstr "�����. �������� �i�����"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "������i������� ��������"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "����� ������"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "�������� �i�����"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "��������� ����i"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "����������i�"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "��������� �������� �����"
 
-#: ../../install2.pm_.c:56
-#, fuzzy
+#: ../../install2.pm_.c:53
 msgid "Configure services"
-msgstr "��������� ��������"
+msgstr "��������� ������"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "��������� ��������"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "������ ��� root"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
-msgstr "�������� ��i���� ���i�"
+msgstr "������ ����������i��"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "�������� ����. ����"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
-msgstr "�������� LILO"
+msgstr "����븢�� ����������"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "��������� X Window"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
-msgstr ""
+msgstr "���� ����븢�� ����i"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
-msgstr "���������� �������i"
+msgstr "���������� ����븢�i"
+
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "������� ������� ����� $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "��� �����, ������ ������� ���� �����."
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "��� �����, ������ ������� ���� �����."
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+"��������� ������������ ��������� ����������� �������� ��� �����.\n"
+"�������� ���������� ��� �� ����� �������� ���: %s"
 
-#: ../../install2.pm_.c:337
+#: ../../install_interactive.pm_.c:41
 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 ""
 "�� ���i��� ���� �������� �������.\n"
-"��� ������ �������� ������� (����� ������� ��� i������).\n"
-"����� �������� ``����� ����i�������'' i �������i�� �� � `/'"
+"��� ������ �������� ������� (����� �������� ��� i������).\n"
+"����� �������� ``������ ����i�������'' i �������i�� �� � `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"����i�� �������� �� ��������, ��� ������� �������� ��� ���� :(\n"
-"��������� i��i ����� i ���� ���������� ������� ��������"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "�� ���i��� ���� ������� swap"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake �� ���� ����i���� ��������� ����i�� �������.\n"
-"����������� �����i �� ���� ����� i ������."
+"���� �������� swap.\n"
+"\n"
+"�� ���� ����������?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "����� ���������� �������."
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "������������� ��������� ��������"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "I���������"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "�� ����� �������� ��� ��������� ����� ��������"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: ���� �� �������� �������, ���i ����� �������� i���."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "������������� i������ �������"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "�������� ������� �� ���������"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "���� i������� ��������, ��i� ����� �����������"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "��������� ������������� broadcast ��� ������ NIS"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "������������� ������� Windows ��� �i��������� �������� �i�����"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "������� ������� ����� $f"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "��i ������� ����� ������� �������������, ��� �����i�� linux4Win?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"���i��� �������, ��� � �� �����, �� �� �������� ����������,\n"
-"���� ����������� �� ���� ����� i ������ :("
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "����� ������"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "����i������� ������ ����i������� %s"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "�������� ������� � M�: "
 
-#: ../../install_steps.pm_.c:323
-msgid ""
-"Some important packages didn't get installed properly.\n"
-"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
-msgstr ""
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "����� swap �������� � M�:"
 
-#: ../../install_steps.pm_.c:390
-#, fuzzy, c-format
-msgid "Welcome to %s"
-msgstr "�������� ��������� � Crackers"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "������������� ��������� �������� �� �������� Windows"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "�������� ����������"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "������ ����� �������� �� ������� ����i��?"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "���i����� ���� �������� �i����� Windows"
+
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "������� �� ���� `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"� �������� ����� ������ �������� FAT �� ����������\n"
+"���������� ��� �������, �������: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "�� ���i��� ���� ������� swap"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
+"��� ������� � Windows ������� �������������. \n"
+"����������� �������� ������i�� �������� ``defrag''"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"��� �������� swap\n"
+"�����!\n"
 "\n"
-"�� ���� ����������?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "�������� �������� ����� �������i"
+"DrakX ����� ���i��� ����i�� ����� ������ �������� Windows.\n"
+"������� �����i��: ����� �������� ����������. ���i ��  ���� �� ����i�i \n"
+"���������� ���i� ��������, �� �������� ���i���� �������� "
+"�����������,��������� scandisk i defrag �� ����� �������, ����i�� ���������� "
+"���i�\n"
+"�������� i �����i ����� ��� ����i���� �� �������� �����������.\n"
+"���i �����������i��, ���i��i�� Ok."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "������� �����:"
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "���� �������� �������� ��� Windows?"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "����i�: %s\n"
+msgid "partition %s"
+msgstr "������� %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "�����: %d KB\n"
+msgid "FAT resizing failed: %s"
+msgstr "������������ ������ �� ���������� ��� �������� FAT %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "����� ������ ��� �������i"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+"�� ��������� �������� FAT ��� �������� ������ ����� ������������\n"
+"� �����i �i��������� �������� �i����� (�i ������������ �������� �� �����)"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "I���������"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "�����i �������� �� ��i� �����"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "��������"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "�����i�� Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "��������"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr "�� ��i � �������� ������i� ����� �� ������� ���������� Linux?"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "���������, ���i �����, "
+#: ../../install_interactive.pm_.c:156
+#, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "��� i������� �������� �� ����� %s i �������� �� i� ������ ��������"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "��������� ���� "
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "����� ��������"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "������� ���"
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "������������� DiskDrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "���������� �������i"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "������������� fdisk"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "�������� ������ %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"�� ������ ����� ����i�� ��� ���� %s\n"
+"�� ���������i �� ��������� �������� �������i, ������������ `w'"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "�� ���� ����������?"
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "������������� ��������� �������� �� �������� Windows"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "���������� ������� ������������� ������:"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "������ ������� ���������"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "����������� i������� ��������� ��� X11?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "������ ���������i �������� DrakX ������ ��������� ��������:"
 
-#: ../../install_steps_gtk.pm_.c:158
-#, fuzzy
-msgid "Please, choose one of the following classes of installation:"
-msgstr "����������� ��������� i���������"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "���������� ������� �� �������: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-#, fuzzy
-msgid "You don't have any windows partitions!"
-msgstr "�� �� �������i ��i��i� ��������!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "��������� �� ����i"
 
-#: ../../install_steps_gtk.pm_.c:201
-#, fuzzy
-msgid "You don't have any enough room for Lnx4win"
-msgstr "�� �� �������i ��i��i� ��������!"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "��������� �� ����i"
 
-#: ../../install_steps_gtk.pm_.c:217
-#, fuzzy
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"��i���i�!\n"
-"\n"
-"DrakX ����� ���i��� ����i�� ����� ������ �������� Windows. ������� �����i��: "
-"����� �������� ����������. \n"
-"������i�� scandisk, ���i �� �� ����i�i ���� �����. (� ������� i \n"
-"defrag) �� ����� ��������, � ������� ����i�� ��������� ���i� ��������.\n"
-"���i �����������i��, ���i��i�� Ok."
+"���i��� �������, ���� �� ������������ �������� ����������,\n"
+"���� ����������� �� ���� ����� i ������."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "������������ ������ �� ����������"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "����i������� �����i ����i������� %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-#, fuzzy
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "��i ������� ����� ������� ������������� � �����i ����������?"
+#: ../../install_steps.pm_.c:375
+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 ""
+"��������� ������ ������ �� ���i ���������� ��������.\n"
+"����i ��� cdrom ���� �i ��� cdrom ����� �������.\n"
+"�������� cdrom �� ����븢������ ���������, ��������������\"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_gtk.pm_.c:284
-#, fuzzy
-msgid "Choose the sizes"
-msgstr "����� ����� ������"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "�������� ��������� � %s"
 
-#: ../../install_steps_gtk.pm_.c:286
-#, fuzzy
-msgid "Root partition size in MB: "
-msgstr "�������� �������"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "�������� ����������"
 
-#: ../../install_steps_gtk.pm_.c:288
-#, fuzzy
-msgid "Swap partition size in MB: "
-msgstr "����� � MB:"
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "������� �� ���� `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"� ����� �i����� ������ ������� �������, ���� ������� ��������\n"
+"��� ����������i Linux-Mandrake. � ����� ������� ����������� ���������\n"
+"�������� �����������. ��� ������ ���i��i�� `F1' � ��� �������i, � �����\n"
+"�������� `text' i ���i��i�� <ENTER>."
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "���i �����, �������� ���i� � ����� ����븢�i:"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
-msgstr ""
+msgstr "������� ����� ��� ������� ���� �����i��� ���� %d ��.\n"
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2389,8 +3197,13 @@ msgid ""
 "A low percentage will install only the most important packages;\n"
 "a percentage of 100%% will install all selected packages."
 msgstr ""
+"���i �� ������� ���������� ����� ������ ������,\n"
+"�������� ������� ������, ��i �� ������� ����������.\n"
+"\n"
+"��� �i��i� �������� ������ ���������� �����i �������� ������ ������,\n"
+"� ��� 100% ������ ���������� ��� ������� ������."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2399,105 +3212,195 @@ msgid ""
 "A low percentage will install only the most important packages;\n"
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
+"�� ����� ����� ���� ����� �����i ��� %d%% ����� ������.\n"
+"\n"
+"���i �� ������� ���������� ����� ������, ��\n"
+"�������� ������� ������ ��� ����븢�i.\n"
+"��� ����� �������� ������ ���������� �������� ������ ������;\n"
+"��� �������� %d%% ����� ���������� ������i ������ �����i �������."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
-msgstr "����� �������� ����� ����� ����� ����i�� �� ��������� �����"
+msgstr "����� �������� ����� ����� ����� ����i�� �� ��������� �����."
 
-#: ../../install_steps_gtk.pm_.c:335
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
-msgstr "����� ������"
+msgstr "������� ������ ��� ����븢�i"
 
-#: ../../install_steps_gtk.pm_.c:376
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "����� ������ ��� ����븢�i"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "I���������"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "����븢��"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "�������� �����������"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "�������� �����"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "�������� �����"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
-msgstr ""
+msgstr "������������ ���i� �������������� �� ����� i �������"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "������ �����"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
-msgstr ""
+msgstr "I��: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "����i�: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "�����: %d K�\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
-msgstr ""
+msgstr "���������: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
-msgstr "������� �����: %d / %d MB"
+msgstr "������� �����: %d / %d M�"
 
-#: ../../install_steps_gtk.pm_.c:471
-msgid "This is a mandatory package, it can't be unselected"
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
 msgstr ""
+"�� �� ������ ������� ���� �����, ��� �� �� ����� ����� ��� ��� ������i"
+
+#: ../../install_steps_gtk.pm_.c:386
+msgid "The following packages are going to be installed"
+msgstr "��������� ������ ������ ������ �� �i�����"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "��������� ������ ������ ��������"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "�� �� ������ ������i��/�����i�� ���������� ������ ������"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:416
+msgid "This is a mandatory package, it can't be unselected"
+msgstr "���� ���������� �����, ��� ���������� ������ �����i��"
+
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
-msgstr ""
+msgstr "�� �� ������ �����i�� ���������� ������ ������. �� ��� ����������"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
+"���� ����� ���i��� ���� ��������\n"
+"�� ��������, ��� ������ �����i�� ����������?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
+msgstr "�� �� ������ �����i�� ���������� ������ ������. ��� �������� �����i��"
 
-#: ../../install_steps_gtk.pm_.c:496
-#, fuzzy
-msgid "The following packages are going to be installed/removed"
-msgstr "��������� ������ ������ �������� � �i�����"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr ""
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "����븢����"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "��������"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "���������, ���i �����, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "��������� ���� "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "������� ��� "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "������"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "���������� ����븢�i"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
-msgstr "������: %d "
+msgstr "%d ������"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "����븢�� ������ %s"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "�������"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2506,380 +3409,422 @@ msgid ""
 "done.\n"
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
+"����i�� ��� Cd-Rom!\n"
+"\n"
+"���i �����, ������ Cd-Rom, �������� \"%s\", � ��� �������� i ���i��i�� O� "
+"�����.\n"
+"���i �� �� ����� ���, ���i��i�� �����i��, ��� �����i�� ����븢�� � ������ Cd."
 
-#: ../../install_steps_gtk.pm_.c:615
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "��������"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "�� ���� ����������?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "���������� ������� ������������� ������:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
-msgstr "���������� ������� ������������� ������:"
+msgstr "���������� ������� ������������� ������:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
-msgstr "���������� �������"
+msgstr "�������� �������"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+msgstr "���i �����, �������� ���� ��� ����������."
+
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "����i�����"
 
-#: ../../install_steps_interactive.pm_.c:73
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
-msgstr "�������� ��� ����i�����"
+msgstr "���i �����, �������� ��� ����i�����."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
-msgstr ""
+msgstr "�� ������ ������� ����i� ����, ��i� ������ �������� ����� ����븢�i"
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "�������� �������"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "��i ������ �������� (/) ��� ����� �i�����?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
-msgstr "���� �������i"
+msgstr "���� ����븢�i"
 
-#: ../../install_steps_interactive.pm_.c:100
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
-msgstr "�������� ���� �������i"
-
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
-msgstr "��������/���������"
+msgstr "��i ���� ����븢�i �� �������?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr "���� �������� �i ���������?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
+msgstr "����븢��/���������"
 
-#: ../../install_steps_interactive.pm_.c:110
+#: ../../install_steps_interactive.pm_.c:183
 #, fuzzy
-msgid "Automated"
-msgstr "����������� IP"
+msgid "Is this an install or an update?"
+msgstr "���� ����븢�� �i �����������?"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "�������������"
+
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
-msgstr "� ����������"
+msgstr "�� ������"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "�������"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
+"�� ��������, ��� ������� ���������� ������ ����������� �� �������?\n"
+"� ����� ������� �� ������� ���� ������ �������� ��� �������� �����������,\n"
+"��� ���i�i ������i ������ ���� ���������.\n"
+"\n"
+"��� ������ ���������, ���������, ���i� ������i: ``�i ������������� ������\n"
+"���� �������?'' �i ������������ �� �� ������ �� ����� ������i?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "���������"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "���������"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "��������"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
-msgstr "������������"
+msgstr "��� ���������i"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:141
-#, fuzzy
-msgid "Which usage is your system used for ?"
-msgstr "� ��i� ������� ����� �� �������i����?"
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
+msgstr "����� ���� �� ������� ������������� ������?"
 
-#: ../../install_steps_interactive.pm_.c:152
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
-msgstr "������� ��� ����� ���i"
+msgstr "���i �����, �������� ��� ����� ���i."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "���� ���i"
 
-#: ../../install_steps_interactive.pm_.c:161
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
-msgstr "�� ����� ����������� ����� ���������� ���� ���?"
+msgstr "���i �����, �������� ��������� ����, �� ����� �������� ���� ���."
 
-#: ../../install_steps_interactive.pm_.c:172
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "��������� ���� PCMCIA ..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
-msgstr "���������"
+msgstr "��������� IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
-msgstr ""
+msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
-msgstr "��� ��������� ��������"
+msgstr "���� ��������� ��������"
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:299
+msgid "Choose the mount points"
+msgstr "�������� ������ ����i�������"
+
+#: ../../install_steps_interactive.pm_.c:316
 #, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"����i�� �������� �� ��������, ��� ������� �������� ��� ���� :(\n"
+"��������� i��i ����� i ���� ���������� ������� �������� (��� ���������\n"
+"������ ��������!). I���� ������� �� ������i�� DrakX ����i�� ����i�� "
+"��������.\n"
+"(������� � %s)\n"
+"\n"
+"�i ������� �����i�� ��� ��������?\n"
 
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "��i ������� ����� ������� ������������� � �����i ����������?"
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake �� ���� ����i���� ��������� ����i�� �������.\n"
+"����������� �����i �� ���� ����� i ������!"
 
-#: ../../install_steps_interactive.pm_.c:198
-msgid "Choose the mount points"
-msgstr "�������� ������ ����i�������"
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "�������� �������"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "��i ������ �������� (/) ��� ����� �i�����?"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
-msgstr "��� �����i����� ����i�� �������� ������i����, �������� ������������."
+msgstr "��� �����i����� ����i�� �������� ������i����, �������� ������������."
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "����� �������� ��� ������i�������"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
-msgstr ""
+msgstr "��������� �� ��������� ������� �����?"
 
-#: ../../install_steps_interactive.pm_.c:248
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
-msgstr "������i������� �������� %s"
+msgstr "������i������� ��������"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
-msgstr ""
+msgstr "��������� i ������i������� ����� %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
-msgstr "�� ����� ����� � ������ �������i (swap) ��� �������i, �����i��� ���."
+msgstr "�� ����� ����� � ������ �������i (swap) ��� ����븢�i, �����i��� ���."
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "������� ��������� ������"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
-msgstr "����� ������ ��� ���������"
+msgstr "����� ������ ��� ���������"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
+"���� �i����� �� ��� ��������� ����� ��� ����븢�i �i ��������� (%d > %d)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "���� (%dM�)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "�i�i������ (%dM�)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "������������� (%d��)"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "�� ������"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "�������� �������� ����� ����븢�i"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "����� ����� ������"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
-msgstr ""
+msgstr "����i��� ����� ������"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 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 ""
+"���i �� ����� ��� CD ����i �� ��i�� �i���, ���i��i�� ��.\n"
+"���i �� �� ����� �i ������ � ����� CD �����, ���i��i�� �����i��.\n"
+"���i ��������� � CD ����� �� �����, �����i�� i� ���������� i ���i��i�� ��."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr ""
+msgstr "Cd-Rom �������� \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
-"�������� ������ %s\n"
+"����븢�� ������ %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "��������� ����� �������i"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "��������� ������� ����i������i IP"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "��������i���������� �����"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "�� ��������i���� �������� ������"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "����i������� ����i"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "��������i LAN ��� ���������. �i ������� ��:"
-
-#: ../../install_steps_interactive.pm_.c:421
-#, fuzzy
-msgid "Do you want to configure a local network for your system?"
-msgstr "�i ������� �� ������i�� �������� ����i�������?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "�������� ����� �� ���������"
-
-#: ../../install_steps_interactive.pm_.c:449
-#, fuzzy
-msgid "Modem Configuration"
-msgstr "���������"
-
-#: ../../install_steps_interactive.pm_.c:450
-#, fuzzy
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "�i ������� �� ������i�� �������� ����i�������?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "��������� �������� ������� %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"���i �����, �����i�� IP ����i������� ��� ����� ������.\n"
-"����� ����� ���i��� ���� �������� �� IP ����� � ���������-��������� \n"
-"������i (���������, 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "����������� IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP �����:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "����� ����i"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "bootp/dhcp"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP ����� ���i��� ���� � ������� 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "��������� ����i"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"�����i�� i�� ���� ������ (host).\n"
-"I�� ����� ������ ���i��� ���� ��������� �������,\n"
-"��������� ``mybox.mylab.myco.com''.\n"
-"�� ������ ������� �����i IP ����� �����, ���i �� � ��� ����."
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS ������:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "�������-����:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "����:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "I�� ������:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "������������ ������i �����?"
-
-#: ../../install_steps_interactive.pm_.c:521
-#, fuzzy
-msgid "Please choose which serial port your modem is connected to."
-msgstr "�� ����� ����������� ����� ���������� �����?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "��������� Dialup"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "I�� ��������"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "����� ��������"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "I�� (login ID)"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "������i�i�����"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "�� ������ �������"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "�� ������ ����i����"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "I�� ������"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "����� ������ DNS"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "�������� ������ DNS:"
-
-#: ../../install_steps_interactive.pm_.c:549
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2926,16 +3871,16 @@ msgstr ""
 "���i���\n"
 "���������i��� � ���, ��� ������ ���/i� ����� ���������� ���������, "
 "��������\n"
-"i/����� ������������� ����� ��������.\n"
+"i/����� ������������� ����� ��������.\n"
 "\n"
 "������ ����, �������� i/����� ����������i� ���i��� ���� ���������, ��� �� "
 "���������\n"
 "������ ���� ���i��. ���i �������� i/����� ����������i� ������� �����\n"
-"������, ��i� ������ ���� ��������� ������i� ���, ��/��� ���� ������ "
+"������, ��i� ������ ���� ��������� ������i� ���, ��/��� ���� ������� "
 "����������.\n"
 "\n"
 "�i � ��i� ���� �i Mandrakesoft, �i �� �������� i ���������i �� ����������\n"
-"�� �����������, �������� ����� ���������� ����� (��� �������, ��� \n"
+"�� �����������, �������� ����� ���������� ����� (��� �������, ��� \n"
 "�� ������������ ���������� ��������, ��������� �i�����, ������� ����������� "
 "\n"
 "�������� i i����i �������i, � ������� ��������i ��������i i �������i, ��i� \n"
@@ -2952,95 +3897,98 @@ msgstr ""
 "��������i\n"
 "�������i.\n"
 "\n"
-"� �����i ��������i, ��i� ��������� ���������� ����������, �����������: \n"
+"� �����i ��������i, ��i� ��������� ���������� ����������, �����������: \n"
 "Mandrakesoft\n"
 "43, rue d'Aboukir\n"
 "75002 Paris\n"
 "FRANCE"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "����� �������� ��� ��������� ������"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "������ � ��������� ��� ��������� ��i�� ��������� ������"
 
-#: ../../install_steps_interactive.pm_.c:592
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
-msgstr "����� ������ ��� �������i"
+msgstr "����� ������ ��� ����븢�i"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
-msgstr "� ��i� ������� ����� �� �������i����?"
+msgstr "��i ��� ������ ����?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
-msgstr "��� �i������ ����i��i� ���������� �� GMT?"
+msgstr "��� �i������ ����i��i� ���������� �� GMT?"
+
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "���� �i����� ���������� �� ������� �������������?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
-msgstr "��� ������"
+msgstr "���� ������"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "������������ ������ ����"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "����"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "������������ �����i MD5"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "������������ NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "����� �������i"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "���� ������ ������� ������ (��� ������ ���i��� ���� �� ���� %d �i���)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "��������i����� NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS Domain"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS ������:"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
-msgstr "������� ��i���� ���i�"
+msgstr "������� ����������i��"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
-msgstr "������ ��i���� ���i�"
+msgstr "������ ����������i��"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
-msgstr "��� ��������� %s"
+msgstr "(��� ��������� %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3050,37 +3998,37 @@ msgstr ""
 "�����i�� i�� ����������i��\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "������� i��"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "I�� ����������i��:"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "��������:"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
-msgstr ""
+msgstr "�i��������"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "���� ������ ������� ������"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
-msgstr "�����i�� i�� ����������i��"
+msgstr "���i �����, �����i�� i�� ����������i��"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -3088,27 +4036,51 @@ msgstr ""
 "I�� ����������i�� ���i��� �������� �i���� �����i �� �i��i� ���i����, \n"
 "�i���, `-' i `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "���� i�� ����������i�� ��� ���������"
 
-#: ../../install_steps_interactive.pm_.c:747
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"� ��������� ������������ ����� �� ������� ��������� Linux ��������� ��\n"
+" ������������ ����������. ���� ���� ���� ������, ���i �� �� ������� \n"
+"����븢���� SILO, ���i i���� ����������� �i����� ������� SILO, �i SILO �� \n"
+"���� ��������� � ����� ����i������i. ���������� ���� ������� ���� ���� \n"
+"���������� ������� � ��������� �������� Linux Mandrake, ���� �����i \n"
+"��������� ����������� �i����� ����� ����.\n"
+"\n"
+"���i ������� �������� ���������� ���� �����, ������ ������� � �����\n"
+"�������� i ���i��i�� \"Ok\"."
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
-msgstr "����� ����"
+msgstr "����� ��������"
 
-#: ../../install_steps_interactive.pm_.c:748
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
-msgstr "����i ����"
+msgstr "����i ��������"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "�������i��"
 
-#: ../../install_steps_interactive.pm_.c:755
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3121,196 +4093,166 @@ msgid ""
 "system\n"
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
-"� ��������� ������������ ����� �� ������� ��������� Linux ������� �� i "
-"����������� �����������. ���� ���� ���� ������, ���i �� �� ������� "
-"�������i���� lilo, ���i i���� ����������� �i����� ����i�� lilo, �i lilo �� "
-"���� ��������� � ����� ����i������i. ���������� ���� ������� ���� ���� "
-"���������� ������� � ��������� �������� Linux Mandrake, ���� �����i "
-"��������� ��������� �i����� ����� ����.\n"
+"� ��������� ������������ ����� �� ������� ��������� Linux ������� �� i \n"
+"����������� �����������. ���� ���� ���� ������, ���i �� �� ������� \n"
+"����븢���� LILO (�i Grub), ���i i���� ����������� �i����� ������� LILO,\n"
+"�i LILO �� ���� ��������� � ����� ����i������i. ���������� ���� ������� "
+"����\n"
+"���� ���������� ������� � ��������� �������� Linux Mandrake, ���� �����i \n"
+"��������� ����������� �i����� ����� ����.\n"
 "\n"
 "������� �������� ���������� ���� �����?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "���������, ��� �������� ����������"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
-msgstr "�������� ��������, � ��i� ����� ��������� ����������� �������"
+msgstr "�������� ��������, � ��i� ����� ��������� ����������� �������"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
-msgstr "�������� ������� � �������� %s"
+msgstr "������ ������� � �������� %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "��������� ����������� �������"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "�������� LILO �� ����������. ���i��� ��������� �������:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "�� ������� ������������� SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "������� ����i SILO"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"SILO ������� ��������� ������.\n"
-"�� ������ ������ ����, ����� ����i�� i�������."
-
-#: ../../install_steps_interactive.pm_.c:858
-#, fuzzy
-msgid "Partition"
-msgstr "�������� �������"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "����� ����� ��� ���������������"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "�������� SILO �� ����������. ���i��� ��������� �������:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
-msgstr "�������i������ ���������..."
+msgstr "���������� ����������"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "�� ������� ������������� aboot?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
+"������� ����븢�i aboot, \n"
+"���������� ����븢����, ���������� �� ���������� ��������� ������� �������?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "��������� proxy"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "������ ����������� ���������� �� ���������. ���i��� ��������� �������:"
 
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy ���i��� ���� http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy ���i��� ���� ftp://..."
-
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "�������� ��������� � Crackers"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
-msgstr "�i�����"
+msgstr "���� �����"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "�����"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "������i"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "�����i"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "������i������"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "���������� ������i"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(���� ������� ��i������ ��������)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "������������� �����i����� ��������� �����?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "�������� ������i"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
-msgstr "�������� �������� ����� RAM (��������� %d MB)"
+msgstr "�������� �������� ����� RAM (��������� %d M�)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "��������i������� ������� ����������i��"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
-msgstr ""
+msgstr "�������� /tmp ��� ������ ��������"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
-msgstr ""
+msgstr "�������� ���� ����i���"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "��������� num lock ��� ������"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
-msgstr "�������� ����� RAM � MB"
+msgstr "�������� ����� RAM � M�"
 
-#: ../../install_steps_interactive.pm_.c:984
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
-msgstr "�������� ������i"
+msgstr "�� ���� ������������� ����i������� ��� �����i� �����i ������i"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
+"��������: ��� �����I� ���Ρ�I ������I ������ �� ROOT � ������I �� "
+"�����������!\n"
+"���i �� ������� �������i�� �� root, ���������� �� ����������i�, ����� \n"
+"���������� \"su\".� ���i� �������, ������ ������������� ������ �� ��� "
+"�����,\n"
+"� �����i �� ������.\n"
+"����� �� �����, ��� �� ���i �����������."
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "������������ ������i PCI �������?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"������� �����i��, ��������� NumLock ���� �������i �� ����������\n"
+"����� ����i����� (���������, ���i�� �� `p' ��� `6')."
+
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "����������� i������� ��������� ��� X11?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
+"�i ������� �� �������� ������������ ����i-���� ��� ����i����i linux?"
 
-#: ../../install_steps_interactive.pm_.c:1038
-#, fuzzy, c-format
+#: ../../install_steps_interactive.pm_.c:1030
+#, c-format
 msgid "Insert a blank floppy in drive %s"
-msgstr "�������� ������� � �������� %s"
+msgstr "������ ������� � �������� %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
-msgstr "���������� �������i"
+msgstr "��������� ������� ��� ����븢�i"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3319,7 +4261,7 @@ msgstr ""
 "��������� ����i �� ���������.\n"
 "�� ������� ������� �����i �����?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3331,161 +4273,27 @@ msgid ""
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
-"�i�����, �������� ���������.\n"
+"�i�����, ����븢�� ���������.\n"
 "�����i�� ���������� ���� i ���i��i�� enter ��� �����������i.\n"
 "�� i���������� ��� �������i ��������� ������� Linux-Mandrake,\n"
 "����������� �� http://www.linux-mandrake.com/.\n"
 "I��������� �� ��������� ����� �i����� ���� � �����-������������\n"
 "����� ������ ��������i�� ����������i�� � ��i������� Linux-Mandrake."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "���������� ����'�����"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "�������� �������� ��� %s ����� %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(������ %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "���� %s ������� ��� ������������?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"� ��������� �������� %s �������� �������� ��������� ���������� i���������,\n"
-"��� �������� ���� �� �����������. �i �� ������� �� ������ ��� ���\n"
-"���������� ����i, �i ������i�� �������� �������i������ ������\n"
-"� ������� ���������� i��������i? �������, ����i������� ��������\n"
-"�� �������� ����'�����, ��� ��� �i���� �� �����i��."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "���������"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "�������� ���������"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "�� �� ������ ������ ����i ������ %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"�� �� ������ ������ ����i ������ %s.\n"
-"����i - � ������� ``i��=�������� i��2=��������2 ...''.\n"
-"���������, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "����i ������:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"�������� ������ %s �� �������.\n"
-"������� ������������ � i����i ����������i?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "������������ ������i ����� PCMCIA?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "��������� ���� PCMCIA ..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, fuzzy, c-format
-msgid "Try to find %s devices?"
-msgstr "������������ ������i PCI �������?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "��������� %s %s i���������"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "�i ���� � ��� i���?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "�i ���� � ��� %s i��������?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "��"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "��"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "��. ��i����� ������������"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "����������� �� ����i"
-
-#: ../../install_steps_interactive.pm_.c:1207
-#, fuzzy
-msgid "Bringing down the network"
-msgstr "����������� �� ����i"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
-msgstr "�������� Linux-Mandrake %s"
+msgstr "����븢�� Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
-" <Tab>/<Alt-Tab> ���i� ���������i  |  <Space> �����  |  <F12> �������� �����"
+"  <Tab>/<Alt-Tab> ���i� ���������i  |  <Space> �����  | <F12> �������� ����� "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
-msgstr "���i ����� ���������"
+msgstr "���i �����, ���������"
 
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
@@ -3493,7 +4301,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "�������������� (%s), ������� ���������\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "������ �����, ����������� ����\n"
 
@@ -3507,556 +4315,1050 @@ msgstr " ? (�������� %s) "
 msgid "Your choice? (default %s) "
 msgstr "��� �����? (�������� %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
-msgstr "��� �����? (�������� %s. �����i�� 'none' ��� ���������i) "
+msgstr "��� �����? (�������� %s. �����i�� `none' ��� ���������i) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "�����i"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "������i"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "I������i"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "�i���i"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "���������i"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "��������i"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "������i"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "����i"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "UK ����i�����"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "US ����i�����"
 
-#: ../../keyboard.pm_.c:107
-#, fuzzy
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
-msgstr "�������i"
+msgstr "�������i (�����)"
 
-#: ../../keyboard.pm_.c:108
-#, fuzzy
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
-msgstr "�������i"
+msgstr "�������i (typewriter)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "�������i (���������)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "������������� (latin)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "������������� (������)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "�����i���i"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "��������i"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "����i����i (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "���������i (�������� ���������)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "���������i (����������� ���������)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
-msgstr ""
+msgstr "������i (���� ������i������� ����i�)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "����i"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak (US)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (��������i)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "�������i"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "����i���i (\"������\" ���������)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
-msgstr "����i���i (\"���i�����\" ���������)"
+msgstr "����i���i (\"���i�����\" ���������)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
-msgstr "�������i"
+msgstr "�������i"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "��������i"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
-msgstr ""
+msgstr "�������i"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
-msgstr "I����"
+msgstr "I����"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
-msgstr "I���� (���������)"
+msgstr "I���� (���������)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "I�����i"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "I�������i"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "I��������i"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "������i 106 ����i�"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "���i��-����������i"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "��������i"
 
-#: ../../keyboard.pm_.c:140
-#, fuzzy
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
-msgstr "�i����i AZERTY"
+msgstr "�i����i AZERTY (�����)"
 
-#: ../../keyboard.pm_.c:142
-#, fuzzy
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
-msgstr "�i����i AZERTY"
+msgstr "�i����i AZERTY (����)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "�i����i \"����� �����\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "�i����i \"���������\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
-#, fuzzy
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
-msgstr "���������i (�������� ���������)"
+msgstr "������i (����������� ���������)"
 
-#: ../../keyboard.pm_.c:147
-#, fuzzy
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
-msgstr "���������i (�������� ���������)"
+msgstr "������i (qwertz ���������)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "�����������i"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "�������i (������)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
-msgstr "����i (Yawerty)"
+msgstr "����i (�-�-�-�-�-�)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
-msgstr "������i"
+msgstr "�����i"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "��������i"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "�������i"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "������� ����i�����"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "������i (����������� \"F\" ������)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "������i (�������� \"Q\" ������)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "����i���i"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "US ����i����� (�i���������)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "���������i \"����� �����\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
-msgstr "��������i"
+msgstr "��������i (���i����� ���������)"
 
-# 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.
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - ���"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "����������"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "�������"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "� �����"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "����������"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "��������� ��� � 2 �������"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "��������� ��� � 3 �������"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (����������, ����� ��� C7)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "���� ����"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2 �����i"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3 �����i"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "����"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "���� ����"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "����� ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "���� ��������?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "��������� �������� I�������"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "�i ������� ����� ������������ ��������� �� I�������?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "��������� i������� ��������"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "�� ��������� �� i�������"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "��������� �� I������� / ����i�������� �����"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "��������� ISDN"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"�������� ������ ����������.\n"
+"���i ��� ���� � ����� ��i��, �������� ��� ``I���''"
+
+#: ../../netconnect.pm_.c:158
+msgid "Connection Configuration"
+msgstr "��������� ��������� �� I�������"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "���i �����, �����i�� �i �������� ���� �i���"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "IRQ �����"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "������ ������ ����� (DMA)"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "IO �����"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "IO_0 �����"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "IO_1 �����"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "��� ����i��� ��������� �����"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "I�� ����������, ��������� ���������.net"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "����� �������� ����������"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "DNS 1 ����������"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "DNS 2 ����������"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "����� ��������"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "I�� ��� ������� (i�� ����������i��)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "������ ��� �������"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "���������i�� ������"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "ݢ����"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "ݢ���� (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "�����������"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "����������� - �� ���� D-����� (���������� ������)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "��i �������� �� ������� �������������?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "�� ������"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "��i ��� ����� �� �����?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "����������"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "�����i��"
+
+#: ../../netconnect.pm_.c:245
 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"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
-"�������� ��������� � �������� ������ ����������� �i����� LILO!\n"
-"��� ������i ��i� �������� ��������, ���i��i�� <TAB>\n"
 "\n"
-"��� ������i�� ���� � i�, ���i�i�� �� ����� i ���i��i�� <ENTER> �����\n"
-"������� %d ������ ��� �������i �� ��������.\n"
+"���i �� ����� ISA �����, ���i���i �� ��������� ������ ���i��� ���� "
+"���������i.\n"
 "\n"
+"���i �� ����� PCMCIA �����, �� ���i��� ������ irq i io ����� �����.\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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr ""
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "���� � ��� ISDN �����?"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr ""
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "������i ISDN �����:\n"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../netconnect.pm_.c:287
+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 �����, ��� �������� �� ���. ���i �����, �������� PCI "
+"����� �� ��������� ������."
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr ""
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr "����� ISDN PCI �� ���������. ���i �����, �������� �� ��������� ������."
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
+#: ../../netconnect.pm_.c:331
+#, fuzzy
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
+"�i ���i� ethernet ��������� ������� � ����� �i����� �� ���������. ���i "
+"�����, ����������� ����i��������� i���������."
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "�������� ������� i��������"
+
+#: ../../netconnect.pm_.c:336
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
 msgstr ""
+"���i �����, �������� ������� �������, ��i �������� ������������� ��� "
+"��������� �� i�������"
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "������� i��������"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
+"\n"
+"Do you agree?"
 msgstr ""
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "����������i�� ������� i��������. ������?"
+
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "��������� ADSL"
+
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "�� �������, ��� ����� �������� ���������� ��� ��������?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "������������ ������i �����?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "�� ����� ����������� ����� �������� �����?"
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "��������� ������������ �������� (Dialup)"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "I�� ��������"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "����� ��������"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "I�� (login ID)"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "��������i�����"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "�� ������ �������"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "�� ������ ����i����"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "I�� ������"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "����� ������ DNS"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "����i ������ DNS:"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "��������� �� I������� / ����i�������� �����"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "��������� i������� ��������"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "�� ��������� �� i�������"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
 msgstr ""
 
-#: ../../mouse.pm_.c:21
+#: ../../netconnect.pm_.c:586
 #, fuzzy
-msgid "Sun - Mouse"
-msgstr "USB ����"
+msgid "You are currently connected to internet."
+msgstr "�� ��������� �� i�������"
 
-#: ../../mouse.pm_.c:23
+#: ../../netconnect.pm_.c:590
 #, fuzzy
-msgid "Apple ADB Mouse"
-msgstr "ATI Bus Mouse"
+msgid "Connect to Internet"
+msgstr "�������� � I�������"
 
-#: ../../mouse.pm_.c:24
+#: ../../netconnect.pm_.c:592
 #, fuzzy
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "USB ���� (3 �����i �i �����)"
+msgid "Disconnect from Internet"
+msgstr "��������� �������� � i�������"
 
-#: ../../mouse.pm_.c:25
+#: ../../netconnect.pm_.c:594
 #, fuzzy
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "USB ���� (3 �����i �i �����)"
+msgid "Configure network connection (LAN or Internet)"
+msgstr "��������� i������� ��������"
 
-#: ../../mouse.pm_.c:26
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "I������� �������� i ����i�������"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
 #, fuzzy
-msgid "Apple USB Mouse"
-msgstr "USB ����"
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr "����������i�� ������� i��������. ������?"
 
-#: ../../mouse.pm_.c:27
+#: ../../netconnect.pm_.c:641
 #, fuzzy
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "USB ���� (3 �����i �i �����)"
+msgid "Configure a normal modem connection"
+msgstr "��������� i������� ��������"
 
-#: ../../mouse.pm_.c:28
+#: ../../netconnect.pm_.c:661
 #, fuzzy
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "USB ���� (3 �����i �i �����)"
+msgid "Configure an ISDN connection"
+msgstr "��������� i������� ��������"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Generic Mouse (PS/2)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "��������� ISDN �����"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "�����i �����"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Generic 3 Button Mouse (PS/2)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "��������� �� I�������"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "��i ��� ������ ISDN ��������?"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "��������� i������� ��������"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "�������"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "I���� ���i��"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "���� ���i�� ������ �����������?"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "����� Alcatel"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "����� ECI"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
+"���i ��� ADSL ����� ���� � ������� Alcatel, �������� Alcatel. � i���� "
+"������� - ECI."
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus Mouse"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "������������� pppoe"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus Mouse"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "�� ������������� pppoe"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus Mouse"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"�������� ������� ���i����� �������� ���� adsl ���� dhcp i pppoe.\n"
+"��� �, ���� �������� ����� �������� �����i ���i ������������ dhcp.\n"
+"���i �� �������, ��� ���i��, ���i����� '���������� pppoe'"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB ����"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "��������� i������� ��������"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB ���� (3 �����i �i �����)"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"��i dhcp ��i��� �� �������� ������������?\n"
+"�� ��������, ���� dhcpd"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "��� ����"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "��������� i������� ��������"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A ����� ����� (����������))"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "��������� ��������� ����i"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (����������)"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "����i������� ����i"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (����������)"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "�i ������� �������i������ ��������i?"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (����������)"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "����i�� ���������� �������� ��������"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (����������)"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "��������� �� I������� / ����i�������� �����"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (����������)"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"��������i ��������� ����i ��� ���������.\n"
+"�i ������� ��:"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (����������)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "�� �� �������� ��������� �� I�������?"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (����������)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "����i������� ����i"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (����������, ����� ��� C7)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (����������)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "�������� ����� �� ���������"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Generic Mouse (����������)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "��������� ����i"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft compatible (����������)"
+#: ../../network.pm_.c:274
+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 �� � ��� ����."
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Generic 3 Button Mouse (����������)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "I�� ������"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (����������)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Is this correct?"
+#: ../../network.pm_.c:302
+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 ""
+"���i �����, �����i�� IP ����i������� ��� ����� ������.\n"
+"����� ����� ���i��� ���� �������� �� IP ����� � ����������-��������� \n"
+"������i (���������, 1.2.3.4)."
 
-#: ../../partition_table.pm_.c:528
-msgid "Extended partition not supported on this platform"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "��������� �������� ������� %s"
+
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "����������� IP"
+
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "IP �����"
+
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "����� ����i"
+
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP ����� ���i��� ���� � ������� 1.2.3.4"
+
+#: ../../network.pm_.c:341
+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 ""
+"�����i�� i�� ���� ������ (host).\n"
+"I�� ����� ������ ���i��� ���� ��������� �������,\n"
+"��������� ``mybox.mylab.myco.com''.\n"
+"�� ������ ������� �����i IP ����� �����, ���i �� � ��� ����."
+
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "DNS ������"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "����"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "�������-����"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "��������� proxy ���������� �������"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
 
-#: ../../partition_table.pm_.c:546
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy ���i��� ���� http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy ���i��� ���� ftp://..."
+
+#: ../../partition_table.pm_.c:540
+msgid "Extended partition not supported on this platform"
+msgstr "�������� ������� �� ��������i������ ����� ����������"
+
+#: ../../partition_table.pm_.c:558
 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 ""
 "�� ����� ��i��� � ����i�� �������, ��� � �� ��� ���������i �� ����������.\n"
-"���i�� ����� � ���, ��� ��������i�� ��������� �������� ���, ��� ��i��� i��� "
+"���i�� ����� � ���, ��� ��������i�� ��������� �������� ���, ��� ��i��� i���\n"
 "������ �� ��������� (extended) ���������"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "������� ������� ����� %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
-msgstr "��������� � ����� %s: �� ���������� %s"
+msgstr "��������� � ����� %s �� ����������: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
-msgstr "������ ���� � ��������� ���i��"
+msgstr "������ ���� ���������� ���ii"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "������� ���i�� � ���� %s"
 
 #: ../../pkgs.pm_.c:20
 msgid "mandatory"
-msgstr ""
+msgstr "����������"
 
 #: ../../pkgs.pm_.c:21
 msgid "must have"
-msgstr ""
+msgstr "���i��� ����"
 
 #: ../../pkgs.pm_.c:22
 msgid "important"
-msgstr ""
+msgstr "�����"
 
 #: ../../pkgs.pm_.c:24
 msgid "very nice"
-msgstr ""
+msgstr "�����i �����"
 
 #: ../../pkgs.pm_.c:25
-#, fuzzy
 msgid "nice"
-msgstr "����������:"
+msgstr "�����"
 
 #: ../../pkgs.pm_.c:26 ../../pkgs.pm_.c:27
-#, fuzzy
 msgid "interesting"
-msgstr "�������� ������"
+msgstr "�i����"
 
 #: ../../pkgs.pm_.c:28 ../../pkgs.pm_.c:29 ../../pkgs.pm_.c:30
 #: ../../pkgs.pm_.c:31
-#, fuzzy
 msgid "maybe"
-msgstr "������"
+msgstr "���� ����"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
-msgstr ""
+msgstr "i18n (�����)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
-msgstr ""
+msgstr "i18n (�����i �����)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
-msgstr ""
-
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "�������� ����"
+msgstr "i18n (�����)"
 
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "�������� �����"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "�������� �������"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "�������� lpd"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "�������� �������"
+
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "�������� ������ CUPS"
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "�������� ������ lpd"
+
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "������� ������� (socket)"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "URI ��������"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "���������� ������..."
@@ -4068,51 +5370,51 @@ msgstr "�������� �����"
 #: ../../printerdrake.pm_.c:35
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
-msgstr "������� �����i \"%s\" �������� �� "
+msgstr "������� �����i \"%s\" ��������� �� "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
-msgstr "��������� �������"
+msgstr "�������� �������"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
-"�� ����� ���������� ���������� ��� ������� \n"
+"�� ����� ����� �������� ��� ������� \n"
 "(/dev/lp0 ���i�������� LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:47
-#, fuzzy
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
-msgstr "�������:"
+msgstr "���� ��������"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "����i ���������� �������� lpd"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 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."
 msgstr ""
-"��� ��������i ��������� ����i ����� ��� �������� ��������� i�� ���������� "
-"������� i i�� ����i �����, � ���� �������� ������ ����� ��������� ������i."
+"��� ��������i ��������� ����i ����� ��� ��������\n"
+"��������� i�� ���������� ������� i i�� ����i �����,\n"
+"� ���� �������� ������ ����� ��������� ������i."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
-msgstr "��������� ������"
+msgstr "�������� �����"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "��������� ����� �����"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "����i �������� SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4121,31 +5423,31 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 "��� ����� �� �������� SMB ��������� ��������� i�� ����� SMB (�� ����� "
-"������� � i����� � ����� TCP/IP) i ����� IP ������� �����, � ������� i�� "
+"������� � i����� � ����� TCP/IP) i ����� IP ������� �����, � ������� i�� "
 "�������, ��i ��������� � �������� ���������, i�� ����������i��, ������ i "
 "i��������� �� ������� �����."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "I�� ������� SMB"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP ������� SMB"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
-msgstr "I�� �������"
+msgstr "I�� ��� �������������� �������"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "������� �����"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "����i �������� NetWare"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4153,156 +5455,226 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 "��� ����� �� ������� NetWare ��������� ��������� i�� ������� ����� NetWare "
-"(�� ����� ������� � i����� � ����� TCP/IP) i i�� ����i �����, ���� "
+"(�� ����� ������� � i����� � ����� TCP/IP) i i�� ����i �����, ���� "
 "��������� ��������� ��������, � ������� i�� ����������i�� i ������."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "������ �����"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "I�� ����i �����"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "����i ������ ��������"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"��� ��������� ���� ����� �������i, ��� ��������� �����������\n"
+"i�� �������� i ������� ��� ����� �����."
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "I�� ��������"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "����"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr "�� ������ ��������� �������� URI ��� ��������� �� �������i � CUPS."
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "��i ��� �������i �� �����?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "������� �������i������ ����?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "���� �������� ��������"
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"�������� �������i ��������� ������ �����.\n"
+"����� ���, �� ������� ��������, ���� ������i �������� ���.\n"
+"������ �����:\n"
+"%s\n"
+"\n"
+"�� ������ ���������?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"�������� �������i ��������� ������ �����.\n"
+"����� ���, �� ������� ��������, ���� ������i �������� ���.\n"
+"�� ������ ���������?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
-msgstr "��, ����������� �������� ������ ASCII"
+msgstr "���, ����������� �������� ������ ASCII"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
-msgstr "��, ����������� �������� ������ PostScript"
+msgstr "���, ����������� �������� ������ PostScript"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
-msgstr "��,  ����������� ������ �������i ������"
+msgstr "���,  ����������� ������ �������i ������"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "��������� ��������"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "�������� ��� ��������:"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "����i ��������"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "������ ������"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "����������� ������ ����� �����?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "��������� �������� Uniprint"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "��������� ����i�i ������"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
-msgstr ""
+msgstr "��������� ����� �� PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
-msgstr ""
+msgstr "��������� ������� ��������"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
-msgstr "������������� \"���������� ����\"?"
+msgstr "����������� ����������� �����?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
-msgstr ""
+msgstr "����� �������i �� ��������i ������������ ��������"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
-msgstr ""
+msgstr "������/����� ���i � ������� (1/72 ������)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr ""
+msgstr "�������/�i���� ���i � ������� (1/72 ������)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
-msgstr ""
+msgstr "���������� ����i GhostScript"
 
-#: ../../printerdrake.pm_.c:187
-#, fuzzy
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
-msgstr "��������� ����i�i ������"
+msgstr "���������� ��������� ������"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "������� �������i������ ����?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "���� �������� ��������"
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"�������� �������i ��������� ������ �����.\n"
-"����� ���, �� ������� ��������, ���� ������i �������� ���.\n"
-"������ �����:\n"
-"%s\n"
-"\n"
-"�� ������ ���������?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"�������� �������i ��������� ������ �����.\n"
-"����� ���, �� ������� ��������, ���� ������i �������� ���.\n"
-"�� ������ ���������?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "�������"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "������� ������i�� �������?"
 
-#: ../../printerdrake.pm_.c:243
-#, fuzzy
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
 msgstr ""
-"LILO ������� ��������� ������.\n"
-"�� ������ ������ ����, ����� ����i�� i�������."
+"��� ���������� ����i �����.\n"
+"�� ������ ������ ����, ����� ����i�� i�������."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "��������"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
-msgstr "����� ���� ����������� ��������"
+msgstr "����� ���� �������� ��������"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
-msgstr "�������� ��� ��������:"
+msgstr "�� ������� ��������?"
 
-#: ../../printerdrake.pm_.c:272
-#, fuzzy
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "����� ���� �������� � ��������� ���������"
+
+#: ../../printerdrake.pm_.c:388
+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\"."
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
-msgstr "��������� ����� �����"
+msgstr "�����i�� ����� �����"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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 �� ����� �������� ����������?"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "I�� �������i"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "��i�����"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "�������������"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4310,83 +5682,97 @@ msgid ""
 "connected?"
 msgstr ""
 "������ ����� �����, � ���� ����������� ������i ��� �����, �������� "
-"���������� i���i (�������� lp) i ����������� � ��� �������� ����i���. "
-"�������� i�� i ������� ��� ����i."
+"���������� i�� (�������� lp) i ����������� � �� �������� ����i���. �������� "
+"i�� i ������� ��� ����i."
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "I�� ����i �����"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "���������� ����i���"
 
-#: ../../printerdrake.pm_.c:278
-#, fuzzy
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
-msgstr "����� ���� ����������� ��������"
+msgstr "�������� ��������"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "�� ������i������ ������ ������� �� _��������i������_ RAID md%d"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "�� ������i������ ���i� � ���� $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
-msgstr ""
+msgstr "mkraid �� ������������"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr ""
+msgstr "mkraid �� ������������ (���� raid ������� ������i�����?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "������������ �������� ��� RAID ������ %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
-msgstr ""
+msgstr "Anacron, ���������� �������� ����������i�."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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 ""
+"ampd ��������������� ��� ����������� ������� ������i i �������� "
+"���������i.\n"
+"��� ����� ������������� ��� ���������� ������ ��� �i��i� ������� ������i."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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 ""
+"�������, ��i� �����������, �i������� �� �������� i ���� �� ���������\n"
+"i ����������� ����� ������, ���i �������� �����i �i��� �����������."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 - ����������� UNIX ��������, ���� �������� �������� ����������i��\n"
+"���� ���������� ������� ����. Vixie cron ����� ��� ���������� �� "
+"������������\n"
+"UNIX cron, ��������� ����� �������� ������i i ������ ����i���������� ����i."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 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 ����� ��������� ���i �� ��������, ��i� �������� � ��������� ������,\n"
+"���i� �� Midnight Commander. ���� �������� ������������� ��� ��� "
+"���i������i i ������,\n"
+"i ������� ��������� ����������� (pop-up) ���� � ��������� ������."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
 msgstr ""
+"Apache - ���� World Wide Web ������. �� ��������������� ��� ������������\n"
+"HTML ����� i CGI."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4395,163 +5781,363 @@ msgid ""
 "disables\n"
 "all of the services it is responsible for."
 msgstr ""
+"I������� �����������-����� (���������� inetd) �������� ��� ������ \n"
+"��������� ������ i������� ������, ��i� ���������. ��� ����� ������������� "
+"��� �����\n"
+"����i� ������, ��������� telnet, ftp, rsh i rlogin. ����i��� inetd, "
+"����i����\n"
+"��� ������, �� ��i� �� ��������."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 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 ""
+"���� ����� �������� ������� ��������� ����i����� �� ����� �\n"
+"/etc/sysconfig/keyboard. ��� ���� ���� ������ ������� � ��������� "
+"kbdconfig.\n"
+"�� ������ ����i�� ��������� �� ��� ����i� �����."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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. ����\n"
+"������, ��i �i��� ������ ��������(�)."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
+"named (BIND) - ���� ������ �������� i���, ��i ��������������� ���\n"
+"������������ i�� ����� � IP ������."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
+"����i������ i �������i������ ��� �������� �������� �i����� (NFS),\n"
+" SMB (Lan Manager/Windows) i NCP (Netware) �����i ����i�������."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
+"�����i������/�������i������ ��� �������� i���������, �����i��������� ���\n"
+"������ ��� �������� �i�����."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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 ����i.\n"
+"����� ������ �������������� NFS ��������, ��i ����i��������� ����\n"
+"/etc/exports ����."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 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\n"
+"����i. ����� ������ ������� �� ��������� �����i ���i� NFS ������i."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 - ���� �������� ��������� ���i� ����, �� Ethernet i\n"
+"������ � ��������. ��� ���� �����������i ����i�������� i�, ���i �� �����\n"
+"������ i� ����, �i ��� �� ������."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 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 (���������i� �����) �i��� RPC ���������i, ��i� ��������\n"
+"��������������� ���i�i ����������i �� NFS i NIS. Portmap ������ ���i��� "
+"����������\n"
+"�� ������� ��i� �������� �� ������� ��� ���������, ��i� ������������� RPC."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr ""
+"Postfix -  ���� ������� ����������� �����, ��������, �������\n"
+"���������� ����� � ����� ������ �� ������."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
+"�������� i �����i�� �i������ ������i��� ��� ��� ������� �����i\n"
+"��������� ���������� ���."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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 ""
+"����� ������������i �������� ��� �����i���� ����i� IP ������������i\n"
+"��������� ���� RIP ��������. RIP ��������������� � ����� ������, �����\n"
+"��������� ��������� ������������i - � ���i�i� ������."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
+"�������� rstat �������� ����������i��� ����i ������i����\n"
+"������ �������i ��� ������ ������ ����i."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
+"�������� rusers �������� ����������i��� ����i ���������, ���\n"
+"������ i ������ �� ������� � �����."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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 ��� ���������� ����������i��� �������� ��i� ��i�\n"
+"����������i��, ��������� �� ������, ������ rwho ����� (������� �� finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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� ������ ���i������ "
+"�����������i\n"
+"� ������ ����� ���������i. ���� �����i ����� ��� ������ ����� ������ �����."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
-msgstr ""
+msgstr " ���� ������� ������ ������� ��� �����i ��� usb ���i."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
-msgstr ""
+msgstr "�������� i �������� X Font Server ��� �������� i ���������i."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
-msgstr "��������, ��i� ����i�� ��������� ���������� ��� ��������"
+msgstr "��������, ��i� ����i�� ��������� ���������� ��� ��������"
 
-# 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.
-#
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
+msgstr ""
+"����i�� �������� �� ��������, ��� ������� �������� ��� ���� :(\n"
+"��������� i��i ����� i ���� ���������� ������� ��������"
+
+#: ../../standalone/drakboot_.c:25
+msgid "Configure LILO/GRUB"
+msgstr "��������� LILO/GRUB"
+
+#: ../../standalone/drakboot_.c:26
+msgid "Create a boot floppy"
+msgstr "�������� ����. ����"
+
+#: ../../standalone/drakboot_.c:28
+msgid "Format floppy"
+msgstr "������i������ �������"
+
+#: ../../standalone/drakboot_.c:40
+msgid "Choice"
+msgstr "�����"
+
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "����븢�� LILO �� ����������. ���i��� ��������� �������:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "�������� I�������-�������� ����� �������"
+
+#: ../../standalone/drakgw_.c:104
+#, fuzzy
+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 "����븢�� ��������� I�������-�������� ��������.\n"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "����i��"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
 msgstr ""
-"�������� ��������� � �������� ������ ����������� �i����� SILO!\n"
-"��� ������i ��i� �������� ��������, ���i��i�� <TAB>\n"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "��������� X Window"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "�������� I�������-�������� ����� ����������"
+
+#: ../../standalone/drakgw_.c:123
+#, fuzzy
+msgid ""
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently disabled.\n"
 "\n"
-"��� ������i�� ���� � i�, ���i�i�� �� ����� i ���i��i�� <ENTER> �����\n"
-"������� %d ������ ��� �������i �� ��������.\n"
+"What would you like to do?"
+msgstr "����븢�� ��������� I�������-�������� ��������.\n"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "����i��"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "�� ������������ ���������� ����� ����� ��������."
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "�������� I�������-��������"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakgw_.c:177
 #, fuzzy
-msgid "Configure LILO/GRUB"
-msgstr "��������� X Window"
+msgid "using module"
+msgstr "����� ��������"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "� ����� ������ ���� �i������� ��������� ��������!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"�i ���i� ethernet ��������� ������� � ����� �i����� �� ���������. ���i "
+"�����, ����������� ����i��������� i���������."
+
+#: ../../standalone/drakgw_.c:218
 #, fuzzy
-msgid "Create a boot floppy"
-msgstr "�������� ����. ����"
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"���� �����i ���i� �����i�������� ������� ������� � ����� �i�����:\n"
+"\n"
+"$interface\n"
+"\n"
+"�i ��������� ���������� i������� �������� ���� ���� �������?"
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"���i �����, �������� ������� �������, �� ����� ����������� ��� ��������� �� "
+"����� ��������� ����i."
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"�����, ������� ������� �����i��������.\n"
+"�i ������� ��������i�������� ���?"
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr "������������ ����� ��� �����i���� � ������� ����i�������� $_!\n"
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "��������� ������ �������� ������ (firewall)!"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+"�����! ��������� �������� �i����� �������� ������i (firewall). ��� ������� "
+"���������� ������������ �� ����� ����븢�i. �����?"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "������������ ���������, ����븢�� ��, ������ ������..."
+
+#: ../../standalone/drakgw_.c:282
 #, fuzzy
-msgid "Format floppy"
-msgstr "������i������ ��"
+msgid "Configuring..."
+msgstr "��������� IDE"
 
-#: ../../standalone/drakboot_.c:39
-msgid "Choice"
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "�� ������������ ���������� RPM ``ipchains'' � ��������� urpmi."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "�� ������������ ���������� RPM ``dhcp'' � ��������� urpmi."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "�� ������������ ���������� RPM ``linuxconf'' � ��������� urpmi."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "�� ������������ ���������� RPM ``bind'' � ��������� urpmi."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+"�� ������������ ���������� RPM ����������� ������� i��� � ��������� urpmi."
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "������ �i�������i!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
@@ -4560,10 +6146,10 @@ 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 ""
-"���� �������� ��������� ������������� � ���������. �i����� ����� �������\n"
+"���� �������� ��������� ������������� � ���������. �i����� ����� �������\n"
 "� ���������i, ��� i ����� ������: ���� �������� ������i ������ "
 "�������������\n"
-"�� �������, ��i� ���������� �� ����i �i �� Internet. ������ �� ��������� "
+"�� �������, ��i� �������� �� ����i �i �� Internet. ������ �� ��������� "
 "�������."
 
 #: ../../standalone/draksec_.c:31
@@ -4580,7 +6166,7 @@ msgid ""
 "more security warnings and checks."
 msgstr ""
 "���� �������� ������i ��� ����� �����������, � ������ �����\n"
-"�����i������ ��������� �������� i �������������."
+"�����i������ ��������� �������� i �������������."
 
 #: ../../standalone/draksec_.c:34
 msgid ""
@@ -4588,7 +6174,7 @@ msgid ""
 "to connect to the Internet as a client. There are now security checks. "
 msgstr ""
 "���� ���������� �������� ������i, ��i ������������� ��� ����'�����,\n"
-"��i ���������� �� Internet � �����i ��i����. ��������� ����� �������i\n"
+"��i �������� �� Internet � �����i ��i����. ��������� ����� �������i\n"
 "������i."
 
 #: ../../standalone/draksec_.c:36
@@ -4612,31 +6198,44 @@ msgstr ""
 
 #: ../../standalone/draksec_.c:49
 msgid "Setting security level"
-msgstr "�������� ������i"
+msgstr "��������i ������ ������i"
 
 #: ../../standalone/drakxconf_.c:21
 msgid "Choose the tool you want to use"
-msgstr "�������� i���������"
+msgstr "�������� i���������, ��i ������� ����������"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "�������� ��� ����i�����"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "����i�� ������ ������"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "������� ��� ����� ���i"
+#: ../../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 ""
+"����i�� ��� Cd-Rom!\n"
+"\n"
+"���i �����, ������ Cd-Rom, �������� \"%s\", � ��� �������� i ���i��i�� O� "
+"�����.\n"
+"���i �� �� ����� ���, ���i��i�� �����i��, ��� �����i�� ����븢�� � ������ Cd."
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
+
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "serial_usb �� ��������\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
-msgstr "����i������ ������ ������?"
+msgstr "��������� ������ ������?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
-msgstr "�� ����� ����������� ����� ���������� ���� ���?"
+msgstr "�� ����� ����������� ����� �������� ���� ���?"
 
 #: ../../standalone/rpmdrake_.c:25
 msgid "reading configuration"
@@ -4734,11 +6333,11 @@ msgstr "�����:\n"
 
 #: ../../standalone/rpmdrake_.c:161 ../../standalone/rpmdrake_.c:209
 msgid "Uninstall"
-msgstr "������ � �i�����"
+msgstr "�����i�� � �i�����"
 
 #: ../../standalone/rpmdrake_.c:163
 msgid "Choose package to install"
-msgstr "����� ������ ��� �������i"
+msgstr "����� ������ ��� ����븢�i"
 
 #: ../../standalone/rpmdrake_.c:190
 msgid "Checking dependencies"
@@ -4754,7 +6353,7 @@ msgstr "��������� ������ ������ �������� � �i�����"
 
 #: ../../standalone/rpmdrake_.c:210
 msgid "Uninstalling the RPMs"
-msgstr "��������� � �i����� RPM"
+msgstr "��������� �������� RPM-������ � �i�����"
 
 #: ../../standalone/rpmdrake_.c:229 ../../standalone/rpmdrake_.c:269
 msgid "Regexp"
@@ -4786,15 +6385,15 @@ msgid ""
 "I'm going to relaunch rpmdrake to allow searching files"
 msgstr ""
 "rpmdrake ����� � ������ ``low memory''.\n"
-"rpmdrake ����� ������������� ����� ������������ ������ �����"
+"rpmdrake ����� ������������� ����� ������������ ������ �����"
 
 #: ../../standalone/rpmdrake_.c:253
 msgid "Which file are you looking for?"
-msgstr "���� ���� �� �������?"
+msgstr "��i ���� �� �������?"
 
 #: ../../standalone/rpmdrake_.c:269
 msgid "What are looking for?"
-msgstr "��� �� �������?"
+msgstr "��� �� ������� �������?"
 
 #: ../../standalone/rpmdrake_.c:289
 msgid "Give a name (eg: `extra', `commercial')"
@@ -4806,7 +6405,7 @@ msgstr "�������"
 
 #: ../../standalone/rpmdrake_.c:294
 msgid "No cdrom available (nothing in /mnt/cdrom)"
-msgstr "cdrom ���������� (�i���� ���� � /mnt/cdrom)"
+msgstr "cdrom ���������� (�i���� ���� � /mnt/cdrom)"
 
 #: ../../standalone/rpmdrake_.c:298
 msgid "URL of the directory containing the RPMs"
@@ -4818,11 +6417,11 @@ msgid ""
 "It must be relative to the URL above"
 msgstr ""
 "��� FTP i HTTP, �� ���i��� ��������� ����������� hdlist\n"
-"��������� ������� ����� ����������� URL"
+"��������� ������� ����� ����������� URL"
 
 #: ../../standalone/rpmdrake_.c:302
 msgid "Please submit the following information"
-msgstr "����������� ��������� i���������"
+msgstr "��������� ��������� i���������"
 
 #: ../../standalone/rpmdrake_.c:304
 #, c-format
@@ -4832,7 +6431,7 @@ msgstr "%s ��� ���������������"
 #: ../../standalone/rpmdrake_.c:315 ../../standalone/rpmdrake_.c:321
 #: ../../standalone/rpmdrake_.c:329
 msgid "Updating the RPMs base"
-msgstr "�������� ���� RPM"
+msgstr "��������� ���� ������ RPM"
 
 #: ../../standalone/rpmdrake_.c:328
 #, c-format
@@ -4847,11 +6446,916 @@ msgstr "����� �i���"
 msgid "Finding leaves takes some time"
 msgstr "����� �i��� �������� �������� ���"
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "��������� �������� I�������"
+
+#, fuzzy
+msgid "Internet"
+msgstr "�i����"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+#, fuzzy
+msgid "Office"
+msgstr "�����"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Multimedia - Graphics"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Multimedia - Video"
+msgstr ""
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Multimedia"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Multimedia - Sound"
+msgstr ""
+
+#, fuzzy
+msgid "Gnome"
+msgstr "����"
+
+#, fuzzy
+msgid "Documentation"
+msgstr "��������i�����"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Multimedia - CD Burning"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "�������� �������� ����� ����븢�i"
+
+#~ msgid "Total size: "
+#~ msgstr "������� �����: "
+
+#~ msgid "Reconfigure local network"
+#~ msgstr "��������i���������� ��������� �����"
+
+#~ msgid ""
+#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "��� �����'���� ���� ���� �����i�������� �� ��������� I�������-��������.\n"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "�� �����i��������.\n"
+
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "�������� � i������� ���� �������� �����"
+
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "�������� � i������� �� ISDN"
+
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "��������� �� i������� ���� DSL (�i ADSL)"
+
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "��������� �� I������� ���� ������ (�����)"
+
+#~ msgid ""
+#~ "Time (secs) of inactivity after which\n"
+#~ "it hangs up. (leave blank to disable it)"
+#~ msgstr ""
+#~ "��� (���) �����������i, ����� �����\n"
+#~ "������ ������. (���i���� ������, ��� �����i��)"
+
+#~ msgid "Germany"
+#~ msgstr "������i"
+
+#~ msgid "Germany (1TR6)"
+#~ msgstr "������i (1TR6)"
+
+#~ msgid "What do you wish to do?"
+#~ msgstr "��� �� ������ ����i��?"
+
+#~ msgid "Install/Rescue"
+#~ msgstr "����븢��/�����������"
+
+#~ msgid "Rescue"
+#~ msgstr "�����������"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "��i ��� �������� ��� ��������?"
+
+#~ 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "�������� \"����������\", ���i � ��� ���� �� ���������� �i ����� ����ii\n"
+#~ "GNU/Linux, �����, ���i �� ������� ������������� �������i ����i� �i "
+#~ "������������.\n"
+#~ "\n"
+#~ "�������� \"����������\", ���i �� ������� ���������� ����������� ���������� "
+#~ "����i� Mandrake Linux:\n"
+#~ "\n"
+#~ "\n"
+#~ "��������:\n"
+#~ "\n"
+#~ "  - �������������: ���i �� ����� �i���i �� ����븢���i \n"
+#~ "    GNU/Linux, �������� ���� �����.\n"
+#~ "\n"
+#~ "  - �� ������: ���� ����� ������������� � ��� �������, ���i �� ��������i \n"
+#~ "    ����� � GNU/Linux, i ������� ���i ������� ����������\n"
+#~ "    ������ i ������������ ��� ������ ���������. �����i�� �i��� "
+#~ "�������������.\n"
+#~ "\n"
+#~ "  - �������: ����� ������ ������ ��������, ��� �� �������� ��������� "
+#~ "GNU/Linux\n"
+#~ "    i ������� ������������� �����i �������� ����븢��. �� i � ������� \n"
+#~ "    \"�� ������\"��� �������� ����� ������� ���������� �������� i \n"
+#~ "    ������������ ������ ���������.\n"
+#~ "    ���i �����, �� ���I����� ���� �����, ���I �� ��ݡ����, ��� ���I�� "
+#~ "����I����!\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "����� ����� ���������, ��i� �������� ������������� ��� �������i\n"
+#~ "����� �i����� Linux-Mandrake, ���i ��� ��� ���i ��������� (��� ����������\n"
+#~ "����븢�� Linux ����� i���� ���������� ����i����). � i���� ��������\n"
+#~ "�������� ��������� ����� ���i��� ���� ���������. ���� �������� ���������� �\n"
+#~ "���i����� ����i��� �������� �������� ����'����� �� �������i\n"
+#~ "��������� ������������.\n"
+#~ "\n"
+#~ "\n"
+#~ "���i �� �������� �������� ����� ��������, �� ������ ���������� �����\n"
+#~ "\"���� �����������\", ��� ���������� �������� �������� GNU/Linux. �� "
+#~ "������\n"
+#~ "��������� ���� ��� ����i����, ���i��� �� \"hda\" ��� ������� IDE �����,\n"
+#~ "\"hdb\" ��� ������� ����� �i \"sda\" ��� ������� SCSI ����� i �.�.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ��������� �������� ���������: ������� ������� (/), ��i �'�������� "
+#~ "����������\n"
+#~ "������� i�����ii �������� �������� �i�����, i /boot, ��i ������� ���\n"
+#~ "�����, ���������� ��� ������� ����������� �i����� ��� ��������i ����'�����.\n"
+#~ "\n"
+#~ "\n"
+#~ "�������i ���i�i ������ ������� �������� ����������, ����i���� �� ��������\n"
+#~ "���� ���������� ���i���. DiskDrake �������� ���� ������, ���� ����������\n"
+#~ "���i��� ��i�����. �������i�� ������������ i ������������� ������.\n"
+#~ "\n"
+#~ "\n"
+#~ "������� ����� �������� ��� ��������� �� ������ ��������� � ���������\n"
+#~ "����i�����, ��������� ������������ ���i� ���������i � ��������� ����i� Tab\n"
+#~ "i Up/Down. ���i ������� ������, �� ������ �������������:\n"
+#~ "\n"
+#~ "- Ctrl-c  ��� �������� ���� ������� (���i ��������� ������ ����� �������)\n"
+#~ "\n"
+#~ "- Ctrl-d  ��� �����i�� �������\n"
+#~ "\n"
+#~ "- Ctrl-m  ��� ��������� ������ ����i�������.\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."
+#~ msgstr ""
+#~ "��� ���������� �������� ���i��� ���� ��������i������ ��� ������������\n"
+#~ "(������i������� ������� ��������� �������� �i�����). � ����� �i�����i\n"
+#~ "����� ����������i������ ��� i������� �������� ����� ��i������ ��������,\n"
+#~ "��i� ����������� �� i�. ������: ������i������ i������� �������� �� "
+#~ "����������,\n"
+#~ "�����i�� ���i ��� ��������� ����� i ��������, ��i� �� ������� ��������.\n"
+#~ "�������� ��������� /home i /usr/local."
+
+#~ 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."
+#~ msgstr ""
+#~ "����� �������� �������� �������� ������. ����� �������� �����\n"
+#~ "�������i ��i�i� ����, ���i �� �� ������i ��������� i������� �i�����,\n"
+#~ "� �����i� ������� ���� ���� ����������� ���� �� ������� ���������\n"
+#~ "��� ����i�� �i�����."
+
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "���i DrakX ����i���� ������ ���� ���, ������ �������� � ����\n"
+#~ "i��� �����. � ����i������ ������� �������� ����������� �������\n"
+#~ "�������� ���� � ��i�� �����.\n"
+#~ "\n"
+#~ "\n"
+#~ "� ������� ����, ���� �������� �� ����������� �����, ��� ����������� "
+#~ "�������i��\n"
+#~ "DrakX ����i���� ����� ����������� �����, �� ����� ��� ��������."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "���� ������� ���������� ��������� ��������� ����i,\n"
+#~ "(LAN), ����� ������. \n"
+#~ "\n"
+#~ "�������� \"��������� �����\" i DrakX ��������� �����i\n"
+#~ "�� ����� ������ ������� Ethernet. �������� PCI ���i��� ���� ���������\n"
+#~ "i ��������� ����������. �����, ��� ����������i ISA,\n"
+#~ "�������������� �� ������, i ��� ���������� ���i���� �������\n"
+#~ "� ��i��, ��i �'��i��� ����� ������ � ����� �������.\n"
+#~ "\n"
+#~ "\n"
+#~ "�� i ��� �������� SCSI, �� ������ ������i�� �������� ���������\n"
+#~ "������� ����������, i���� ���������� �������� �������� ��������i,\n"
+#~ "��i� �� ���������� � �����������i �� ������ ������������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ����븢�� Linux-Mandrake �� ����'����, ��i ������ �� ���\n"
+#~ "���������� �����, ���i�i�������� ����i ���������� �������i��\n"
+#~ "��� ��� ���������� i��������� (IP �����, ����� �������i\n"
+#~ "�i ��������� ��������, i i�� �����). ���i �� ���������\n"
+#~ "��������� �����, ��������� ����, �� ���i��� �������\n"
+#~ "��� ��������i ����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "�������� \"�������� ���� �����\" ��� ��������i ��������\n"
+#~ "�� ��������� ���������� ����i Internet ���� �����. DrakX ���������\n"
+#~ "������i ��� �����, ��� ���i � ��� ���� �� ����������, ��� �����\n"
+#~ "�������� ���������� ��������� ������� ����, �� ����� �������� �����."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "Linux ���� ��������� �� �����i�i�i �����i ������������ ������. ����� � "
+#~ "�����\n"
+#~ "���� �������� ������ ����븢�i.\n"
+#~ "\n"
+#~ "\n"
+#~ "���i ���� ������� ��� ���������� �������� ���������� �� ������ ����'�����,\n"
+#~ "�������� \"�������� �������\". ��� ����� �������� ���������, �� ����� �����\n"
+#~ "�������� ������� i ������� ����������� �i����.\n"
+#~ "\n"
+#~ "\n"
+#~ "���i �� ������� �������� ������ �� ��������, ��i �������i��� �� ���������\n"
+#~ "������ Unix, ��������� ������� \"��������� ����� lpd\". ��� ������i�� ���\n"
+#~ "���������, i�� i ������ �� ��������, ��� ��������� ������ i�� ����i �����\n"
+#~ "�� ����� �������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������� �� �������� SMB (��i �������i��� �� ��������� ������\n"
+#~ "Windows 9x/NT/2000 �i Unix � �������� Samba), ��������� ������ ��� i��\n"
+#~ "SMB (���� ���� �� �������� � ��� i����� � ����i TCP/IP), i, �������,\n"
+#~ "��� IP ����� i i�� ����������i��, ������� ����� i ������ ������� ��\n"
+#~ "��������, � ������� i�� ��������. ��� � ����� i ��� ��������\n"
+#~ "NetWare, �����i �� ����������� i��������� �� ������� �����."
+
+#~ 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."
+#~ msgstr ""
+#~ "�������i�� ����������� �������� ��� \"���\"! ���� ���������, ���i ��\n"
+#~ "������������ Windows, ��� �������i�� ���������� ������.\n"
+#~ "���i �� �� �������i ���������� ����, �� ����� �� ������� ������i��\n"
+#~ "Linux!"
+
+#~ msgid "Move your wheel!"
+#~ msgstr "��������� ���� ����"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "������ �������i?"
+
+#~ msgid "Cable connection"
+#~ msgstr "�������� �������"
+
+#~ msgid "Host name:"
+#~ msgstr "I�� ������:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "��i ��� ����� ���i?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "������������ ���������� ������ ������"
+
+#~ 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"
+#~ msgstr ""
+#~ "��� ������ ������������ ������ ������ ����� ���������� ������ ������. \n"
+#~ "��� ����� ����� �i����... ���i ��� �� ���������� �i�����, ��� ����� \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?"
+#~ msgstr ""
+#~ "����� ������������ ������i ��������� ������ ������ (����.: 800x600).\n"
+#~ "� �����i ����i� ������� ���� ���� �������i �� �������� ����'����� .\n"
+#~ "������� ������������?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "������������ ������ �� ���������.\n"
+#~ "����������� ������� i���� �i�������� �i ���i���"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "����������� ����� ������ ������"
+
+#~ msgid "dhcpd"
+#~ msgstr "dhcpd"
+
+#~ msgid "pump"
+#~ msgstr "pump"
+
+#~ msgid "dhcpxd"
+#~ msgstr "dhcpxd"
+
+#~ msgid "dhcp-client"
+#~ msgstr "dhcp-client"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "������� ����i������� nfs"
+
+#~ 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 previous version of Mandrake "
+#~ "Linux:\n"
+#~ "%s or %s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "�������� \"����������\", ���i � ��� ���� �� ���������� �i ����� ����ii\n"
+#~ "GNU/Linux, �����, ���i �� ������� ������������� �������i ����i� �i "
+#~ "������������.\n"
+#~ "\n"
+#~ "�������� \"����������\", ���i �� ������� ���������� ����������� ���������� "
+#~ "����i� Mandrake Linux:\n"
+#~ "%s ����� %s.\n"
+#~ "\n"
+#~ "\n"
+#~ "��������:\n"
+#~ "\n"
+#~ "  - �������������: ���i �� ����� �i���i �� ����븢���i \n"
+#~ "    GNU/Linux, �������� ���� �����.\n"
+#~ "\n"
+#~ "  - �� ������: ���� ����� ������������� � ��� �������, ���i �� ��������i \n"
+#~ "    ����� � GNU/Linux, i ������� ���i ������� ����������\n"
+#~ "    ������ i ������������ ��� ������ ���������. �����i�� �i��� "
+#~ "�������������.\n"
+#~ "\n"
+#~ "  - �������: ����� ������ ������ ��������, ��� �� �������� ��������� "
+#~ "GNU/Linux\n"
+#~ "    i ������� ������������� �����i �������� ����븢��. �� i � ������� \n"
+#~ "    \"�� ������\"��� �������� ����� ������� ���������� �������� i \n"
+#~ "    ������������ ������ ���������.\n"
+#~ "    ���i �����, �� ���I����� ���� �����, ���I �� ��ݡ����, ��� ���I�� "
+#~ "����I����!\n"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB ���"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB ��� (2 �����i)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB ��� (3 �����i �i �����)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB ���"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB ��� (2 �����i)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB ���� (3 �����i �i �����)"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus Mouse"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Bus Mouse"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech Bus Mouse"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB ���"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB ��� (3 �����i �i �����)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A ����� ����� (����������)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (����������)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (����������)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (����������)"
+
+#~ msgid "Microsoft IntelliMouse (serial)"
+#~ msgstr "Microsoft IntelliMouse (����������)"
+
+#~ msgid "Logitech MouseMan/FirstMouse (serial)"
+#~ msgstr "Logitech MouseMan/FirstMouse (����������)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsoft ������i��� (����������)"
+
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse (����������)"
+
+#~ msgid ""
+#~ "I need to configure your network adapter to be able to connect to internet."
+#~ msgstr ""
+#~ "��������� ������i�������� ���� �������� �����, ��� ������� ���� ��������� �� "
+#~ "I�������."
+
+#~ msgid ""
+#~ "Please choose which network adaptater do you want to use to connect to "
+#~ "internet.\n"
+#~ "If you don't know, choose eth0.\n"
+#~ msgstr ""
+#~ "���i �����, �������� ������� �������, ��i �� ������� ������������� �� "
+#~ "��������� �� I�������.\n"
+#~ "���i �� �������, �������� eth0.\n"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Socket"
+#~ 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?"
+#~ msgstr ""
+#~ "DrakX �������� ����i���������� ����� ��� XFree 3.3 i XFree 4.0.\n"
+#~ "�� ��������� ��������������� ������ 4.0. ���i ���� �i�������� ��\n"
+#~ "��������i������ i�, ���� ����� ����������� ������ 3.3.\n"
+#~ "�i �������� �� ���i���� XFree 3.3 � �i�����?"
+
+#~ msgid "Cryptographic"
+#~ msgstr "����������i�"
+
+#~ msgid "Configure LAN"
+#~ msgstr "��������� ����i (���)"
+
+#~ msgid "End configuration"
+#~ msgstr "���������� ��������i"
+
+#~ msgid "Do not set up networking"
+#~ msgstr "�� ����븢���� �����"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "�i ������� �� ������i�� �������� ����i������� ����� �i�����?"
+
+#~ msgid "Show less"
+#~ msgstr "�������� �����"
+
+#~ msgid "Show more"
+#~ msgstr "�������� �����"
+
+#~ msgid "Take over the hard drive"
+#~ msgstr "������������� ��� �������� ��������"
+
+#~ msgid "URI for Local printer"
+#~ msgstr "URI ��� ���������� ��������"
+
+#~ msgid "Local Printer Device (URI)"
+#~ msgstr "�������� ������� (URI)"
+
+#~ msgid ""
+#~ "What URI device is your printer connected to\n"
+#~ "(note that parallel:/dev/lp0 is equivalent to LPT1:)?"
+#~ msgstr ""
+#~ "�� ����� ����� �������� ��� ������� \n"
+#~ "(/dev/lp0 ���i�������� LPT1:)?\n"
+
+#~ msgid "curly"
+#~ msgstr "��������"
+
+#~ msgid "default"
+#~ msgstr "�� ���������"
+
+#~ msgid "tie"
+#~ msgstr "��������"
+
+#~ msgid "brunette"
+#~ msgstr "������"
+
+#~ msgid "girl"
+#~ msgstr "��������"
+
+#~ msgid "woman-blond"
+#~ msgstr "�������-������i���"
+
+#~ msgid "automagic"
+#~ msgstr "������i���"
+
+#~ msgid "Network:"
+#~ msgstr "�����:"
+
+#~ msgid "Everything configured!"
+#~ msgstr "�� �����i��������!"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "��i ��� ����� ����i�����?"
+
+#~ msgid "Normal"
+#~ msgstr "��������"
+
+#~ msgid "Configure my card"
+#~ msgstr "����i�������� ��� �����"
+
+#~ msgid "pptp alcatel"
+#~ msgstr "pptp alcatel"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "������������ ������i ����� PCMCIA?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "������������ ������i %s �������?"
+
+#~ msgid "Small(%dMB)"
+#~ msgstr "���� (%dM�)"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "��������� ������"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "�i ������� �� ������i�� ����������� �������� ���� ����� �� �i�����?"
+
+#~ msgid "Do you want to configure a ISDN connection for your system?"
+#~ msgstr "�i ������� �� ������i�� ISDN �������� � ����� �i�����?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "������������ ������i PCI �������?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "����� ���������� �������."
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: ���� �� �������� �������, ���i ����� �������� i���."
+
+#~ msgid "No root partition found"
+#~ msgstr "�������� ������� �� ���������"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "��������� ������������� broadcast ��� ������ NIS"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "��i ������� ����� ������� ������������� � �����i ����������?"
+
+#~ msgid "You don't have any windows partitions!"
+#~ msgstr "�� �� ����� ��i��i� Windows ��������!"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "� ��� �� ����� ����� ��� Lnx4win"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "�����������"
+
+#~ msgid "SILO main options"
+#~ msgstr "������� ����i SILO"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "SILO ������� ��������� ������.\n"
+#~ "�� ������ ������ ����, ����� ����i�� i�������."
+
+#~ msgid "This label is already in use"
+#~ msgstr "����� ����� ��� ���������������"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "����븢�� SILO �� ����������. ���i��� ��������� �������:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX �������� ��������� �����i ���i� �i �������i �������� PCI\n"
+#~ "i SCSI. ���i ������� ��������, i DrakX ������, ��i �������\n"
+#~ "��� ��� ��������, ����� ������� ����� �������� ����������.\n"
+#~ "\n"
+#~ "���i �� ����� SCSI ������� �� ISA-, ����� PCI-�����, ��� DrakX �� �����\n"
+#~ "��i ������� ���������� � ����� ������, �i DrakX ������, ��� �� �� �����\n"
+#~ "SCSI �������� �������, � ��� ���������, �i ���� �� � ��� ����� ��.\n"
+#~ "���i � ��� ��� ����, ���������� \"��\". ���i ���� ���i� �i �������i,\n"
+#~ "���������� \"���\". ����� ������ �'��i��� ��i� ��������, � ��i� ���\n"
+#~ "�������� ����� ������� �����������.\n"
+#~ "\n"
+#~ "����� ������ ��������, DrakX �������, �i �� ������� �� ������\n"
+#~ "��� ��� ���������� ��������i. �������� ����� ������� ��������� "
+#~ "������������:\n"
+#~ "�������� �� ������ �����.\n"
+#~ "\n"
+#~ "� ���������� �������, �� ��������� ��� i��������� �� �����������i, ����\n"
+#~ "����� �������� �� Windows (���i ��� �������i��� � ����� �i�����), � �������\n"
+#~ "��� ��������i� �� �������� ����� �������. ��� ��������� ��� ��������i, "
+#~ "��i�\n"
+#~ "��������� ������ ��������."
+
+#~ msgid "Shutting down"
+#~ msgstr "���������� ����'�����"
+
 #~ msgid "After %s partition %s,"
 #~ msgstr "����� %s �������� %s,"
 
 #~ msgid "Size: %s MB"
-#~ msgstr "�����: %s MB"
+#~ msgstr "�����: %s M�"
 
 #~ msgid "changing type of"
 #~ msgstr "�������� ����"
@@ -4868,11 +7372,11 @@ msgstr "����� �i��� �������� �������� ���"
 #~ "Linux: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1\n"
 #~ "(Helios) or Gold 2000."
 #~ msgstr ""
-#~ "�������� \"��������\", ���i ���� ����������� ����� ����i� Linux,\n"
-#~ "����� ���i ������� ������������� �������i ���������i�� ����� ����i�.\n"
+#~ "�������� \"����븢��\", ���i ���� ����������� ����� ����i� Linux,\n"
+#~ "����� ���i ������� ������������� �������i ������������ ����� ����i�.\n"
 #~ "\n"
 #~ "\n"
-#~ "�������� \"�����i��\" ���i �� ������� �����i�� ���������� ����i�\n"
+#~ "�������� \"�����i��\" ���i �� ������� �����i�� ���������� ����i�\n"
 #~ "Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
 #~ "6.1 (Helios) ����� Gold 2000."
 
@@ -4894,22 +7398,22 @@ msgstr "����� �i��� �������� �������� ���"
 #~ "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\"."
 #~ msgstr ""
-#~ "��������:\n"
+#~ "��������:\n"
 #~ "\n"
-#~ "  - �����������i: ���i �� ����� �i���i �� ��������i���i Linux.\n"
+#~ "  - �������������: ���i �� ����� �i���i �� ����븢���i Linux.\n"
 #~ "\n"
-#~ "  - � ����������: ���i �� ����� � Linux, �� ����� ������� ��������� \n"
+#~ "  - �� ������: ���i �� ����� � Linux, �� ����� ������� ��������� \n"
 #~ "������� ������������ �i�����: ���������, ��� �������������, �����\n"
-#~ "������. �������� \"���������\" ��� �������i �i����� ��������� �����������.\n"
-#~ "����� \"����������\" ���������� ��� ���, ��� ������������ ���������\n"
-#~ "�����i�� ��� ���������i �������. ���i �� ������� �������i�� ������ "
+#~ "������. �������� \"��������\" ��� �������i �i����� ��������� �����������.\n"
+#~ "����� \"��� ���������i\" ���������� ��� ���, ��� ������������ ����'����\n"
+#~ "�����i�� ��� ���������i �������. ���i �� ������� ���������� ������ "
 #~ "���������\n"
-#~ "����������� (��� �����, �����, ...), �� �������� \"������\".\n"
+#~ "����������� (��� �����, �����, ...), �� �������� \"������\".\n"
 #~ "\n"
 #~ "\n"
 #~ "  - �������: ���i �� �������� ��������� GNU/Linux i ������� �������i\n"
-#~ "�������� � ������������ ����������, ���� ���� �������i - ��� ���. �� \n"
-#~ "������� ������� ������� ����������� �i�����, �� � ��������  \"� ����������\"."
+#~ "����븢�� � ������������ ����������, ���� ���� �������i - ��� ���. �� \n"
+#~ "������� ������� ������� ����������� �i�����, �� � ��������  \"�� ������\"."
 
 #~ msgid ""
 #~ "You may now select the packages you wish to install.\n"
@@ -4927,18 +7431,22 @@ msgstr "����� �i��� �������� �������� ���"
 #~ "install. It is impossible to install a package without installing all\n"
 #~ "of its dependencies."
 #~ msgstr ""
-#~ "����� ����� ������� ������ �������, ��i� �� ������� �������i��.\n"
+#~ "����� ����� ������� ������ �������, ��i� �� ������� ����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��-������, �� ������ ������� ����� ������ ��� ���������� �i �����i��. "
+#~ "�����\n"
+#~ "�� ������ ��������� ����� ������ � �����������i � �������� �������, ��i\n"
+#~ "�� ������� �������.\n"
 #~ "\n"
 #~ "\n"
 #~ "���i �� �������� � ������ ��������, �� ������ ����� ���i���� i����i�������.\n"
-#~ "����� �� �����, ��� ��������� ������ ���������� �������i i���� ������.\n"
+#~ "����� �� �����, ��� ��������� ������ ���������� ����븢�i i���� ������.\n"
 #~ "���� ��������� ����������� ������. ������, ��i� �� ������i, i ������,\n"
-#~ "�� ��i� ��i ��������, ������ ���������� ������� ��� �������i.\n"
-#~ "��������� �������i�� ����� �� �������i ��i� ������, �� ��i� �� ��������.\n"
+#~ "�� ��i� ��i ��������, ������ ���������� ������� ��� ����븢�i.\n"
+#~ "��������� ���������� ����� �� ����븢�i ��i� ������, �� ��i� �� ��������.\n"
 #~ "\n"
 #~ "\n"
-#~ "I��������� �� ��i� ���������� i ������� ������� �������� � ����, ����\n"
-#~ "��������� \"I���\" i ���������� ������ �� ��i�� ������."
 
 #~ msgid "Help"
 #~ msgstr "��������"
@@ -4954,7 +7462,7 @@ msgstr "����� �i��� �������� �������� ���"
 #~ "it now (a boot disk will be needed to boot it)."
 #~ msgstr ""
 #~ "LILO (LInux LOader) ���� ��������� Linux i i���� ����������� �i�����.\n"
-#~ "�������� ��� �������� ����������� ��� ��������. ���i �� �� ������i\n"
+#~ "�������� ��� �������� ����������� ��� ��������. ���i �� �� ������i\n"
 #~ "��� �i����, ��i� ���i ���������� �� ������, �� ������ ������ �����\n"
 #~ "���� � i� ����� �������i.\n"
 #~ "\n"
@@ -4966,7 +7474,7 @@ msgstr "����� �i��� �������� �������� ���"
 #~ msgstr "��������� SCSI"
 
 #~ msgid "Choose install or upgrade"
-#~ msgstr "�������� �i ���������"
+#~ msgstr "�������� ����븢�� �i ���������"
 
 #~ msgid "beginner"
 #~ msgstr "���������"
@@ -4984,28 +7492,19 @@ msgstr "����� �i��� �������� �������� ���"
 #~ msgstr "������ �������� (kickstart) ���� %s (������� %s)"
 
 #~ msgid "Going to install %d MB. You can choose to install more programs"
-#~ msgstr "����� ���������� %d MB. ����� ������� ����� ������� ��� �������i."
-
-#~ msgid "Which language do you want?"
-#~ msgstr "�������� ����"
-
-#~ msgid "Recommended"
-#~ msgstr "�������������"
+#~ msgstr "����� ���������� %d M�. ����� ������� ����� ������� ��� ����븢�i."
 
 #~ msgid "What usage do you want?"
 #~ msgstr "���� ������������ ���i�����?"
 
 #~ msgid "Too many packages chosen: %dMB doesn't fit in %dMB"
-#~ msgstr "������� ������ ������: %dMB �� ����i�� � %dMB"
-
-#~ msgid "Dialup with modem"
-#~ msgstr "����������� ���� �����"
+#~ msgstr "������� ������ ������: %dM� �� ����i�� � %dM�"
 
 #~ msgid "Local LAN"
 #~ msgstr "��������� �����"
 
 #~ msgid "Which packages do you want to install"
-#~ msgstr "����� ������ ��� �������i"
+#~ msgstr "����� ������ ��� ����븢�i"
 
 #~ msgid "Downloading cryptographic packages"
 #~ msgstr "�������� ����������i���� ������"
@@ -5014,7 +7513,7 @@ msgstr "����� �i��� �������� �������� ���"
 #~ msgstr "�i����� (��������� ��� ��������� �������� SCSI)"
 
 #~ msgid "linear"
-#~ msgstr "�i�����"
+#~ msgstr "�i�����"
 
 #~ msgid ""
 #~ "Linux does not yet fully support ultra dma 66 HPT.\n"
@@ -5022,31 +7521,28 @@ msgstr "����� �i��� �������� �������� ���"
 #~ "ide2 and ide3"
 #~ msgstr ""
 #~ "Linux ������ ���� �� ���i� ��������i��� ultra dma 66 HPT.\n"
-#~ "�� �������, ���� �������� �������, ���� ����������� ������ �� ����� ��ide2 i "
-#~ "ide3"
+#~ "�� �������, ���� �������� �������, ���� ����������� ������ �� ����� �� ide2 "
+#~ "i ide3"
 
 #~ msgid ""
 #~ "Enter a floppy to create an HTP enabled boot\n"
 #~ "(all data on floppy will be lost)"
 #~ msgstr ""
-#~ "�������� ������� ��� ���i�� ���������� � HTP\n"
+#~ "������ ������� ��� ���i�� ���������� � HTP\n"
 #~ "(��� �������� �� ����� ������� ��i�����)"
 
 #~ msgid "It is necessary to restart installation booting on the floppy"
-#~ msgstr "��������� ����������i�� �������� i ������i��� � �������"
+#~ msgstr "��������� ����������i�� ����븢�� i ������i��� � �������"
 
 #~ msgid "It is necessary to restart installation with the new parameters"
-#~ msgstr "��������� ����������i�� �������� � �����i ����������i"
+#~ msgstr "��������� ����������i�� ����븢�� � �����i ����������i"
 
 #~ msgid ""
 #~ "Failed to create an HTP boot floppy.\n"
 #~ "You may have to restart installation and give ``%s'' at the prompt"
 #~ msgstr ""
 #~ "�� ���������� �������� ����. ������� � HTP.\n"
-#~ "�������, �������� ����������i�� �������� � ``%s'' � ����������i"
-
-#~ msgid "Local Printer Options"
-#~ msgstr "����i ���������� ��������"
+#~ "�������, �������� ����������i�� ����븢�� � ``%s'' � ���������i"
 
 #~ msgid "Password:"
 #~ msgstr "������:"
diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po
index 12a0f6c69..fa5f5fcf3 100644
--- a/perl-install/share/po/bg.po
+++ b/perl-install/share/po/bg.po
@@ -3,58 +3,118 @@
 # Elena Radeva <ely@triada.bg>, 1999.
 # Pavel Cholakov <pavel@linux.home.bg>, 1999.
 # Boyan Ivanov <boyan17@bulgaria.com>, 1999-2000
-# Valery Dachev <valery@linux.home.bg>, 2000
+# Bozhan Boiadzhiev <bozhan@plov.omega.bg>, 2000
+# Valery Dachev <v.dachev@mail.com>, 2000
 #
 # Bulgarians on Linux use microsoft-cp1251 encoding
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
-"PO-Revision-Date: 1999-11-22 17:01+0100\n"
-"Last-Translator: Valery Dachev <valery@linux.home.bg>\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
+"PO-Revision-Date: 2000-08-15 15:29+0200\n"
+"Last-Translator: Valery Dachev <v.dachev@mail.com>\n"
 "Language-Team: Bulgarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=windows-1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "���"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "�������� �����"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "�������� �������� �����"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "�������� X ������"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X ������"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "��� �������� �� XFree ������ �� ����� ?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"������� �� ���� �� ��� ��������� �� ��������� 3D ���������, �� ���� � Xfree "
+"%s.\n"
+"������� �� �� �������� �� XFree %s, ����� ���� �� ��� ��-����� ��������� �� "
+"2D."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr "������� �� ���� �� ��� ��������� �� ��������� 3D ��������� � XFree %s."
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s � ��������� 3D ���������"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"������� �� ���� �� ��� ��������� �� ��������� 3D ���������, �� ���� � XFree "
+"%s,\n"
+"����������, �� ���� � ��������������� ��������� � ���� �� ����� ��������� "
+"��.\n"
+"������� �� �� �������� �� XFree %s, ����� ���� �� ��� ��-����� ��������� �� "
+"2D."
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"������� �� ���� �� ��� ��������� �� ��������� 3D ��������� � XFree %s.\n"
+"����������, �� ���� � ��������������� ��������� � ���������� �� ���� �� "
+"�����."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s � ��������������O ��������� 3D ���������"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "��������� �� XFree"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "�������� ��������� �� ������� �� ���������� �� �����"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "�������� ����� �� �������"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "�������� �������"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "�������"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -78,39 +138,40 @@ msgstr ""
 "��������� �������� ��.\n"
 " ��� ����� ������� ��������, �������� ������������� ���������."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "������������ ������� �� ��������������"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "���������� ������� �� ��������������"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
-msgstr "��������� �� � ������������"
+msgstr "��������� �� � ��������"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
-msgstr "���������� ����� ��� ��� �� � �������������"
+msgstr "���������� ����� ��� ��� �� � ���������"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "��� �� � ������� ������������ ����������"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
-msgstr "������ �� �� �������� ��������������?"
+msgstr "������ �� �� �������� �����������?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr "��������: ���������� � ������ �� ���� �������� �����"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr ""
+"��������: ���������� �� ���� �������� ����� ���� �� \"�������\" ��������� ��"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
-msgstr "������ ������������"
+msgstr "�������� �� �����������"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -118,414 +179,395 @@ msgstr ""
 "\n"
 "�������� �� �� ��������� ����� ���������"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "����� �� ������:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "����� �� %d �������"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "����� �� �� ����������� ?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
-msgstr "����� �� ������; �������� �� �� ��������� ����� ���������"
-
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "����������� ��������� �� ������������ ����������"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"�� �� ������ �������������� ����������� �� �������� ��, �� ������ � ������� "
-"��������.\n"
-"������� �� �� �� �������...\n"
-"������ �� �� ���������, ��� ������, ������ � ������ �� ����� ��������"
+msgstr "����� �� ������, �������� �� �� ��������� ����� ���������"
 
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "������������ ����������"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "�������� ������������ ���������� � ��������� �� ���������"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "�������� �����: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 ������: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "������ ������"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "������������ ����������"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"���� �� ������ �� ������ ������������ �� �������� �� ������������ "
-"����������� (��������: 800x600).\n"
-"��������, �����, ���� ���� �� ����� ��������.\n"
-"������ �� �� �������?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"�� �� ������� ������� ������\n"
-"�������� � ����� ����� ����� ��� �������"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "��� ����������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "��� �����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "���������� �� �������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "�������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "������������ ������������� �� ��������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "���������� ����������� �� ��������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "�������� �����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "�������� �����: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "��������� �� �����: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "������������ ����������: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 ������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 �������: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
-msgstr "���������� �� ������������� �� X-Window"
+msgstr "���������� �� ����������� �� X-Window"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "��������� ��������"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "��������� ���������� �����"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "��������� ������� �� �������"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "��������� �������������� ����������"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "����������� ������� �� �������������� ����������"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "������ ������������"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "������� ������"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "��������"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "����� ������ �� ���������?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "�� ������� �� ���������?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"�� ������ �� ��������� ?\n"
+"�������� ��������� �:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "���� ������ ������ � %s, �� �� ���������� ���������"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "���� ������� �� ������� � ����������� Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X ��� ���������� �� ���������"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
 msgstr ""
-"���� �� ������� ��������� �� �����������, ���� �� �� �������� X ��� "
-"����������.\n"
-"������ �� X �� �� ��������, ������ ������������ ��������� ?"
+"K�������� �� ���� �����������, �� ����� � X ��� ����������.\n"
+"������ �� X �� �� ��������, ������ ������������ ���������?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Autologin"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"���� �� ������� ��������� �� �� ����������� ������� � ��������� ���� "
+"����������.\n"
+"��� �� �� ������� ���� ����������,��������� ����� ������ �����"
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "�������� ����������� �� ���������� :"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "�������� Windows Manager �� ����������:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 ����� (8 ����)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 ������ ����� (15 ����)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 ������ ����� (16 ����)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 ������� ����� (24 ����)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 �������� ����� (32 ����)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB ��� ������"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standard VGA, 640x480 �� 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 �� 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514-���������, 1024x768 �� 87 Hz interlaced (���� 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "�������������� SVGA, 1024x768 �� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "������������� �������, ����� ������� 1280x1024 �� 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "������������� �������, ����� ������� 1280x1024 �� 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "������������� �������, ����� ������� 1280x1024 �� 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "�������, ����� ������� 1600x1200 �� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "�������, ����� ������� 1600x1200 �� 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "������"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "�� ������������"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "���������"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "��������"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "������"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "���������"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "�����������"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "����� ������ �� ����������� �� ���"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "������� ������ �� ������ (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "LILO/grub ����������"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "SILO ����������"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "���� ������ �� ����������� bootloader-�?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub ����������"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "��� ���"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
-msgstr "����� �������� �� ������� ��������� ������ �� ���������� ?"
+msgstr "����� �������� �� ������� ��������� ������ �� ����������?"
+
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Bootloader ����������"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "���������� ����������"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (�� ������ �� ����� BIOS-�)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "���������"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "���������"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "�������� ����� ������������ �� default ����"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "����� �����"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "�������� ����� ������������ �� default ����"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "������"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "������ (������)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "�������� �������, �������� �� ��������� ���"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "��������"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "����� �� ����������� ��������"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "������� ``�������� ������� �� ��������� ���'' � ���������� ��� ������"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "����, �������� ������"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "�������� �� ��������"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -533,167 +575,355 @@ msgstr ""
 "���� �� ���������� ������.\n"
 "������ �� �������� ��� ��� �� ��������� ��������������."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "������"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "������"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "����� ��� ���������� ������ �� ���������"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
-msgid "Other OS (windows...)"
-msgstr "����� ����������� ������� (Windows...)"
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "����� �� (SunOS...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "����� ��� ���������� ������ �� ���������"
+#: ../../any.pm_.c:175
+msgid "Other OS (windows...)"
+msgstr "����� �� (Windows...)"
 
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "�����"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "������"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "���������"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "������-�����"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "�������"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "������"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "������"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "�� ������������"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "�������� �����"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "������ ������ �� � ��������"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "���� ������ ���� �� ��������"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "�������� �� %s %s ����������"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "����� �� ����(�) ?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "����� �� ������� %s ���������?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "��"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "��"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "����������� �� ������� �� %s ������ %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(����� %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "��� %s ������� �� ������� ?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"� ����� ������, %s ��������� �� ������ �� ������������ ����������, ��\n"
+"�� ������ ��������, ������� �� �������� ������ � ��� ���. ������� �� "
+"����������\n"
+"������������ ����� �� ���� ��� �� ��������� �� �������� �� ������� "
+"������������\n"
+"�� ����� �� ������ ? �� ������� ���� ���� �� ����� ��������� ��, �� ���� �� "
+"�� �������."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "����������� ��������"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "����� �����"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "���� ������ �� �������� ������� �� ��� ������ %s."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"���� ������ �� �������� ������� �� �� ������ %s.\n"
+"������� �� ��� ������ ``���=�������� ���2=��������2 ...''.\n"
+"��������: ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "����� �� ������:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"����������� �� ������ %s �� ����.\n"
+"������ �� �� ������� ������ � ����� ��������� ?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Welcome to %s 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"
+
+# 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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Welcome to GRUB the operating system chooser!"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "����������� ��������� %c � %c, �� �� �������� ����������."
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "��������� Enter, �� �� ���������� ��������� ��, 'e' �� �������� ��"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "��������� ����� ����������, ��� 'c' �� �������� ���."
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "���������� ������ �� ����� ���������� ����������� ���� %d �������."
+
+#: ../../bootloader.pm_.c:604
+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:696
+msgid "Desktop"
+msgstr "�������"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "�������� ����"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d ������"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 ������"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d �������"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "����������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "����������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "������� ����������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "���"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "����� �� ���������"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "������ /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "������� � ��������� �����"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "������� � �������� �����"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "���������� �� ����"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "������ ��� ����"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "���������"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "���������� �� �������"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "������ �� �������"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "������� ������"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "���������� ������"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "����������� �������������"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "������ �������� ������ �� ���������"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "�� ���� �� ������ ������ ������"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -701,59 +931,63 @@ msgstr ""
 "��� ������ ��� ������, ���� �������� ����, �� �� ������ �� ��������� ���� "
 "�������� ���"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "��������� �� ��������� � ������"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "�������������� �� ���������"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "��������� �� ��������� �� ��������"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "������������"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "������"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "�����"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "������"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "�����"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "������ ������� �������:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "�����������"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -765,17 +999,17 @@ msgstr ""
 "��������� ����� �� ��������� ���������� �� ���� ���\n"
 "(�������� ����� ����, � ���� ���� �������� ����� \"������� ����������\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "����� �������� backup �� ������ �����"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "��������� ���������� !"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -785,77 +1019,77 @@ msgstr ""
 "�������\n"
 "�� ����������) � �������� �� �����"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "��������: ���� �������� � ������"
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "����� �� ���������: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "����������: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "����� �� ������������ ��� DOS: %s (������ �������������)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "���: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "������: ������ %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "������: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s �������"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "�� �������� %d �� �������� %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "����������\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "������������\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "��������\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Loopback ����(���): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -863,79 +1097,79 @@ msgstr ""
 "���, ����� �� �������� �� ������������\n"
 "    (�� MS-DOS boot, �� �� lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "���� %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "������ �� ������� %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-������� %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "��� �� loopback �����: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "�������� ��� ���� �������� ����� ����"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "������: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "���������: %s ��������, %s �����, %s �������\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "��� �� ��������� � ������: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "�� ���� %d ����� %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "��������"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "���������"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "������� ��� RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "�������� �� RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "����������� RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "��������� �� loopback"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "�������� ��������"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -947,7 +1181,7 @@ msgstr ""
 "��� ���������� LILO � �� �� ������, ��� �� ���������� LILO � ������ ����� �� "
 "/boot"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -959,67 +1193,68 @@ msgstr ""
 "��� ������� �� ���������� boot ��������� LILO, ������ ���������� ���\n"
 "����������� �� /boot ���"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "��������� ��� ��������� RAID ��� ���� root (/).\n"
-"���� ��������� ��������, ����� ���� �� �� ������ ��� /boot ���.\n"
-"���� �� �������� /boot ���, ��� ������ �� ���������� LILO ��� GRUB"
+"���� ��������� ��������, ����� �� ���� �� �� ������ � ���� ��� /boot ���.\n"
+"���� �� �������� /boot ���"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "������ ���� ����������� ``%s''"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "����� ����������� '�����������'"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
 "���� ������� �� ���� �� ���� %s, ������ ����� ����� ���� �� ����� ��������"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "����������� ������� ������ ?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "����� ��� �����"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "�����, ��� �� ����� �� ��������� �� �������� ?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "������� ���� �� ����"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "����� ��� ��� ������� ?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "�� ����� ��� �� ������ ?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr "�� ������ �� ����������� ReiserFS �� ��� ��-����� �� 32MB"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "���� ������ �� ��������� loopback-����� %s ?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "���� ������ �� ��������� ���������� %s ?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1028,139 +1263,144 @@ msgstr ""
 "loopback.\n"
 "����� ������� loopback"
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "���� ����������� �� ���� %s, ������ ����� ����� ���� �� ����� ��������"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "�����������"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "����������� �� loopback ����� %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "����������� �� ���� %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "���� ����������� �� ������ ������,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "������ ����� ����� ��� �� ����� ��������"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "��������"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "�� ��� ���� ������ �� �� ���������� ?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "�� ��� ������ ������ �� �� ����������?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "�������"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "������ ���� ... "
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "��������� �� �������� �� ���������� %s �� ���� �������� ����� ����� !"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "������ �� ������������, ����� ��������� �� ������ � ����"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "���������� ��������� �� fat ��������� �������"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "������� �� ����������"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "��� ��� ������� �� ���������?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "������ ����� �� ���� ��� ������ �� ����� ����������"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "���� ������� ���������� �� ���� %s, �����te ����� ���� �� ����� ��������"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "�������� ���� ��������"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "������ ��� ���"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "������� ������: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "�������� � MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "��� ������� �������: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "�������������: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "���� ��� �� ���� �� ���� ��������� �� loopback"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "��� �� loopback �����: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "������ ���� �� �������� �� ���� loopback, �������� ���� ����."
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "������ ���� ����������. �� �� ��������� �� ?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "�������� ����"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1168,11 +1408,11 @@ msgstr ""
 "���������� ������� �� �������� �� � ��� ������ ��������\n"
 "�� �������� �� ��� ��� ?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "��������������"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1180,79 +1420,79 @@ msgstr ""
 "������� ������� ��� �������\n"
 "������ �����, �������� �� ����� ���������, �� ����� ��������"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "������� �� �� ����� ��������� �� ��������"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "����������"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "����"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "�������� �� �������"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "�������� ����������� RAID �� ���������"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "���"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s ����������� �� %s ���������"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "�� ���� ��� �� ���������� %s � ��� %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "nfs ����������� �� ����"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "����������� �� ����: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "������ ��� ������������� �� %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "������� �� ��������� ������ �� �������� � /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "���� ��� ��� � ���� ����� �� ��������� %s\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "\"��������� ����\" �� ����������: %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr "���� ���������� ������ �� ������ � ������� �� root ��������� �������."
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "�������� �� �� �������� ������� ������� (ext2, reiserfs) �� ���� ����� �� "
 "���������\n"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "������ ��� �������� �� %s �� �����: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1261,76 +1501,81 @@ msgstr ""
 "��������� ���� ������� �������. ���� ��������� ���� ����� �� �� ��������� �� "
 "���� �������"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "������ ������� ������!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "�������� ����������� ���� �� ���������� � �������� ��������"
 
-#: ../../help.pm_.c:10
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "�������� ������ �� ������������ �� �� ������� ��-����"
-
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "�������� ������ �� ������������ �� �� ������� ��-����"
+
+#: ../../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
+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"
-"  - 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"
-msgstr ""
-"�������� \"����������\", ��� ���� ����������� �������� ������ �� Linux\n"
-"��� ��� ������ �� �������� �������� �����������/������.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"�������� \"����������\", ��� ������ �� �������� �������� ������ ��\n"
-"Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000 or 7.0 (Air).\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"
-"��������:\n"
+"\t* Recommanded: 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"
-"    ������� ���� �� ���� ������������� �� ����� �� ������������, ����������� "
-"\"LinuxConf\",\n"
-"    �� �� � ������������� ���� ����������� �� ������������.\n"
 "\n"
-"  - ��������������: ��� ��� ���������� �������� � GNU/Linux, �� ������ �� "
-"��������\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 sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - �������: ���� ����������, �� ��� �� \"��\" � GNU/Linux � ������ ��\n"
-"    ��������� ������ �������������� ����������. ����� � � "
-"\"���������������\"\n"
-"    ������������� ����, �� ������ �� �������� ���������� �� ��������� ��.\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1338,49 +1583,50 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "��������:\n"
 "\n"
-"  - ��������������: ��� ������ ����� �� ��� ����������� ������..\n"
+"  - ��������������: ��� ��� ���������� �������� � GNU/Linux, �� ������ �� "
+"��������\n"
+"    �������� �������������� �� �������� ��. ����� ��-���� �� �����������.\n"
 "\n"
 "\n"
-"  - ��������������: ��� ��� �������� � ������, �� ������ �� �������� \n"
-"������������� ������� ����� ��������, �� ���������� ��� �� ������. ��������\n"
-"\"��������\" �� ���� �������� �� ����� ��������. ������ �� ��������\n"
-"\"�����������\" ��� �� ���������� ��������� �� ������������ ��� \"������\"\n"
-"��� ������ �� ��������� ������ �� ���������� ����, �����, ...\n"
+"  - ���������: ���� ����������, �� ��� �� \"��\" � GNU/Linux � ������ ��\n"
+"    ��������� ������ �������������� ����������. ����� � � "
+"\"���������������\"\n"
+"    ������������� ����, �� ������ �� �������� ���������� �� ��������� ��.\n"
+"    �� ����, ����, �� ��������� ����, ����� ��� �� ������ ����� �������!"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "���������� ����������� �� ���������� �� �������� �� (���������, ��� ���� ��� "
 "�������\n"
@@ -1405,151 +1651,367 @@ msgstr ""
 "����� �    �.�.. ���� �����, �� ��������� ����������� ��������� (KDE, "
 "GNOME...).\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
+#, fuzzy
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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"
-"��� ������ � ����,��� ������� �� ���������,�� �� �������\n"
-"����������� ��� ���� ������.\n"
+"DrakX �� �� ����� �� ������� PCI SCSI �������(�).\n"
+"��� DrakX ������ SCSI ������� � ���� ��� ������� �� ��������, �� ��\n"
+"(��) ��������� �����������.\n"
+"\n"
+"��� ������ SCSI �������, ISA SCSI ������, ��� PCI SCSI �������, �����\n"
+"DrakX �� ����������, �� ������ �������� ���� SCSI ��������� ��������� �\n"
+"��������� ��. ��� ���� �������, ������ ������� ����� '��'. ��� �������\n"
+"����� '��', �� �� ���� ����������� ������ �� ��������, �� ����� ������\n"
+"�� �������� ����� ��������� �������.\n"
+"\n"
+"\n"
+"��� ������ ����� �� ���������� �������� ��, DrakX �� ������ ����,\n"
+"������ �� ���������� ����� �� ����. ������ �� ��������� �� DrakX ��\n"
+"������ �������� �� �������. ���������� ���� ������ �����.\n"
+"\n"
+"��� ��, �� �� ������ �� ���������� ������� �� ��������.\n"
+"����������� ��������������� ����������� �� ������ ��� ������������� ��\n"
+"���� ���������� �� 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"
+"\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"
-"��� ������ SCSI ������� � �� ISA board , ��� �� PCI board,�� DrakX\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"
 "\n"
-"���� ���� ���������, DrakX �� �� ������ ������ �� �� ������������ �������\n"
-"�� ��������. ����� ��������� �������� �� ������ ��������: ���������� ������\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"
-"��������,��� �� Windows."
+"\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."
+msgstr ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:160
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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"
 "\n"
+"   * Auto allocate:: this option allows you to automatically create Ext2 and "
+"swap partitions in free space of your\n"
+"     hard drive.\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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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-d  to delete a partition\n"
+"           * Ctrl-m to set the mount point"
+msgstr ""
+
+#: ../../help.pm_.c:218
+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"
-"- Ctrl-m  to set the mount point\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 ""
-"���� ������ �� �������� �� ���/��� ������ �� ����������� ������\n"
-"Linux-Mandrake �������, ��� �� �� ���� ��������� (�� �������� Linux\n"
-"���������� ��� ������� ���� ����������). ���� �������� ��������� ���������\n"
-"�� �������������� �� ���� ����� � ������� ������� (������).\n"
+
+#: ../../help.pm_.c:252
+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:257
+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 ""
+
+#: ../../help.pm_.c:267
+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. ���� �� �������� ����� �� ��������� ����\n"
-"��������� ����� \"hda\" �� ������ IDE ����, \"hdb\" �� ������ ���\n"
-"\"sda\" �� ������ SCSI � �.�.\n"
+"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive "
+"number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
 "\n"
-"����� ���� ������, ����� �� �� ������� ��: root ��� (/), ����� � ���������\n"
-"����� �� �������������� ��������� � /boot, ����� ������� ������������ ��\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"
-"��� ���� �������� �� ���� ������ �� ������� ����������, ���� ���� �� �\n"
-"�������� �� �������� ����������. DiskDrake ��������� �������. �����������\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"
-"������ �� ���������� ����� ����� � ������������: ������� ������������\n"
-"����������� Tab � �������� Up/Down. ������ ��������� ���, ������ �� "
-"����������:\n"
+"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-c  �� �� ��������� ��� ��� (������ � ������ ������)\n"
+"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"- Ctrl-d  �� �� �������� ���\n"
+"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"- Ctrl-m  �� �� ���������� ����� �� ���������\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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
+
+#: ../../help.pm_.c:303
 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."
+"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 ""
-"������ ������ ������ �� ����� ����������� �� �� �� �����������\n"
-"(����������� �������� ��������� �� ������� �������). � ���� ������\n"
-"���� �� ����������� ������ ����� ������, �� �� �������� ��������� �� ���.\n"
-"�� ���� �������������� ������ ����� ���� �� � ������������. ���������� ��\n"
-"�� ���������� /home � /usr/local."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
+#, 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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"
@@ -1563,157 +2025,185 @@ msgstr ""
 "�����\";\n"
 "� ���� ������, �� ������ �� �������� ������ �� 1000 ������ ..."
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:358
+#, 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 ""
 "��� ����� ������ CD-�� �� ������� ��-����, ��������� Ok.\n"
 "��� ������ ���� ���� �� ���� CD-��, ��������� �����.\n"
 "��� �� ������� ����� CD-��, ������� ��, � ��������� Ok. "
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:363
 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."
+"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 ""
-"��������, ����� ��� ���������, �� ����� ����������� ����. ���� ��������\n"
-"�� ������ ������� ������, ����� ��� �� ��� ������� �� �������� ���������.\n"
-"������ ������������ ���� �� ������ ������ �����."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:371
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"��� DrakX �� ����� �� ������ ������� ��, ��� ������ ��\n"
-"��������� ����� � ������, ��-���� �� �� ���� ����������� ������ ��������� �� "
-"�����.\n"
-"\n"
-"\n"
-"��� ��� �������� � ��������� �� DrakX, ������ ������� �� ��������, �����\n"
-"������, ���� ������� ����� ��� � ������ � ����. � �������� ������,\n"
-"�������� ���� ��� ����� �� ������, ������� ������� �� ���-������ ��\n"
-"������.\n"
-"\n"
-"\n"
-"� ������ �� ������� �� � �������, �� ������ ���� ���� �� ��������\n"
-"��� ���� � ��������."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
-"����, �������� ������ ����. ��������, ������ COM1 (��� Windows) �� ������\n"
-"ttyS0 (��� ������)."
+"����, �������� ������ ����. ��������, ������ COM1 ��� Windows �� ������\n"
+"ttyS0 ��� GNU/Linux."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
+"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"
-"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"
-"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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"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"
-"(LAN) ��� �����.\n"
-"\n"
-"�������� \"������� �����\" � DrakX ��\n"
-"����� �� ������ Ethernet �������� �� �������� ��. PCI a���������\n"
-"�� ����� ������� � ��������� �����������.\n"
-"�����, ��� ����������� �� � ISA, ���� ���� �� ����� � �� ������\n"
-"�� �������� ������� �� �������, ����� �� �� ����� ���� ����.\n"
-"\n"
-"\n"
-"�� SCSI ����������, �� ����� ����� ��������� �� �� ��������\n"
-"��, ��� ���� �� �����, �������� ���� �������, ����� ��� �����\n"
-"�� �������������� ������������ �� � ����\n"
-"�������.\n"
-"\n"
-"\n"
-"��� ����������� Linux-Mandrake ������� �� ������, ����� � ����\n"
-"�� ���� ������������ �����, ��������������� �� ������� �� ��������\n"
-"�� �� � ��� ������������ ���������� (IP ����� � ������� Submask ���\n"
-"Netmask �� ��-������, � ��� �� ��������). ��� ������� ������ �����\n"
-"����� ��������, �� �� �� ������ �� ��������\n"
-"������.\n"
-"\n"
-"\n"
-"�������� \"�������� � �����\", �� �� ���� ������������� ��������\n"
-"�� �� ��������. DrakX �� ����� �� ������ ������ ��, ��, ��� ��\n"
-"�����, �� ������ ��� �� �������� �������� ����, ��� ����� �\n"
-"������� ����� �����."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"���� ������ �� �������� ������� �� ��������. ��� �� ��� �������,\n"
+"�������� ���������� ������ �� �������� �� �������� ���������� ��."
+
+#: ../../help.pm_.c:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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"
 "\n"
 "  - ������� �����: \"255.255.255.0\" ����������� � ����� �����. ��� �� ���\n"
-"�������, ��������� �������� �� ������������� ��� �������� ���������� ��.\n"
+"�������, ��������� �������� �� ������������� ��� �������� ���������� ��.\n"
 "\n"
 "\n"
-"  - ����������� IP: ��� ������� �� �������� bootp ��� dhcp ��������,\n"
+"  - ����������� IP: ��� ������� �� �������� BOOTP ��� DHCP ��������,\n"
 "���������� ���� �����. ��� � ��������, �� �� �������� �� \"IP �����\". ���\n"
 "�� ��� �������, ��������� �������� �� ������������� ��� �������� ���������� "
 "��.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"��� ������� �� �������� NIS, �������� \"��������� NIS\". ��� �� ������,\n"
+"��������� �������� �������������."
+
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1721,7 +2211,7 @@ msgstr ""
 "���� ������ �� �������� ������� �� ��������. ��� �� ��� �������,\n"
 "�������� ���������� ������ �� �������� �� �������� ���������� ��."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1729,13 +2219,15 @@ msgstr ""
 "��� �� ���������� proxy �������, ����, ��������� �� ����. ��� ��������,\n"
 "��������� �������� ������������� ��� �������� ���������� ��."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1747,29 +2239,43 @@ msgstr ""
 "����������, �� ������ �� �������� ��������� ���� � ������������� ������\n"
 "��������� ������ ���������������."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
-"���� ������ �� �������� ��������� ����, � ����� �� ��������.\n"
+"���� ������ �� �������� ��������� ���� � ���������� �� ����, ���� �� "
+"��������.\n"
 "\n"
 "\n"
-"Linux ������ � ����� �� ������� � �� �������� � ������� �� ������, �����\n"
-"��� �������."
+"GNU/Linux ������ � ����� �� �� ��� \"����� �� �������\" � �� �������� �\n"
+"������� ����� � ���������� �� ������, ����� ��� �������."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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"
 "������ ������� �� ������ ��� ���, �� ������ ������ ������������� �����, "
@@ -1780,81 +2286,159 @@ msgstr ""
 "�������� �� ���� ������: ���� �� ������ �� �� �� ��������� ������, ����� ��\n"
 "������."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
+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:490
+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:505
+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 ""
+
+#: ../../help.pm_.c:521
 msgid ""
-"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"
+"Please turn on your printer before continuing to let DrakX detect it.\n"
 "\n"
+"You have to enter some informations here.\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"
 "\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"
-"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"
 "\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"
-"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."
+"\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"
-"������ ������� �������� ���������. ���������� �����, �� �� ������������\n"
-"���������� �� �������� �������� ���� ��� �� �������� 'lp', ���� ��\n"
-"������ �� ����� ������� � ���� ���; �� ��� ������ �� �������� �������\n"
-"����� �� �������� �� �������� ��� ������� '|'.\n"
-"���� ��, ��� ������������ ��-�������� ���, ������ �� ������ ��\n"
-"�� ������� �����, ����.: \"My Printer|lp\".\n"
-"���������, ����� ���\"lp\" � ���(��/���) �� �� ���� �������� �� "
-"������������.\n"
+
+#: ../../help.pm_.c:542
+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"
-"\"������� �������\". ������ �� ������ �� ������� ����� � ����������\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"
-"��� ������ �� ���������� ������� �� ����� Unix ������, �� ������\n"
-"�� �������� \"���������� lpd\". �� �� �� �������� �� ������, ����\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"
-"��� ������ ������ �� SMB ������� (����� ����� ������� ������� ���\n"
-"���������� Windows 9x/NT ������), �� ������ �� ������ ��������\n"
-"SMB ��� (�� TCP/IP �����), � ���������� IP ������ ���� �������������\n"
-"������, ������� ����� � ������ ���������� �� ������� �� ����, ����� �,\n"
-", ������� ��, ����� �� ��������. ������ ���� � �� NetWare �������,\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:286
+#: ../../help.pm_.c:567
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"Your printer has not been detected. Please enter the name of the device on\n"
+"which it is connected.\n"
 "\n"
 "\n"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"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:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
+"\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"
 "�� ������ �� �� ������ 2 ���� �� ��������.\n"
@@ -1864,7 +2448,7 @@ msgstr ""
 "����� ��� ����� ����� ������ ������� � ����������.������ ���������\n"
 "�������� �� ���������� ������ �� ����������."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1872,7 +2456,7 @@ msgstr ""
 "�� ��-������� �������, ������ �� �������� \"��������� shadow ����\"\n"
 "� \"��������� MD5 ������\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1880,7 +2464,7 @@ msgstr ""
 "��� ������� �� �������� NIS, �������� \"��������� NIS\". ��� �� ������,\n"
 "��������� �������� �������������."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1908,7 +2492,7 @@ msgstr ""
 "������ \"root\". ������ �� ��������� �� ���� ��� ������ �� �����, �����\n"
 "����� ������ �� ������ ��������� ��. ���������� �� ����� ������ �� ���\n"
 "������ ������������� (�������� �����, ��������� ��������� � �.�.)\n"
-"� �� ����������� ������ \"Home\" ����������, ������ �� ������� ����\n"
+"� �� ������� ������ \"Home\" ����������, ������ �� ������� ����\n"
 "���� �������������.\n"
 "\n"
 "\n"
@@ -1919,34 +2503,30 @@ msgstr ""
 "������ �������� � �������������� �� ������ � ��������� �, ���� ��� �� ��\n"
 "������, ����������� ����������������� ������."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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"
-"Microsoft Windows �� �����, ��� �� ��������� boot-�������.\n"
-"����� ��� �� ��� ������� ���������� ������� ����� � �����������, ����\n"
-"�� ������ �� ���������� ��������� � ������."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
-"�� ��������� ������������,���������� �� ������������ �� Linux.\n"
+"������ �� �������� ���� ������� ��\n"
+"��������� ������������, ���������� �� ������������ �� GNU/Linux.\n"
 "\n"
 "\n"
-"��� �� ������ ����� �������,�������� \"������ ������ �� ������ (MBR)"
+"��� �� ��� ������� � ����, ����� �������, �������� \"������ ������ ��\n"
+"������������ (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1954,10 +2534,10 @@ msgstr ""
 "����� ��� �� ��� ������� � ���������, ����������� ����� � \"/dev/hda\"\n"
 "(����� ������ IDE ����) ��� \"/dev/sda\" (����� SCSI ����)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1968,9 +2548,10 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 "LILO (��� LInux LOader) � Grub �� bootloader-�: �� ���� �� ���������\n"
-"Linux ��� ��� �� � ����� ����������� �������, ����� ����� �� ��������� ��.\n"
+"GNU/Linux ��� ��� �� � ����� ����������� ������� ������������ �� ��������� "
+"��.\n"
 "�����������, ���� ����� ����������� ������� �� ������� � ����������\n"
-"��������. ��� ��� �� ����� ��� ���, ������ �� �������� ������ �� ���� �\n"
+"��������. ��� ���� �� ����� ��� ���, ������ �� �������� ������ �� ���� �\n"
 "���� �����. �������� �� �������� ����� ���������.\n"
 "\n"
 "\n"
@@ -1978,7 +2559,8 @@ msgstr ""
 "� ����� ������ ������ �� �������� ����������� ������. �� � ����� ������,\n"
 "�� �� �������� �� boot-�������, �� �� �� ���������� !"
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1995,7 +2577,9 @@ msgid ""
 "\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."
 msgstr ""
 "�������� ����� �� LILO � GRUB ��:\n"
@@ -2016,10 +2600,61 @@ msgstr ""
 "    * normal: ������ ��������� 80x25 ������� �����.\n"
 "    * <number>: �������� ���������� ������� �����."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 � bootloader �� SPARC: �o� ���� �� ��������\n"
+"GNU/Linux ��� ��� �� � ����� ����������� �������, ������������ �� ��������� "
+"��.\n"
+"�����������, ���� ����� ����������� ������� �� ������� � ����������\n"
+"��������. ��� ���� �� ����� ��� ���, ������ �� �������� ������ �� ���� �\n"
+"���� �����. �������� �� �������� ����� ���������.\n"
+"\n"
+"\n"
+"���� �� �� ������ �� ������ ������ �� ���� ����������� ������� �� �����,\n"
+"� ����� ������ ������ �� �������� ����������� ������. �� � ����� ������,\n"
+"�� �� �������� �� boot-�������, �� �� �� ���������� !"
+
+#: ../../help.pm_.c:692
+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"
+"  - bootloader ����������: �������, ������ ������ �� ��������� ������������\n"
+"���������� �� ������������ �� GNU/Linux. ����� ��� �� ������ ����� �����\n"
+"�������, �������� \"����� ������ �� ������������ (MBR)\".\n"
+"\n"
+"\n"
+"  - ��������� ����� ���������� �� ������������� �� �����: �������� ��������\n"
+"�� ���������, ����� ��������� �������� �� ������ ����� ��������� �� ������\n"
+"�����. ������� � �� �������, ����� ��������� �� ����� ������� ���� ����\n"
+"�� ������ ������������. ����������� �������� �� ����, ��� \"delay\" �\n"
+"��������� ��� � ����."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2030,25 +2665,27 @@ msgid ""
 "settings suit you. If they don't, you can come back and\n"
 "change them, as many times as necessary."
 msgstr ""
-"���� � ����� �� ������������� X Window,����� � ������ �� \n"
-"��������� ��������� �� ������.�� ���� ��� ������ �� �������������\n"
-"������ ���������� � �������.��-������ ���� �� �������� � �����������.\n"
-"���� �� ��� �� ������ ���� �� ��������� ����������� � �� �� ��������\n"
+"���� � ����� �� ��������� X Window System, ����� � ������ �� \n"
+"GNU/Linux GUI (�������� ������������ ���������). �� ���� ��� ������ ��\n"
+"��������� ������������ � �������� ��. ��-�������� ���� �� �������� ��\n"
+"��������������, ���� �� �������� �� ���� �� �� �� ������ ���� �� ��������\n"
+"����� � ��������� � ���������� �� ����������� :)\n"
 "\n"
 "\n"
-"������ ��������������� �������, X �� ���� ���������,�� �� ���������\n"
-"���� ����������� �� ���������.��� �� �� ��������� ������ �� ��\n"
-"������� � �� �� ���������,������� ���� � ����������."
+"������ ����������� �������, X �� ���� ��������� (����� ��� �� ������� ��\n"
+"DrakX �� �� �� �����), �� �� ��������� ���� ����������� �� ���������. ���\n"
+"�� �� ���������, ������ �� �� ������� � �� �� ���������, ������� ���� ��\n"
+"� ����������."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
 msgstr ""
 "��� ���� �� � ����� � ����������� �� X, ����������� ���� ����� ��\n"
-"�������� ������������� �� X Window ���������."
+"�������� ��������� �� X Window ���������."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2056,42 +2693,47 @@ msgstr ""
 "��� ������������ �� ���������� �������� �������, �������� \"��\". �\n"
 "�������� ������, �������� \"��\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\n"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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"
+"\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"
+"\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."
 msgstr ""
 "���� ������ �� �������� ������������ ����� �� ��������� ��.\n"
 "\n"
@@ -2120,7 +2762,8 @@ msgstr ""
 "  - ����� �������� ����� �� RAM, ��� � �����: �� ���������, � ������� "
 "PC-����,  ����\n"
 "    ���������� ����� �� �� ������ BIOS �� ����� �� RAM � ���������. ����\n"
-"    �����������, Linux ���� �� �� ����� �� ������ �������� ����� �� RAM.\n"
+"    �����������, GNU/Linux ���� �� �� ����� �� ������ �������� ����� �� "
+"RAM.\n"
 "    ��� ���� � ������, ��� ������ �� �������� ������ ���� �� RAM. "
 "����������,\n"
 "    �� ������� �� 2 ��� 4 MB � ��������.\n"
@@ -2134,7 +2777,7 @@ msgstr ""
 "    ����������, �������� ���� ����� (�������: NumLock ���� � �� �� ������ "
 "��� X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2148,96 +2791,119 @@ msgstr ""
 "�����������. ��� ������ �� ������� ����� ������������ ����������� �������,\n"
 "��������� �������������� ����������."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "����� �� ����"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "����� �� ���� ����������"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "�������� �� ���������"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
-msgstr "������������� �� �����"
+msgstr "��������� �� �����"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "����� �� ����������"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "������������"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "��������� �������"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "����������� �� ������"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "������ �� �����������"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "����������� �� ���������"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
-msgstr "������������� �� �������"
-
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "������������"
+msgstr "�������� �� �������"
 
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "��������� ����"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
-msgstr "������������� ��������"
+msgstr "��������� �� ��������"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
-msgstr "������������� �� ��������"
+msgstr "��������� �� ��������"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "�������� ������ �� root"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "�������� �� ����������"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "��������� �� boot-�������"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "����������� �� bootloader"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
-msgstr "������������� �� �"
+msgstr "��������� �� �"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "����������� ����������� �� �����"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "����� �� ��������������� ��������"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "������ ��� ������ �� ����� $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "����, ��������� ������� ��."
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "����, ��������� ������� ��."
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+"���� �� �������� �� ��������� �� �� ������ �� ``����������� ��'' ��������, "
+"�� �� ������.\n"
+"������ �� �������� ������ ���������� �� ���� ��: %s"
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2247,234 +2913,254 @@ msgstr ""
 "������ �������� ��� (��� ������� �� �����������).\n"
 "������ �������� �������� ``����� �� ���������'' � �� ������� `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"�� ���� �� ������� ��������� �� ��������, ��������� � ��������� :(\n"
-"�� �� ������ �� �������� �� ���������� ������ ������"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "������ �� ����� swap-���"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake �� ���� �� ������� �������� ��������� �� ��������.\n"
-"������ �� ���������� �� �������� ���� !"
+"������ swap-���\n"
+"\n"
+"�� �������� �� ��� ��� ?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "����� root-���"
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "��������� ���������� �����"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "����������"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "���� ���������� ����� �� ��������� �� ��� ���"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: ���� �� � root-���, ���� �������� ����� ����."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "��������� �� ����������� ���"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "���� ������� root-���"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "���� ���, ����� ���� �� ���������"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "�� ���� �� ��������� ��������� ��� NIS domain"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "��������� �� Windows ����� �� loopback"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "������ ��� ������ �� ����� $f"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "��� ��� ������ �� ���������� �� Linux4Win ?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"����� �� ������, �� �� ���� ��� �� �� ������ � ��� ���������.\n"
-"������ �� ���������� �� ���� ����."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "�������� ����������"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "�������� ������� �� ��������� %s"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "�������� �� root-���� � MB: "
 
-#: ../../install_steps.pm_.c:323
-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 ""
-"����� ����� ������ �� �� ����������� ����� ������.\n"
-"��� CDROM ������������ �� ��� ������� ����� �� � ��������.\n"
-"��������� ������� ����� �� ������������ �������� ����������� \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "�������� �� swap-���� � MB: "
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "����� ����� � %s"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "��������� ���������� ����� �� Windows ����"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "���� ����� ����������"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "��� ��� ������� �� ���������?"
+
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "���������� ��������� �� Windows ��������� �������"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "�������� � ���� `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"�� ���������� �� ������ � ����� FAT ���, \n"
+"������ ���������� ������: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "������ �� ����� swap-���"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
+"������ Windows ��� � ����� ������������, ���� ����� ����������� ''defrag''"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"������ swap-���\n"
+"��������!\n"
 "\n"
-"�� �������� �� ��� ��� ?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "�������� ����������, ����� ������ �� �����������"
+"DrakX ������ �� ���������� ����� Windows ���. ������ ����������: ���� "
+"�������� �\n"
+"������. ��� ��� �� ��� �� ���������, ������ ����� �� ������� scandisk (�\n"
+"���������� �� ���������� defrag) ��� Windows ����� ���� ���, ������ \n"
+"��������� �������������. �� ���� ����� �� ��������� ����� �� ������� ��.\n"
+"������ ��� �������, ��������� ��."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "���� ��������: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "����� ������ �� �������� �� windows?"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "������: %s\n"
+msgid "partition %s"
+msgstr "��� %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "��������: %d KB\n"
+msgid "FAT resizing failed: %s"
+msgstr "��������� ������������ �� FAT: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "�������� ��������, ����� ������ �� �����������"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+"���� FAT ����� �� ��������������� ��� �� loopback( ��� ���� ���������� ����� "
+"�� �����"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "����������"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "������ ����� ����"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "������������"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "�������� Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "����������"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr "����� ������ �� ���� ������ �������, ��� �� ��������� �� ������������?"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "����, ���������, "
+#: ../../install_interactive.pm_.c:156
+#, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr ""
+"������ ������������ ������ � ������e ����� ��� �� ����� �������� �� "
+"���������� %s"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "�������� ����� "
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "��������� �����"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "���� ��������������� "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "��������� diskdrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "��������� ������������"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "��������� fdisk"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "����������� �� ������ %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"���� ������ �� ��������� %s.\n"
+"������ ��� ������, �� ���������� �� �������� ����������� `w'"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "�� �������� �� ��� ��� ?"
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "��������� ���������� ����� �� Windows ����"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "����� �� ������ ��� ����������� �� ��������:"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "�� ���� �� ������ ������ ������"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "�� ��������� �� ��������� ������������ �� X11 ?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "���������� �� ��������� �� ������ �� DrakX ������ �������� �������:"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "����, �������� ���� �� �������� ������� �� ����������:"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "��������� ��������� ��: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "������ ������� windows ������!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "�������� �������"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "������ ���������� ����� �� Lnx4win"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "���������� �� �������"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"��������!\n"
-"\n"
-"DrakX ������ �� ���������� ����� Windows ���. ������ ����������: ���� "
-"�������� �\n"
-"������. ��� ��� �� ��� �� ���������, ������ ����� �� ������� scandisk (�\n"
-"���������� �� ���������� defrag) ����� ���� ��� � �� ��������� backup �� "
-"������� ��.\n"
-"������ ��� �������, ��������� ��."
+"����� �� ������, �� �� ���� ��� �� �� ������ � ��� ���������.\n"
+"������ �� ���������� �� ���� ����."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "������������� ������������� �� ����."
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "�������� ������� �� ��������� %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "��� ��� ������ �� ���������� �� Linux4Win ?"
+#: ../../install_steps.pm_.c:375
+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 ""
+"����� ����� ������ �� �� ����������� ����� ������.\n"
+"��� CDROM ������������ �� ��� ������� ����� �� � ��������.\n"
+"��������� ������� ����� �� ������������ �������� ����������� \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "�������� ����������"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "����� ����� � %s"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "�������� �� root-���� � MB: "
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "���� ����� ����������"
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "�������� �� swap-���� � MB: "
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "�������� � ���� `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"������ ������� � � ����� �������. ���� �� ����� �������� � �������������\n"
+"�� Linux-Mandrake. ��� �� ����� ������� �������� � ���������� ���������. "
+"�������,\n"
+"��������� 'F1', ������ ���������� �� CDROM � �������� '����'."
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "����, �������� ���� �� �������� ������� �� ����������:"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2488,7 +3174,7 @@ msgstr ""
 "��� ����� ������� �� �� ���������� ���� ���-������� ������;\n"
 "��� 100%% �� ���������� ������ ��������� ������."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2504,58 +3190,100 @@ msgstr ""
 "��� ����� ������� �� �� ���������� ���� ���-������� ������;\n"
 "��� %d%% �� ���������� ������ ������� ������."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "�� ����� ������������ �� �������� ��-����� ��� ��������� ����."
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "������� ������ �� �����������"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "�������� ��������, ����� ������ �� �����������"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "����������"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "������������"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "���������� �������������"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "������� �������"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "������� �������"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "������������ ����� �������� � ��������� �� �����"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "��� �����"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "���: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "������: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "��������: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "�������: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "���� ��������: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+"�� ������ �� �������� ������ ����������, ������ ������ ����� �� �� "
+"�����������"
+
+#: ../../install_steps_gtk.pm_.c:386
+msgid "The following packages are going to be installed"
+msgstr "�������� ������ �� ����� �����������"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "�������� ������ �� ����� ����������"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "�� ������ �� ����������/������������ ���� �����"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "���� � ����� �����, �� ���� �� ���� ����������"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "�� ������ �� �������� ���� ����� ����������. ��� ���� � ����������"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2563,46 +3291,88 @@ msgstr ""
 "���� ����� ������ �� ���� �������\n"
 "������� �� ���, �� ������ �� �� ��������� ?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "�� ������ �� ��������� ���� �����. ��� ������ �� ���� �������"
 
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-"�� ������ �� �������� ������ ����������, ������ ������ ����� �� �� "
-"�����������"
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "�������� ������ �� ����� ��������/���������"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "�� ������ �� ����������/������������ ���� �����"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "����������"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "����������"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "����, ���������, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "�������� ����� "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "���� ��������������� "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "�����"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "��������� ������������"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d ������"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "����������� �� ������ %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "������"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2617,182 +3387,386 @@ msgstr ""
 "��� ������.\n"
 "��� �� ������, ��������� �����, �� �� ��������� ������������� �� ���� CD-ROM."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "������"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "�� �������� �� ��� ��� ?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "����� �� ������ ��� ����������� �� ��������:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "����� �� ������ ��� ����������� �� ��������:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "����� �� ������"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "����, �������� ��������� ����."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "����������"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "����, �������� ���������� �� ������������."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr "������ �� �������� ����� �����, ����� �� ����� ������ ����������������"
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Root-���"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "��� � root-����� (/) �� ��������� �� ?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "���� ����������"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "����� ���� ���������� ������� ?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "����������/����������"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr "���� ���� ���������� �� � ��� ���������� ?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
+msgstr "���� ���� ���������� �� � ��� ��������� ?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "��������������"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "��������������"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
-msgstr "���������"
+msgstr "��������������"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "���������"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "������� �� ���, �� ��� ������� ?\n"
-"�� �� ����� ��������� �����, �� ������ ����."
+"��� �� �� ����� ��������� �����, �� ������ ����.\n"
+"��� �� ���� ������� ������: ``Use shadow file for passwords?'',\n"
+"�� ������ �� �� �� �������� � ����������?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "����������"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "��������"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "������� �������"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "�� ����������"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
-msgstr "�� ����� �� �� ���������� ��������� �� ?"
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
+msgstr "�� ����� �� ���������� ��������� �� ?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "����, �������� ��� �� �������."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "���� �� �������"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "����, �������� ��� ��� ������ ���� � �������� ������� ��."
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "��������� �� PCMCIA ������� ..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
-msgstr "������������� �� IDE"
+msgstr "��������� �� IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "���� ������ �� ������������"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%d Mb)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "����, �������� ��� �� ���� root-���."
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "�������� ����� �� ���������"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"�� ���� �� ������� ��������� �� ��������, ��������� � ��������� �� ��� :(\n"
+"���� �� �� ������ �� ������� ������ ������ (������ ����� �� ����� "
+"��������!).\n"
+"����� ������� � �� ��������� �� DrakX ������� ��������� � ������.\n"
+"(�������� � %s)\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake �� ���� �� ������� �������� ��������� �� ��������.\n"
+"������ �� ���������� �� �������� ���� !"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Root-���"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "��� � root-����� (/) �� ��������� �� ?"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "������ �� �� ������������, ����� ������������� �� ����������� �����"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "�������� ��������, ����� ������ �� �����������"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "�������� �� ���� ������� ?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "����������� �� ���owe"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "��������� � ����������� �� ����� %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
-"���� ���������� swap �� ���������� �� ������������, ���� �������� �����"
+"���� ���������� swap �� ����������� �� ������������, ���� �������� �����"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "����� ������� ������"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "����� ������ �� ����������"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr "��������� �� ���� ���������� ����� �� ���������� ��� ����������"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
+msgstr ""
+"��������� �� ���� ���������� ����� �� ���������� ��� ���������� (%d > %d)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "����� (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "��������� (%d Mb)"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "�������������� (%dMb)"
+
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "���������"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "�������� �������, ����� ������ �� ����������"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "����� �� ����� ������"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "�������� �� ������ ���� �� ����"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2803,12 +3777,12 @@ msgstr ""
 "��� �� ������� ����� CD-��, ������� ��, � ��������� Ok. "
 
 # c-format
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROM ��������� \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2816,173 +3790,11 @@ msgstr ""
 "���������� ����� %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
-msgstr "���� ������������� ������������"
-
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "������ ��������� ������������ �� IP"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "��������������� ������� ����"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "�� ������������ �������"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "������� ������������"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "��������� ����� ���� � �������������. ������ �� ��:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "������ �� �� ������������� ��������� �� �� ������ � ��������� ����� ?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "�� � ������� ������� �����"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "������������� �� ������"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "������ �� �� ������������� ��������� �� �� ������ � ����� ���� ����� ?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "������������� �� ��������� ���������� %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"����, �������� IP �������������� �� ���� ������.\n"
-"����� ���������� ������ �� ���� �������� ���� IP �����\n"
-"� �������-��������� ��������� (��������, 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "����������� IP �����"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP �����:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Netmask:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP ������� ������ �� ���� ��� ������ 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "������������� �� �������"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"����, �������� host name �� ��������.\n"
-"Host ����� ������ �� ���� ������� ������������� ���,\n"
-"���� ``mybox.mylab.myco.com''.\n"
-"������ ���� �� �������� IP ������ �� ����� gateway, ��� ����� �����"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS ������:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Gateway ����������:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Gateway:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "��� �� ����:"
+msgstr "���� ������������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "���� �� ��������� �� ����� ?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "����, �������� ������ ���� ��� ����� ������� ������� ��."
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "����� �� �������� �� �������"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "��� �� ��������"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "��������� �����"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "������������� ���"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "�������������"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "�������� �� ������"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "�������� �� ��������"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "��� �� �������"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "����� DNS ������"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "����� DNS ������"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3048,88 +3860,92 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "�������� ��������� ������,�� ����� �� �������� ��������"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "��������� � ���������� ������ �� ���������� �� ������� � ��������"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "����, �������� ��������, ����� ������ �� �����������."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
-msgstr "��� � ������ ������ ����?"
+msgstr "��� � ��������� �� ���� ?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "����������� �� �������� ��������  �� � �� GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "����� ������� �� ����� ������ �� ���������� ?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "��� ������"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "��������� shadow ����"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "��������� MD5 ������"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "��������� NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "����� ��������"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "�������� � ��������� ������ (������ �� ���� ����� ���� %d �������)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "������������� �� NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS ������"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS ������"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "������ ����������"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "������ ����������"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(���� �������� %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3139,61 +3955,90 @@ msgstr ""
 "�������� ����������\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "�������� ���"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "������������� ���"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "���"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "�����"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "���� ������ � ��������� ������"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "����, ������� ������������� ���"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "��������������� ��� ���� �� ������� ���� ����� �����, ������, `-' � `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "���� ������������� ��� � ���� ��������"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"���������� bootdisk � ��������� �� ���������� � Linux ��������� �� "
+"����������\n"
+"�� ����������� bootloader. ���� � �������, ��� �� ������ �� �����������\n"
+"SILO �� ��������� ��, ��� ����� ����� ����������� ������� ����� SILO\n"
+"��� ��� SILO �� ������ � ����������� �� ���������. ����������� bootdisk\n"
+"���� �� ���� ��������� ���\n"
+"������������ ����� �� Mandrake, ���������� ���������������� ��� �����\n"
+"������ �� ����.\n"
+"\n"
+"��� ������ �� ��������� bootdisk �� ������ �������, ��������� ������� �\n"
+"������� ���������� � ��������� \"Ok\"."
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "����� ����� ����������"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "����� ����� ����������"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "��������"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3212,69 +4057,36 @@ msgstr ""
 "�����������\n"
 "LILO (��� GRUB) �� ��������� �� ��� ��� ����� ����� ����������� ������� "
 "����� LILO ��� LILO ��\n"
-"������ � ����������� �� ������������. Bootdisk-�� ���� �� ���� ��������� "
-"���\n"
+"������ � ����������� �� ���������. Bootdisk-�� ���� �� ���� ��������� ���\n"
 "������������ ������� �� Mandrake, ���������� ���������������� ��� �����\n"
 "������ �� ����. ������ �� �� ������ bootdisk �� ��������� �� ?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "��������� ���� �����"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "�������� ����� �����,������ �� ��������� ���������� �������"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "������� ������� � ���������� %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "��������� �� ���������� �������"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "������������ �� LILO ���������. ����� �� �������� ������:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "������ �� �� ���������� SILO ?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "������ ����� �� SILO"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"���� �� ����������� �� SILO.\n"
-"������ �� �������� ��� ��� �� ��������� ��������������."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "���"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "���� ������ ���� �� ��������"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "������������ �� SILO ���������. ����� �� �������� ������:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "���������� �� bootloader"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "������ �� �� ���������� aboot ?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3282,127 +4094,122 @@ msgstr ""
 "������ ��� ����������� �� aboot, \n"
 "�� �� ������ �� �� �������� ������������ ����, ��� ���� �������� ������ ��� ?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "��������� �� proxy-������"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy-������� ������ �� � http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy-������� ������ �� � ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "������������ �� bootloader ���������. ����� �� �������� ������:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "����� ����� ��� Cracker-���"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "����"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "�����"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "�������"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "����������"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "������������ �������"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(���� �� ������� ������ �� �����)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "������ �� ����������� �� ��������� ?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "�������� ���� �� ���������"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "����� ������ �� RAM-�������, ��� � ���������� (�������� %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "����������� ��������� �� ���������� �������"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "���������� �� /tmp ��� ����� ���������"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "������ ����� �������"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "����������� Num Lock-� ��� ���������"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "����� ������� RAM-����� � Mb"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "�� ���� �� ���������� supermount ��� ������ ���� �� ���������"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX �� ������� ��������������� ������� � �� XFree 3.3 � �� XFree 4.0.\n"
-"�� ������������ �� �������� 3.3 ������, ������ ������ �� ������ �������� "
-"�����.\n"
-"\n"
-"������ �� �� ���������� XFree 4.0 ?"
+"��������: � ���� ���� �� ���������, ROOT ��������� �� ��������� �� � "
+"��������� !\n"
+"��� ������ �� ��� root, ������ �� ������� ���� ���������� � ������ �� "
+"���������� \"su\".\n"
+"���� ����, �� ��������� �� ���������� �������� �� �� ���� �����, ����� �� "
+"������.����� �����������."
+
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"��������, ��� � ������� numlock ���� �� ������ �� ����������� ��\n"
+"����� ������ ����� (��������: ���������� 'p' ���� '6')"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "�� �� ������ �� �� ������ PCI ���������� ?"
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "�� ��������� �� ��������� ��������� �� X11 ?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
-"������ �� �� ������ ����������� ����������� ������� �� Linux ���������� ?"
+"������ �� �� ������ ����������� ����������� ������� �� Linux ����������?"
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "������� ������ ������� � ���������� %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "��������� ������� � ����������� ����������"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3412,7 +4219,7 @@ msgstr ""
 "\n"
 "�������� �� ������ �� �������� ���� ?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3430,158 +4237,21 @@ msgstr ""
 "�� ���������� ������� ��������, �� ���� ������ �� Linux-Mandrake,\n"
 "�� ������������� � Errata, �� ����� : http://www.linux-mandrake.com/.\n"
 "\n"
-"���������� �� ������������� �� ��������� �� ������ �� �������� �\n"
+"���������� �� ����������� �� ��������� �� ������ �� �������� �\n"
 "������������������� ����� �� Official Linux-Mandrake User's Guide."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "����������"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "����������� �� ������� �� %s ������ %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(����� %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "��� %s ������� �� ������� ?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"� ����� ������, %s ��������� �� ������ �� ������������ ����������, ��\n"
-"�� ������ ��������, ������� �� �������� ������ � ��� ���. ������� �� "
-"����������\n"
-"������������ ����� �� ���� ��� �� ��������� �� �������� �� ������� "
-"������������\n"
-"�� ����� �� ������ ? �� ������� ���� ���� �� ����� ��������� ��, �� ���� �� "
-"�� �������."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "����������� ��������"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "����� �����"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "���� ������ �� �������� ������� �� ��� ������ %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"���� ������ �� �������� ������� �� �� ������ %s.\n"
-"������� �� ��� ������ ``���=�������� ���2=��������2 ...''.\n"
-"��������: ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "����� �� ������:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"����������� �� ������ %s �� ����.\n"
-"������ �� �� ������� ������ � ����� ��������� ?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "�� �� ������ �� �� ������ PCMCIA ����� ?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "������������� �� PCMCIA ������� ..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "�� �� ������ �� �� ������ %s ���������� ?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "�������� �� %s %s ����������"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "����� �� ����(�) ?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "����� �� ������� %s ���������?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "��"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "��"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "��� ����������� ����������"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "�������� �������"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "���������� �� �������"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "���������� �� Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> ����� ����������  | <Space> ������  | <F12> ������� �����"
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"���� ������ �� ��������� �� ������ ���� ����� �� %s.\n"
-"������ ��� ������, �� ���������� �� �������� ����������� `w'"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "���� ���������"
 
@@ -3591,7 +4261,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "..... (%s), ������ ��-�����\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "��� �����, �������� ������\n"
 
@@ -3605,446 +4275,948 @@ msgstr " ? (�� ������������ � %s)"
 msgid "Your choice? (default %s) "
 msgstr "������ ����� ? (�� ������������ � %s)"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "������ ����� ? (�� ������������ %s, �������� 'none' �� �����)"
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "�����"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "�����"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "U� ����������"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "US ����������"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "�������� (����)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "�������� (������ ������)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "�������� (���������)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "�������������� (��������)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "�������������� (��������)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "��������� (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "���������� (������ �������)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "���������� (������� �������)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "������ (��� ���������� �������)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "������� (US)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "������� (��������)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "��������� (\"�����\" �������)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "��������� (\"��������\" �������)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "��������� (���������)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "�������"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "������� 106 �������"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "�����������������"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "��������� AZERTY (����)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "��������� AZERTY (���)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "��������� \"������� ������\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "��������� \"���������\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "������ (QWERTY �������)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "������ (QWERTZ �������)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "�����������"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "�������� (������)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "����� (������)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "��������� ����������"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "������ (����������� \"F\" �����)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "������ (������� \"Q\" �����)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "US ���������� (������������)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "���������� \"������� ������\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "������������ (�������� �������)"
 
-# 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
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "����� �� Sun"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "����������"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington THinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genuis NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "���"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "�����"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "�������"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "����������� 2-������� �����"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "����������� 3-������� �����"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (�������, �� ������ ��� C7)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "��� �����"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2 ������"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3 ������"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "��� ���"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "��� �����"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "������� ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "������ �������� �� � ?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "��������� �� ��������"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "������ �� ���� �� ������� ���������� �� ��� �������� ?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "��������� �� �������� ���������"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "�� �� �������� ��� ��������"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "������ �� ��� �������� / ������� ��������� �����"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "��������� �� IDSN"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"�������� ���������� ��.\n"
+" ��� �� � � �������, �������� Unlisted"
+
+#: ../../netconnect.pm_.c:158
+msgid "Connection Configuration"
+msgstr "��������� �� ��������"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "����, ��������� ��� ��������� ������ ��-����"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "IRQ �� �������"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "����� (DMA) �� �������"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "IO �� �������"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "IO_0 �� �������"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "IO_1 �� �������"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "������ �� ��������� �����"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "��� �� ���������� (����. provider.net)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "��������� ����� �� ����������"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "1-�� DNS �� ����������"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "2-�� DNS �� ����������"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "����� �� ��������"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "��� �� ������� (������������ ���)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "������ �� �������"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "������������ �� ��������"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "������"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "������ (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "��������� ����"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "��������� ���� - ��� D-����� (����� �����)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "����� �������� ������� �� ��������� ?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "�� ����"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "����� ��� ����� ����� ?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "�������"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "�����"
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
+"\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"��� ����� ISA �����, ����������� �� ��������� ����� ������ �� �� �����.\n"
 "\n"
+"��� ����� PCMCIA �����, �� ������ �� ������ IRC � IO �� ������� ��.\n"
+
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "��� � ISDN ������� �� ?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "������� ISDN �����:\n"
+
+#: ../../netconnect.pm_.c:287
+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 ����� "
+"�� ���������� �����."
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr "�� � �������� ISDN PCI �����. ���� �������� �� ���������� �����."
+
+#: ../../netconnect.pm_.c:331
+#, fuzzy
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"����� ����� � LILO - ������ �� �������� ����������� ������� !\n"
+"� ��������� �� � ������ ethernet ������ �������. ����, ����������� "
+"����������� �� ��������� �� �������."
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "�������� ������ ���������"
+
+#: ../../netconnect.pm_.c:336
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "����, �������� �������� �������, ���� ����� �� �� ������ ��� ��������"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "������ ���������"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
-"�� �� �������� ������ �� �������������, ��������� <TAB>.\n"
+"Do you agree?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "�� ��� ��� �� ����������� �������� ���������. �������� �� ��� ?"
+
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "��������� �� ADSL"
+
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "������ �� �� ���������� �������� �� ��� ��������� ?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "�� �� ������ �� �� ������ ����� ?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "����, �������� ������ ���� ��� ����� ������� ������� ��."
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "����� �� �������� �� �������"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "��� �� ��������"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "��������� �����"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "������������� ���"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "�������������"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "�������� �� ������"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "�������� �� ��������"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "��� �� �������"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "����� DNS ������"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "����� DNS ������"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
 "\n"
-"�� �� �������� ���� �� ���, �������� ����� � ��������� <ENTER> ��� ��������� "
-"%d ������� �� ���������� �� ������������.\n"
+"You can connect to Internet or reconfigure your connection."
+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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "����� ����� ��� GRUB - ������ �� �������� ���������� ������� !"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "��������� �� �������� ���������"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "����������� ��������� %c � %c, �� �� �������� ����������."
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "�� �� �������� ��� ��������"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "��������� Enter, �� �� ���������� ��������� ��, 'e' �� �������� ��"
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "��������� ����� ����������, ��� 'c' �� �������� ���."
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "�� �� �������� ��� ��������"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "���������� ������ �� ����� ���������� ����������� ���� %d �������."
+#: ../../netconnect.pm_.c:590
+msgid "Connect to Internet"
+msgstr "������ �� ��� ��������"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "���� ���������� ����� �� /boot"
+#: ../../netconnect.pm_.c:592
+msgid "Disconnect from Internet"
+msgstr "������� �� �� ��������"
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "�������"
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "��������� �� �������� ���������"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "�������� ����"
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "�������� ������ � ���������"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "����� �� Sun"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+#, fuzzy
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr "�� ��� ��� �� ����������� �������� ���������. �������� �� ��� ?"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB �����"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "��������� �� �������� ���������"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB ����� (2 ������)"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "��������� �� �������� ���������"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB ����� (3+ ������)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "�������� ISDN �����"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB �����"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "������ �����"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB ����� (2 ������)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "������ �� ��� ��������"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB ����� (3+ ������)"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "����� � ����� �� ISDN �������� ?"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "����������� ����� (PS/2)"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "��������� �� �������� ���������"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (PS/2)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "�������"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "����������� 3-������� ����� (PS/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "����� ������"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "� ��� ������ �� �������� ?"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "����� Alcatel"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington THinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "����� ECI"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "��� ADSL ������� �� � Alcatel, �������� Alcatel. �����, �������� ECI."
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genuis NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "��������� PPPOE"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "�� ��������� PPPOE"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"���-����� ������ �� ��������� ���� ADSL � DHCP + PPPOE.\n"
+"�����, ����������� ����� ������, ����� ��������� ���� DHCP.\n"
+"��� �� ������, �������� '��������� PPPOE'."
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "��������� �� �������� ���������"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus �����"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"����� DHCP ������ ������ �� ���������� ?\n"
+"�� ������������ � DHCPD ?"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus �����"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "��������� �� �������� ���������"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus �����"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "�������� �� ��������� �����"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB �����"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "��������� �� �������"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB ����� (3+ ������)"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "������ �� �� �������� �����������?"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "��� �����"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "������� �������"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A ��� ��-���� (�������)"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "������ �� ��� �������� / ������� ��������� �����"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (�������)"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"��������� ����� ���� � ���������.\n"
+"������ �� ��:"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (�������)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "��� ������ �� �� �������� ��� �������� ?"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (�������)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "��������� �� �������"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (�������)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
+"����, ���� ���� �������� �������� �� � ���������,\n"
+"���������� �� ���� �� ���� �������� �� ������ �������� �������� ��.\n"
+"����������: ������ �� ������� �� ���� ������ �������, �� �� ���������� "
+"���������� �� ����� (LAN).\n"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (�������)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "�� � ������� ������� �����"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (�������)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "�������� �� �������"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (�������)"
+#: ../../network.pm_.c:274
+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"
+"Host ����� ������ �� ���� ������� ������������� ���,\n"
+"���� ``mybox.mylab.myco.com''."
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (�������, �� ������ ��� C7)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "��� �� ����:"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (�������)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+"��������: ���� ���������� ���� � ��������� �� �� ������� ��� ��������.\n"
+"������ ��������� OK, �� �� �������� ����������� �� ������������.\n"
+"���������� �� �������� ��-���� �� ��������� ���� ���������."
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "����������� ����� (�������)"
+#: ../../network.pm_.c:302
+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 ""
+"����, �������� IP ����������� �� ���� ������.\n"
+"����� ���������� ������ �� ���� �������� ���� IP �����\n"
+"� �������-��������� ��������� (��������, 1.2.3.4)."
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft-��������� (�������)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "��������� �� ��������� ���������� %s"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "����������� 3-������� ����� (�������)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "����������� IP �����"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (�������)"
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "IP �����"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "������ �������� �� � ?"
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "������� �����"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP ������� ������ �� ���� ��� ������ 1.2.3.4"
+
+#: ../../network.pm_.c:341
+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 ""
+"����, �������� host name �� ��������.\n"
+"Host ����� ������ �� ���� ������� ������������� ���,\n"
+"���� ``mybox.mylab.myco.com''.\n"
+"������ ���� �� �������� IP ������ �� ����� gateway, ��� ����� �����"
+
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "DNS ������"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "Gateway"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "Gateway ����������"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "��������� �� proxy"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy-������� ������ �� � http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy-������� ������ �� � ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr "��������� ������ �� �� ��������� �� ���� ���������"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4054,21 +5226,21 @@ msgstr ""
 "������������ ����� � �� ���������� �������� �� ������, �� �� ����� ������ "
 "����� ���� extended-��������"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "������ ��� �������� �� ����� %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "���������������� �� ����� %s �� ����: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "��� backup-����"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "������ ��� ����� ��� ����� %s"
@@ -4102,42 +5274,51 @@ msgstr "���������"
 msgid "maybe"
 msgstr "�����"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (�����)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (����� �����)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (�����)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "������ ��-�����"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "������ ������"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "������� �������"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
 msgstr "��������� �������"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "��������� CUPS ������"
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "��������� lpd�������"
+
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "������ ������� (socket)"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "�������� ���������� URI"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "��������� �� ���������� ..."
@@ -4151,11 +5332,11 @@ msgstr "�������� ���������"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "������� �� ������ \"%s\", � ������� �� "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "������� �������� ����������"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4163,15 +5344,15 @@ msgstr ""
 "���� � ������� ����� �������  \n"
 "(���������: /dev/lp0 � ������������ �� LPT1) ?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "�������� ����������"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "����� �� ��������� lpd-�������"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4181,19 +5362,19 @@ msgstr ""
 "������� �� ����� � �� �������� �� �������, �� ����� �� ���������\n"
 "������."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "���������� ��� �� ����"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "���������� ��� �� ������"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) ����� �� �������"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4207,27 +5388,27 @@ msgstr ""
 "��������, �� ����� ������ ������ � ��������� ����, ������ � ����������\n"
 "�� ��������� �����."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "���� �� SMB ������"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP �� SMB ������:"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "���� ���"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "������� �����"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "����� �� NetWare �������"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4237,131 +5418,155 @@ msgstr ""
 "�� �� �������� �� NetWare ������� ,������ �� ������ ���� �� � ��������\n"
 "������ �� �������, ����� � ����� �� ��������,��������������� ���,������."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "������ �� ��������"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "��� �� ��������� ��������"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "����� �� Socket �������"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"�� �� �������� �� socket �������, ������ �� ������������\n"
+"����� �� ����� �� �������� �, ����������, ����� �� ����."
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "��� �� ���� �� ��������"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "����"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr "������ �� ���������� ������� URI �� ������ �� �������� � CUPS."
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "����� ��� ������� ����� ?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "������ �� ������ ����� ?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "����������� �� ������(���/���) �������(�/�) ..."
+
+# c-format
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"��������� �������� �� ��������� ��� ���������� �����.\n"
+"���� ���� �� ������ ����� ����� ����� �������� �� �������.\n"
+"��������� �� ������:\n"
+"%s\n"
+"\n"
+"������ �� ����� ?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"��������� �������� �� ��������� ��� ���������� �����.\n"
+"���� ���� �� ������ ����� ����� ����� �������� �� �������.\n"
+"������ �� ����� ?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "��, ��������� ASCII ������� ��������"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "��, ��������� PostScript ������� ��������"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "��, ��������� ����� ������� ��������"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
-msgstr "������������� �������"
+msgstr "��������� �� �������"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "����� ��� ������� ����� ?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "����� �� ��������"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "������ �� ��������"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "��������� ���������� ���� ����� ?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "����� �� Uniprint �������"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "����� �� ��������� �� �����"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "������� ������ ���� PostScript ?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "������ ���� �� ����������"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "�������� �� stair-stepping ����� ?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "���� �������� �� ������� ��������"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "�����/��� ���� � ����� (1/72 �� ���)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "�����/����� ���� � ����� (1/72 �� ���)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "������������ GhostScript �����"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "������������ ����� �� �����"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "������ �� ������ ����� ?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "����������� �� ������(���/���) �������(�/�) ..."
-
-# c-format
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"��������� �������� �� ��������� ��� ���������� �����.\n"
-"���� ���� �� ������ ����� ����� ����� �������� �� �������.\n"
-"��������� �� ������:\n"
-"%s\n"
-"\n"
-"������ �� ����� ?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"��������� �������� �� ��������� ��� ���������� �����.\n"
-"���� ���� �� ������ ����� ����� ����� �������� �� �������.\n"
-"������ �� ����� ?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "�������"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
-msgstr "������� �� �� ������������� �������?"
+msgstr "������� �� �� ��������� ������� ?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4369,19 +5574,66 @@ msgstr ""
 "���� � ���������� ������� ������.\n"
 "������ �������� ��� ��� �� ��������� ��������������."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "���������� �� CUPS"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr "������ �� CUPS ���������� �� ������ ����� ..."
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "�������� ������ ��� ��������"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "��� � ������� ��������� ?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "�������� ������ ��� ����������� �������"
+
+#: ../../printerdrake.pm_.c:388
+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 ������\"."
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "��������� �� ��������"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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"
+"��� � ������� ��� ?"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "��� �� �������"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "��������"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "��������������"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4393,45 +5645,45 @@ msgstr ""
 "��� �� ���������� �� ���� ���������� �� ���� ������ � ��� �� ������� "
 "�������� ?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "��� �� ������"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Spool-����������"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "������ �� ��������"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "�� ���� �� ������� ��� ��� _����������_ RAID md%d"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "������ $file �� ���� �� ���� �������"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid ��������"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid �������� (���� �� raidtools ������� ?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "���� ���������� ������ �� RAID ���� %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacrton - ���������� ����������� �� ������� �� ����������."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4440,7 +5692,7 @@ msgstr ""
 "syslog. ���� ���� �� �� �������� �� ������� �� ��������, ������ ��������� � "
 "��������."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4448,7 +5700,7 @@ msgstr ""
 "����� ������� �� ���������� ��� ����� ���������� �� ��������� at � �����\n"
 "����� �� �����, ������ �������������� ������ ����������."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4457,9 +5709,9 @@ msgid ""
 msgstr ""
 "cron � ���������� UNIX ��������, ����� ���������� ����� ���������� ��������\n"
 "�� ����������. vixie cron ������ ��������� ������������ ��� ���� �� �������\n"
-"UNIX cron, ����������� ��-����� ��������� � ����� ��������������� �����."
+"UNIX cron, ����������� ��-����� ��������� � ����� ����������� �����."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4470,7 +5722,7 @@ msgstr ""
 "Midnight Commander. ���� ���� ��������� ���������� �� ����� �������\n"
 "����-�-���� ��������, � ������� ��������� �� �������� ������ �� ��������."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4479,7 +5731,7 @@ msgstr ""
 "�������\n"
 "� CGI."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4493,7 +5745,7 @@ msgstr ""
 "telnet, ftp, rsh � rlogin. ������������ �� inetd �������� ������ ������,\n"
 "�� ����� ��������."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4504,7 +5756,7 @@ msgstr ""
 "�� ���� �� ���� ������� � ����������� kbdconfig. ������ �� �������� "
 "������������ �� �������� ������."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4512,7 +5764,7 @@ msgstr ""
 "lpd � ������ �� ����� ��������� �� lpr �� ������ ��������. ��� ������ �\n"
 "������, ����� �������� �������� �� ����� �� �������(�/���)."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4520,7 +5772,7 @@ msgstr ""
 "named (BIND) � Domain Name Server (DNS), ����� �� �������� �� ��������\n"
 "����� �� ����� �� IP �����."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4528,25 +5780,25 @@ msgstr ""
 "������� � ��������� �������� Network File System (NFS), SMB (LAN\n"
 "Manager/Windows), � NCP (NetWare)."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
-"��������/���������� ������ ������� ���������� ������������� �� �� ������\n"
+"��������/���������� ������ ������� ����������, ��������� �� �� ������\n"
 "��� ���������� �� ��������."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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 �����.\n"
-"���� ������ ��������� ���������������� �� NFS �������, ����� �� �����������\n"
+"���� ������ ��������� ���������������� �� NFS �������, ����� �� ���������\n"
 "���� ����� /etc/exports."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4554,7 +5806,7 @@ msgstr ""
 "NFS � ��������� �������� �� ����� �� ������� �� TCP/IP �����.\n"
 "���� ������ ��������� ���������������� �� ������������ �� NFS ���������."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4562,10 +5814,10 @@ msgid ""
 "it installed on machines that don't need it."
 msgstr ""
 "PCMCIA ����������� ����������� �������� ���� ���� ethernet � ������ �\n"
-"laptop-�. ���� ���� �� �� �������� ����� �� ���� ������������, ���� �� �\n"
+"laptop-�. ���� ���� �� �� �������� ����� �� ���� ��������, ���� �� �\n"
 "��-����� �� � ����� ����������� �� ������, ����� �� �� ������� �� ���."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4576,7 +5828,7 @@ msgstr ""
 "NFS � NIS. portmap ������� ������ �� � ������ �� ������, ����� ������� ����\n"
 "������ �� ���������, ����� �� ������� �� ��������� RPC ���������."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4584,7 +5836,7 @@ msgstr ""
 "Postfix � Main Transport Agent (MTA), ����� � �������� ����� �������\n"
 "���� �� ������ �� ������."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4592,7 +5844,7 @@ msgstr ""
 "������� � ������������ ������ �� �������� �������� �� ��-������ ��������\n"
 "�� ���������� ���������� �� �����."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4602,7 +5854,7 @@ msgstr ""
 "RIP ���������. ������ RIP � ������ ���������� �� ����� �����, �� ��-������\n"
 "��������� �� �������� �� ����� �� ������ �����. "
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4610,7 +5862,7 @@ msgstr ""
 "rstat ��������� ��������� �� ��������� ����������� �� ��������\n"
 "����������� �� ������������� �� ����� ������ �� �������."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4618,7 +5870,7 @@ msgstr ""
 "rusers ��������� ��������� �� ��������� ����������� �� ���������� ��� �\n"
 "������ �� ����� ������������ ������."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4627,7 +5879,7 @@ msgstr ""
 "�� ������ ����������� ������ �� ������ � ������� rwho ����� (������� �� "
 "finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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."
@@ -4635,52 +5887,218 @@ msgstr ""
 "Syslog � �������� ����� ����� ������ ��������� �� �������� ��������� �\n"
 "�������� �������� ������� (������). ����� � ��������� �� � ����� ��������."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr "���� ������� ������ �� ������ �� ������ ������ usb ������� ��."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "����� � ����� X Font Server ��� ������� � ������� �� ��������."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "������ ��������, ����� ������ �� �� ������ ��� ������� �� ��������"
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"����� ����� � SILO - ������ �� �������� ����������� ������� !\n"
-"\n"
-"�� �� �������� ������ � ���������� �����������, ��������� <TAB>.\n"
-"\n"
-"�� �� �������� ���� �� ���, �������� ����� � ��������� <ENTER> ���\n"
-"��������� %d ������� �� ������� �� ������������.\n"
+"�� ���� �� ������� ��������� �� ��������, ��������� � ��������� :(\n"
+"�� �� ������ �� �������� �� ���������� ������ ������"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
-msgstr "������������� �� LILO/GRUB"
+msgstr "��������� �� LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "��������� �� boot-�������"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "���������� ���������"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "�����"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "������������ �� LILO ���������. ����� �� �������� ������:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "����������� �� �������� � �������� � ���� ����������"
+
+#: ../../standalone/drakgw_.c:104
+#, fuzzy
+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 "����������� �� ����������� �� �������� � �������� � ���� ���������.\n"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "�������"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "��������� �� �"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "����������� �� �������� � �������� � ������������"
+
+#: ../../standalone/drakgw_.c:123
+#, fuzzy
+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 "����������� �� ����������� �� �������� � �������� � ���� ���������.\n"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "�������"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "������������ �� ���������������� ���� �� � ����������."
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "��������� �� �������� � ��������"
+
+#: ../../standalone/drakgw_.c:152
+#, fuzzy
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+"����, ���� ���� �������� �������� �� � ���������,\n"
+"���������� �� ���� �� ���� �������� �� ������ �������� �������� ��.\n"
+"����������: ������ �� ������� �� ���� ������ �������, �� �� ���������� "
+"���������� �� ����� (LAN).\n"
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "����� �� ��������"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "������ ������ �������!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"� ��������� �� � ������ ethernet ������ �������. ����, ����������� "
+"����������� �� ��������� �� �������."
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"� ��������� �� ��� ���� ���� �������� ������ �������:\n"
+"\n"
+"$interface\n"
+"\n"
+"������ �� �� ��������� ���������� �� ����� ���� ������� ?"
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"���� �������� ��� ������ ������� �� ���� ������� ��� ��������� �� �����."
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"��������, ��������� ������� ���� � ��������.\n"
+"������ �� �� �� ������������ ?"
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr "�������� ������� � �������� � LAN � ����������� �� $_!\n"
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "������� � ��������� �� ������� ����� !"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+"�������� ! ������� � ��������� �� ������� �����. ���� �� �� ������ ������� "
+"����� �������� ���� ������������. ������� ?"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+"��������������� ���������, ����������� �� �������, ���������� �� �������..."
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "��������� �� IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "�� ���� �� ���� ���������� ipchains RPM � urpmi."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "�� ���� �� ���� ���������� dhcp RPM � urpmi."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "�� ���� �� ���� ���������� linuxconf RPM � urpmi."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "�� ���� �� ���� ���������� bind RPM � urpmi."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "�� ���� �� ���� ���������� caching-nameserver RPM � urpmi."
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "������������ !"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4744,29 +6162,42 @@ msgstr "�������� ���� �� ���������"
 msgid "Choose the tool you want to use"
 msgstr "�������� �����������, ����� ������ �� ����������"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "����� � ������������ �� ������������ ��?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "��������� �������������� ����������"
+
+#: ../../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 ""
+"������� CD-ROM !\n"
+"\n"
+"����, ������� CD-ROM ��������� \"%s\" � ������������ � ��������� Ok, ������ "
+"��� ������.\n"
+"��� �� ������, ��������� �����, �� �� ��������� ������������� �� ���� CD-ROM."
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "����� ��� ������� ����� ?"
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "�� � ������� serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "�� ��������� �� ����� ����� ?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "��� ��� ������ ���� � �������� ������� �� ?"
 
 #: ../../standalone/rpmdrake_.c:25
 msgid "reading configuration"
-msgstr "������ �� ������������"
+msgstr "������ �� �����������"
 
 #: ../../standalone/rpmdrake_.c:45 ../../standalone/rpmdrake_.c:50
 #: ../../standalone/rpmdrake_.c:253
@@ -4824,7 +6255,7 @@ msgstr "������� ������"
 
 #: ../../standalone/rpmdrake_.c:70
 msgid "Configuration"
-msgstr "������������"
+msgstr "���������"
 
 #: ../../standalone/rpmdrake_.c:71
 msgid "Add location of packages"
@@ -4840,7 +6271,7 @@ msgstr "��������"
 
 #: ../../standalone/rpmdrake_.c:100
 msgid "Configuration: Add Location"
-msgstr "������������: ������ �����"
+msgstr "���������: ������ �����"
 
 #: ../../standalone/rpmdrake_.c:103
 msgid "Find Package"
@@ -4973,6 +6404,935 @@ msgstr "�������� �� �������"
 msgid "Finding leaves takes some time"
 msgstr "���������� �� ����� ������ ����� �����"
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "��������"
+
+msgid "Internet"
+msgstr "��������"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "����"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "����������"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "����������"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "����������"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "����������"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "������������"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "����������"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "�������� ����������, ����� ������ �� �����������"
+
+#~ msgid "Total size: "
+#~ msgstr "���� ��������: "
+
+#~ msgid "Reconfigure local network"
+#~ msgstr "������������ ��������� �������"
+
+#~ msgid ""
+#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "���������� �� ���� �� ���� �������� �� ������� � ����� �������� � ��������.\n"
+#~ "\n"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "������ ���� ���������.\n"
+
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "������ �� ��� �������� ����������� ��������� �����"
+
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "������ �� ��� �������� ����������� ISDN"
+
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "������ �� ��� �������� ����������� DSL (��� ADSL)"
+
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "������ �� ��� �������� ����������� ������� �����"
+
+#~ msgid ""
+#~ "Time (secs) of inactivity after which\n"
+#~ "it hangs up. (leave blank to disable it)"
+#~ 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 "����� ��� ��� ������� ?"
+
+#~ 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "�������� \"����������\", ��� ���� ����������� �������� ������ �� GNU/Linux\n"
+#~ "��� ��� ������ �� ���������� �������� ����������� ��� ������.\n"
+#~ "\n"
+#~ "�������� \"��������������\", ��� ������ �� ������������ ������������� ������ "
+#~ "�� Linux-Mandrake.\n"
+#~ "\n"
+#~ "\n"
+#~ "��������:\n"
+#~ "\n"
+#~ "  - ��������������: ��� �� ��� ����������� GNU/Linux �����, �������� ����.\n"
+#~ "\n"
+#~ "  - ��������������: ��� ��� ���������� �������� � GNU/Linux, �� ������ �� "
+#~ "��������\n"
+#~ "    �������� �������������� �� �������� ��. ����� ��-���� �� �����������.\n"
+#~ "\n"
+#~ "  - ���������: ���� ����������, �� ��� �� \"��\" � GNU/Linux � ������ ��\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "���� ������ �� �������� �� ���/��� ������ �� ����������� ������\n"
+#~ "Linux-Mandrake �������, ��� �� ���� ��������� (�� �������� ���������� ��\n"
+#~ "GNU/Linux ���������� ��� ������� ���� ���������� �� �������). � ��������\n"
+#~ "������, �������� �� ����� �� ������ �� ����� ����������. ���� �������� ��\n"
+#~ "������ �� ��������� ��������� �� �������������� �� ���� ����� �� �������\n"
+#~ "������� �� ��������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������ �� ��������� ���� ������, �������� \"����������� ���������\", �� "
+#~ "��\n"
+#~ "��������� GNU/Linux ������ �����������. ���� �� �������� ����� �� ���������\n"
+#~ "���� ������� ����� \"hda\" �� ������ IDE ����, \"hdb\" �� ������ ���\n"
+#~ "\"sda\" �� ������ SCSI � �.�.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ���� ���� ��: root ��� (/), ����� � ��������� ����� �� ��������������\n"
+#~ "�������� �� ��������� ������� � /boot, ����� ������� ������ ���������� ��\n"
+#~ "���������� �� ������������� �������, ������ ��������� ���� �������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ���� �������� �� ���� ������ �� ������� ����������, ��������� ���� �� �\n"
+#~ "������� � �������� �� �������� ����������. DiskDrake ��������� �������, "
+#~ "����\n"
+#~ "�� �� �� ���� �����. ������������� �� � �������������� � �� �������� ��\n"
+#~ "���������.\n"
+#~ "\n"
+#~ "\n"
+#~ "������ �� ���������� ����� ���������� � ������������: ������� ���� ��������\n"
+#~ "����������� Tab � �������� Up/Down. ������ ��������� ���, ������ �� "
+#~ "����������:\n"
+#~ "\n"
+#~ "- Ctrl-c  �� �� ��������� ��� ��� (������ � ������ ������)\n"
+#~ "\n"
+#~ "- Ctrl-d  �� �� �������� ���\n"
+#~ "\n"
+#~ "- Ctrl-m  �� �� ���������� ����� �� ���������\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."
+#~ msgstr ""
+#~ "������ ������ ������ �� ����� ����������� �� �� �� �����������\n"
+#~ "(����������� �������� ��������� �� ������� �������). � ���� ������\n"
+#~ "���� �� ����������� ������ ����� ������, �� �� �������� ��������� �� ���.\n"
+#~ "�� ���� �������������� ������ ����� ���� �� � ������������. ���������� ��\n"
+#~ "�� ���������� /home � /usr/local."
+
+#~ 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."
+#~ msgstr ""
+#~ "��������, ����� ��� ���������, �� ����� ����������� ����. ���� ��������\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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "��� DrakX �� ����� �� ������ ������� ��, ��� ������ ��\n"
+#~ "��������� ����� � ��������, ��-���� �� �� ����\n"
+#~ "����������� ������ �� �����.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ��� �������� � ����������� �� DrakX, ������ ��������� 'Ok'.\n"
+#~ "� �������� ������, ������ �� �������� ������� �� �������, ����� ���-�����\n"
+#~ "����� � ������ ���������.\n"
+#~ "\n"
+#~ "\n"
+#~ "� ������ �� ������� �� � �������, �� ������ ���� ���� �� ������\n"
+#~ "�� DrakX �� ��� ���� � �������� ��."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "���� ������ � ��������� �� ����������� �� ��������� �����\n"
+#~ "(LAN) ��� �����.\n"
+#~ "\n"
+#~ "�������� \"������� �����\" � DrakX ��\n"
+#~ "����� �� ������ Ethernet �������� �� �������� ��. PCI a���������\n"
+#~ "�� ����� ������� � ��������� �����������.\n"
+#~ "�����, ��� ����������� �� � ISA, ���� ���� �� ����� � �� ������\n"
+#~ "�� �������� ������� �� �������, ����� �� �� ����� ���� ����.\n"
+#~ "\n"
+#~ "\n"
+#~ "�� SCSI ����������, �� ����� ����� ��������� �� �� ��������\n"
+#~ "��, ��� ���� �� �����, �������� ���� �������, ����� ��� �����\n"
+#~ "�� �������������� ������������ �� � ����\n"
+#~ "�������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ����������� Linux-Mandrake ������� �� ������, ����� � ����\n"
+#~ "�� ���� ������������ �����, ��������������� �� ������� �� ��������\n"
+#~ "�� �� � ��� ������������ ���������� (IP ����� � ������� Submask ���\n"
+#~ "Netmask �� ��-������, � ��� �� ��������). ��� ������� ������ �����\n"
+#~ "����� ��������, �� �� �� ������ �� ��������\n"
+#~ "������.\n"
+#~ "\n"
+#~ "\n"
+#~ "�������� \"�������� � �����\", �� �� ���� ��������� ��������\n"
+#~ "�� �� ��������. DrakX �� ����� �� ������ ������ ��, ��, ��� ��\n"
+#~ "�����, �� ������ ��� �� �������� �������� ����, ��� ����� �\n"
+#~ "������� ����� �����."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "GNU/Linux ���� �� �������� ����� ������ ��������. ����� �� ����\n"
+#~ "������ ������� �������� ���������. ���������� �����, �� �� ������������\n"
+#~ "���������� �������� �� �������� �������� 'lp' ���� ��� �� ��������; ���� ��\n"
+#~ "������ �� ����� ������� � ���� ���; �� ��� ������ �� ������ �������\n"
+#~ "����� �� �������� �� �������� ��� ������� '|'.\n"
+#~ "���� ��, ��� ������������ ��-�������� ���, ������ �� ������ ��\n"
+#~ "�� ������� �����, ����.: \"My Printer|lp\".\n"
+#~ "���������, ����� ��� \"lp\" � ���(��/����) �� �� ���� �������� �� "
+#~ "������������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ��������� �� � ��������� ������� ��� ��������� ��, ��������\n"
+#~ "\"������� �������\". ������ �� ������ �� ������� �����, ��� �����\n"
+#~ "� ������� �������� ��, � �� ��������� ���������� ������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������ ������ �� ������� ������� ��� ����� Unix ������, �� ������\n"
+#~ "�� �������� \"���������� lpd\". �� �� �� �������� �� ������, ����\n"
+#~ "�� �� �������� �� ��� � ���o��, �� �� ������ �� ������ ����� ��\n"
+#~ "�������� �� �������� �� ���� ������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������ ������ �� SMB ������� (����� ����� ������� ������� �� ��\n"
+#~ "���������� Windows 9x/NT ������), �� ������ �� ������ ��������\n"
+#~ "SMB ��� (�� TCP/IP �����), � ���������� IP ������ ���� �������������\n"
+#~ "���, ������� ����� � ������ ���������� �� ������� �� ����, ����� �,\n"
+#~ ", ������� ��, ����� �� ��������. ������ �� ������ � �� NetWare �������,\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."
+#~ msgstr ""
+#~ "������ �� ������������ �� ���������� � \"��\" ���. ��� �����������\n"
+#~ "Microsoft Windows ��-�����, ��� �� ��������� boot-�������.\n"
+#~ "��� �� ��������� ���������� ������� ����� � �����������, ������ ����\n"
+#~ "�� ������ �� ���������� ��������� � GNU/Linux."
+
+#~ msgid "Move your wheel!"
+#~ msgstr "���������� ������� !"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "�� ������� �� ���������?"
+
+#~ msgid "Cable connection"
+#~ msgstr "������� ������"
+
+#~ msgid "Host name:"
+#~ msgstr "��� �� ����:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "����� ��� ������� ����� ?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "����������� ��������� �� ������������ ����������"
+
+#~ 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"
+#~ msgstr ""
+#~ "�� �� ������ �������������� ����������� �� �������� ��, �� ������ � ������� "
+#~ "��������.\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?"
+#~ msgstr ""
+#~ "���� �� ������ �� ������ ������������ �� �������� �� ������������ "
+#~ "����������� (��������: 800x600).\n"
+#~ "��������, �����, ���� ���� �� ����� ��������.\n"
+#~ "������ �� �� �������?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "�� �� ������� ������� ������\n"
+#~ "�������� � ����� ����� ����� ��� �������"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "����������� ������� �� �������������� ����������"
+
+#~ msgid "dhcpd"
+#~ msgstr "DHCPD"
+
+#~ msgid "pump"
+#~ msgstr "PUMP"
+
+#~ msgid "dhcpxd"
+#~ msgstr "DHCPXD"
+
+#~ msgid "dhcp-client"
+#~ msgstr "DHCP-Client"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB �����"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB ����� (2 ������)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB ����� (3+ ������)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB �����"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB ����� (2 ������)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB ����� (3+ ������)"
+
+#~ msgid "eneric Mouse"
+#~ msgstr "����������� �����"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus �����"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Bus �����"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech Bus �����"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB �����"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB ����� (3+ ������)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A ��� ��-���� (�������)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (�������)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (�������)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (�������)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "����������� ����� (�������)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsoft-��������� (�������)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "����������� 3-������� ����� (�������)"
+
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington THinking Mouse (serial)"
+
+#~ msgid ""
+#~ "I need to configure your network adapter to be able to connect to internet."
+#~ msgstr ""
+#~ "������ �� ������� �������� �� �������, �� �� �� ������ ��� ��������."
+
+#~ msgid ""
+#~ "Please choose which network adapter do you want to use to connect to "
+#~ "internet.\n"
+#~ "If you don't know, choose eth0.\n"
+#~ msgstr ""
+#~ "���� �������� ��� ������ ������� �� ��������� �� ������ ��� ��������.\n"
+#~ "��� �� �� ������, �������� eth0.\n"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "nfs ����������� �� ����"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Socket"
+#~ msgstr "Socket"
+
+#~ 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?"
+#~ msgstr ""
+#~ "DrakX �� ������� ������������� ������� � �� XFree 3.3 � �� XFree 4.0.\n"
+#~ "�� ������������ �� �������� 4.0 , ������ ������ �� ������ �������� �����.\n"
+#~ "\n"
+#~ "������ �� �� ���������� XFree 3.3 ?"
+
+#~ msgid "Cryptographic"
+#~ msgstr "������������"
+
+#~ msgid "Configure LAN"
+#~ msgstr "��������� �� LAN"
+
+#~ msgid "End configuration"
+#~ msgstr "������� ���������"
+
+#~ msgid "Do not set up networking"
+#~ msgstr "�� ����������� �������"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "������ �� �� ��������� ��������� �� �� ������ � ��������� ����� ?"
+
+#~ msgid "Show less"
+#~ msgstr "������ ��-�����"
+
+#~ msgid "Show more"
+#~ msgstr "������ ������"
+
+#~ msgid "Take over the hard drive"
+#~ msgstr "���������� ����� ����� ����� ����"
+
+#~ msgid "URI for Local printer"
+#~ msgstr "URI �� ������� �������"
+
+#~ msgid "URI for Network printer"
+#~ msgstr "URI �� ������ ���������"
+
+#~ msgid "Local Printer Device (URI)"
+#~ msgstr "������� �������� ���������� (URI)"
+
+#~ msgid ""
+#~ "What URI device is your printer connected to\n"
+#~ "(note that parallel:/dev/lp0 is equivalent to LPT1:)?"
+#~ msgstr ""
+#~ "��� ��� URI ���������� � ������� �������� ��\n"
+#~ "(����������, �� parallel:/dev/lp0 � ������������ �� LPT1:) ?\n"
+
+#~ msgid "curly"
+#~ msgstr "������"
+
+#~ msgid "default"
+#~ 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 "������ �� �� � ��� �� ���� ?"
+
+#~ msgid "Local Area Network specification"
+#~ msgstr "������������ �� ��������� �����"
+
+#~ msgid "You may now decide which class C network to use.\n"
+#~ msgstr "������ �� �������� ��� ������ C ���� �� ����������.\n"
+
+#~ msgid "Network:"
+#~ msgstr "�����:"
+
+#~ msgid "Internet Connection Sharing - setup of $device"
+#~ msgstr "S��������� �� �������� � �������� - �������� �� $device"
+
+#~ msgid ""
+#~ "The following interface is about to be configured:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+#~ msgstr ""
+#~ "�� ���� ������������ �������� ���������:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+
+#~ msgid "Everything configured!"
+#~ msgstr "������ � �������������!"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "����� � ������������ �� ������������ ��?"
+
+#~ msgid "Normal"
+#~ msgstr "��������"
+
+#~ msgid "Configure my card"
+#~ msgstr "������� ������� ��"
+
+#~ msgid "pptp alcatel"
+#~ msgstr "PPTP Alcatel"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "�� �� ������ �� �� ������ PCMCIA ����� ?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "�� �� ������ �� �� ������ %s ���������� ?"
+
+#~ msgid "Small(%dMB)"
+#~ msgstr "�����(%d Mb)"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "��������� �� ������"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "������ �� �� ��������� ��������� �� �� ������ � ����� ���� ����� ?"
+
+#~ msgid "Do you want to configure a ISDN connection for your system?"
+#~ msgstr "������ �� �� ������������� ISDN ������ �� ��������� ��?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "�� �� ������ �� �� ������ PCI ���������� ?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "����� root-���"
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: ���� �� � root-���, ���� �������� ����� ����."
+
+#~ msgid "No root partition found"
+#~ msgstr "���� ������� root-���"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "�� ���� �� ��������� ��������� ��� NIS domain"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "����, �������� ��� �� ���� root-���."
+
+#~ msgid "Autologin at startup"
+#~ msgstr "Autologin �� ���������"
+
+#~ msgid "Autologin - Choose default user"
+#~ msgstr "Autologin - ������ ����������� �� ����������"
+
+#~ msgid "You don't have any windows partitions!"
+#~ msgstr "������ ������� windows ������!"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "������ ���������� ����� �� Lnx4win"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "��������������"
+
+# 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 ""
+#~ "����� ����� � LILO - ������ �� �������� ����������� ������� !\n"
+#~ "\n"
+#~ "�� �� �������� ������ �� �������������, ��������� <TAB>.\n"
+#~ "\n"
+#~ "�� �� �������� ���� �� ���, �������� ����� � ��������� <ENTER> ��� ��������� "
+#~ "%d ������� �� ���������� �� ������������.\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
+#
+#~ 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 ""
+#~ "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"
+
+#~ msgid "SILO main options"
+#~ msgstr "������ ����� �� SILO"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "���� �� ����������� �� SILO.\n"
+#~ "������ �� �������� ��� ��� �� ��������� ��������������."
+
+#~ msgid "This label is already in use"
+#~ msgstr "���� ������ ���� �� ��������"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "������������ �� SILO ���������. ����� �� �������� ������:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX �� ������� �������� �� ���� ��� ������� PCI SCSI ��������.\n"
+#~ "��� ������ � ����,��� ������� �� ���������,�� �� �������\n"
+#~ "����������� ��� ���� ������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������ SCSI ������� � �� ISA board , ��� �� PCI board,�� DrakX\n"
+#~ "������ ��� ������� �� �������� , �� ������ ������� ����� �� ������\n"
+#~ "��������. ��� ������ ���������� \"��\".��� ����� - \"��\" � �� �� ������\n"
+#~ "������ � ��������.\n"
+#~ "��� �������� ���-���������� �� ����� �������.\n"
+#~ "\n"
+#~ "\n"
+#~ "���� ���� ���������, DrakX �� �� ������ ������ �� �� ������������ �������\n"
+#~ "�� ��������. ����� ��������� �������� �� ������ ��������: ���������� ������\n"
+#~ "�����.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� �� ��,�� ���������� �� ������� ������������ �� �������������� ��\n"
+#~ "��������,��� �� Windows."
+
+#~ msgid "Shutting down"
+#~ msgstr "����������"
+
 #~ msgid "useless"
 #~ msgstr "������������"
 
@@ -4987,9 +7347,6 @@ msgstr "���������� �� ����� ������ ����� �����"
 #~ "������ �� �� �� ���������� ? ������ �� ����� ������� �� �� ���������� ��� "
 #~ "Linux."
 
-#~ msgid "Recommended"
-#~ 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"
@@ -5009,9 +7366,6 @@ msgstr "���������� �� ����� ������ ����� �����"
 #~ "Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
 #~ "6.1 (Helios), Gold 2000 or 7.0 (Air)."
 
-#~ msgid "LILO Installation"
-#~ msgstr "LILO ����������"
-
 #~ msgid "Do you want to use LILO?"
 #~ msgstr "������ �� �� ���������� LILO?"
 
@@ -5121,9 +7475,6 @@ msgstr "���������� �� ����� ������ ����� �����"
 #~ msgid "Hurt me plenty"
 #~ msgstr "����� ������"
 
-#~ msgid "Which usage do you want?"
-#~ msgstr "�� ����� ��� �� ������ ?"
-
 #~ msgid "Which packages do you want to install"
 #~ msgstr "��� ������ ������ �� �����������?"
 
@@ -5161,11 +7512,5 @@ msgstr "���������� �� ����� ������ ����� �����"
 #~ msgid "Linear (needed for some SCSI drives)"
 #~ msgstr "������ (��������� �� ����� SCSI ����������)"
 
-#~ msgid "Local Printer Options"
-#~ msgstr "����� �� �������� �������"
-
-#~ msgid "Dialup with modem"
-#~ msgstr "�������� � �����"
-
 #~ msgid "Local LAN"
 #~ msgstr "������� �����"
diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po
index 8fa21767a..a77e4cea3 100644
--- a/perl-install/share/po/br.po
+++ b/perl-install/share/po/br.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 1999-12-30 15:29+0100\n"
 "Last-Translator: Ja�-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>\n"
 "Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
@@ -14,43 +14,91 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "Rummel"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Kartenn c'hrafek"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Diuzit ur gartenn c'hrafek"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Dibabit ur servijer X"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "servijer X"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Pe seurt enmont a vennit ouzhpenna�"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+#, fuzzy
+msgid "XFree configuration"
+msgstr "Kefluniadur goude stalia�"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Diuzit ment memor ho kartenn c'hrafek"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Dibabit dibarzho� ar servijer"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Dibabit ur skramm"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Skramm"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -73,39 +121,40 @@ msgstr ""
 "a zo en tu-hont da varregezh ho skramm : gallout a rafe gwasta� ho skramm\n"
 " M'hoc'h eus doueta�s, dibabit ur c'hefluniadur fur."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Feur freskaat a-led"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Feur freskaat a-serzh"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Skramm ket kefluniet"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Kartenn c'hrafek ket kefluniet c'hoazh"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Spisterio� ket dibabet c'hoazh"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Mennout a rit amproui� ar c'hefluniadur ?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+#, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Da ziwall : arvarus eo amproui� ar gartenn c'hrafek-ma�"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Amproui� ar c'hefluniadur"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -113,184 +162,168 @@ msgstr ""
 "\n"
 "klaskit kemma� arventenno� 'zo"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "C'hoarvezet eo ur fazi :"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Kuitaat e %d eilenn"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "Ha reizh eo ar c'hefluniadur ?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "C'hoarvezet eo ur fazi, klaskit kemma� arventenno� 'zo"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Spisterio� emgefreek"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"A-benn kavout ar spisterio� hegerz e klaskin meur a hini.\n"
-"C'hwilda� a raio ho skramm...\n"
-"Gallout a rit e tizenaoui� ma fell deoc'h, klevet a rit ur bip pa vo echu"
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Spister"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Dibabit ar spister ha donder al livio�"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Kartenn c'hrafek : %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Servijer XFree86 : %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Diskouez pep tra"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Spisterio�"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Klask kavout ar spisterio� hegerz a c'hellan (da sk. 800x600).\n"
-"A-wecho�, evelato, e c'hell sac'ha� an ardivink.\n"
-"Mennout a rit klask ?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Mod reizh ebet kavet\n"
-"Klaskit gant ur gartenn video pe ur skramm all"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Reizhadur ar stokellaoueg : %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Seurt logodenn : %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Trobarzhell al logodenn : %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Skramm : %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "KempredA-led ar skramm : %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "FreskA-serzh ar skramm : %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Kartenn c'hrafek : %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Memor c'hrafek : %s ko\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Dibarzho� donder liv"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Spisterio�"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Servijer XFree86 : %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "Servijer XFree86 : %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "O prienti� kefluniadur X-Window"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Kemma� ar skramm"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Kemma� ar gartenn c'hrafek"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Kemma� dibarzho� ar servijer"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Kemma� ar spister"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Klask ent emgefreek ar spisterio�"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Diskouez titouro�"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Amproui� adarre"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Kuitaat"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Petra a vennit ober ? "
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Diso�jal ar c'hemmo�"
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Derc'hel ar c'hefluniadur IP o ren"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Adereit ouzh %s evit bevaat ar c'hemmo� mar plij"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Dizereit mar plij ha neuze implijit Ctrl-Alt-WarGil"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X pa loc'her"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -298,227 +331,227 @@ msgstr ""
 "Keflunia� ho urzhiataer evit la�sa� X ent emgefreek pa loc'ho a c'hella�.\n"
 "Mennout a rit la�sa� X pa adloc'hit ?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1152
+#, 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."
+msgstr ""
+"Keflunia� ho urzhiataer evit la�sa� X ent emgefreek pa loc'ho a c'hella�.\n"
+"Mennout a rit la�sa� X pa adloc'hit ?"
+
+#: ../../Xconfigurator.pm_.c:1154
+#, fuzzy
+msgid "Choose the default user:"
+msgstr "Dibabit ar ment nevez"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Dibabit ar benveg a vennit stalia�"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 liv (8 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil liv (15 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil liv (16 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 milion a livio� (24 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 miliard a livio� (32 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 ko"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 ko"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 Mo"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 Mo"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 Mo"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 Mo"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 Mo pe vuioc'h"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA standard, 640x480 da 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Gour-VGA, 800x600 da 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "Kenglotus 8514, 1024x768 da 87 Hz pebeilet (800x600 ebet)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Gour-VGA, 1024x768 da 87 Hz pebeilet, 800x600 da 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Gour-VGA astennet, 800x600 da 60 Hz, 640x480 da 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "G-VGA nann-pebeilet, 1024x768 da 60 Hz, 800x600 da 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "G-VGA talm uhel, 1024x768 da 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Lies-talm a c'hell ober 1280x1024 da 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Lies-talm a c'hell ober 1280x1024 da 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Lies-talm a c'hell ober 1280x1024 da 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Skramm a c'hell ober 1600x1200 da 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Skramm a c'hell ober 1600x1200 da 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "rodellek"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "dre ziouer"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "frondenn"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "duardez"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "plac'h"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "meleganez"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "emhud"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Rann genta� ar parzhadur loc'ha�"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Rann genta� ar bladenn (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
+#: ../../any.pm_.c:95
+#, fuzzy
+msgid "SILO Installation"
 msgstr "Staliadur LILO/grub"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Pelec'h e mennit stalia� ar c'harger loc'ha� ?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "Staliadur LILO/grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 #, fuzzy
 msgid "None"
 msgstr "Graet"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Pe garger(ien) loc'ha� a vennit imlijout ?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+#, fuzzy
+msgid "Bootloader installation"
+msgstr "Dibarzho� penna� ar c'harger loc'ha�"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Trobarzhell loc'ha�"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (ne da ket en-dro gant BIOSo� kozh)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Fetis"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "fetis"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Gedvezh kent loc'ha� ar skeudenn dre ziouer"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Mod video"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Gedvezh kent loc'ha� ar skeudenn dre ziouer"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Tremenger"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Tremenger (adarre)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Strishaat dibarzho� al linenn urzhia�"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "strishaat"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Dibarzho� penna� ar c'harger loc'ha�"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "Didalvout eo ``Strishaat dibarzho� al linenn urzhia�'' hep tremenger"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Klaskit adarre mar plij"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "An tremegerio� ne glot ket"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -526,167 +559,356 @@ msgstr ""
 "Setu da heul an enmonto� liesseurt.\n"
 "Gallout a rit ouzhpenna� lod pe gemma� a re a zo."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Ouzhpenna�"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Graet"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Pe seurt enmont a vennit ouzhpenna�"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
-msgid "Other OS (windows...)"
+#: ../../any.pm_.c:175
+#, fuzzy
+msgid "Other OS (SunOS...)"
 msgstr "Reizhiado� (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Pe seurt enmont a vennit ouzhpenna�"
+#: ../../any.pm_.c:175
+msgid "Other OS (windows...)"
+msgstr "Reizhiado� (windows...)"
 
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Skeudenn"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Gwrizienn"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Ouzhpenna�"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Lenn-skriva� "
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Taolenn"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Arvarus"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Skridennad"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Dre ziouer"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Mat eo"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Dilemel an enmont"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Berzet eo ar skridennado� goullo"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "En implij eo ar skridennad-se endeo"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Kavet etrefas %s %s"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Hag un all hoc'h eus ?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Hag un etrefas %s bennak a zo ganeoc'h ?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Ket"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Ya"
+
+#: ../../any.pm_.c:505
+msgid "See hardware info"
+msgstr "Gwelet titouro� periantel"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "O stalia� ur sturier evit kartenn %s %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(mollad %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Pe sturier %s a zlefen amproui� ?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"E degouezho� 'zo, ar sturier %s en deus ezhomm titouro� ouzhpenn evit mont\n"
+"en-dro reizh, daoust ma da en-dro mat hepto peurvuia�. Ha mennout a rit "
+"spisaat\n"
+"dibabo� ouzphenn evita�, pe aotren d'ar sturier amproui� ho penvek evit\n"
+"an titouro� en deus ezhomm ? A-wecho�, amproui� a c'hell sac'ha� un "
+"urzhiataer,\n"
+"hogen ne raio reuz ebet."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Embroui�"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Spisait dibarzho�"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Brema� e c'hellit pourveza� e zibarzho� d'ar mollad %s"
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"Brema� e c'hellit pourveza� e zibarzho� d'ar mollad %s.\n"
+"Diouzh ar furmad ``anv=talvoud anv2=talvoud2...'' eo an dibabo�.\n"
+"Da skouer, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Dibarzho� ar mollad :"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Karga� ar mollad %s a zo sac'het.\n"
+"Mennout a rit klask adarre gant arventenno� all ?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Degemer mat e %s, an dibaber reizhiad oberian~ !\n"
+"\n"
+"Evit rollan~ an dibabou aotreet, stokit <TAB>.\n"
+"\n"
+"Evit kargan~ unan anezho, skrivit e anv ha stokit <ENKAS> pe c'hortozit %d "
+"eilenn evit al loc'han~ dre ziouer.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Degemer mat e GRUB an dibaber reizhiad oberia� !"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "Implijit ar stokello� %c ha %c evit diuz pe enmont zo war wel"
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Stokit enkas evit loc'ha� ar RK diuzet, 'e' evit aoza� an"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "urzhiado� kent loc'ha�, pe 'c' evit ul linenn-urzhia�."
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "An enmont war wel a vo loc'het ent emgefreek e %d eilenn."
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr ""
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Gorretaol"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Meuziad La�sa�"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "Kuitaat e %d eilenn"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Kroui�"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Divarc'ha�"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Dilemel"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Furmadi�"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Adventa�"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Seurt"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Poent marc'ha�"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Skriva� /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Tremen er mod mailh"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Tremen er mod boas"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Adaoza� adalek ar restr"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Enrolla� er restr"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Assevel adalek ar pladennig"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Enrolla� war bladennig"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Skara� an holl"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Furmadi� an holl"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Ac'hubi� ent emgefreek"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Ac'hubet eo an holl barzhadurio� kenta� renk"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "N'hellan ouzpenna� parzhadur ebet ken"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -694,59 +916,63 @@ msgstr ""
 "Evit kaout muioc'h a barzhadurio�, lamit unan evit ma c'hellot kroui� ur "
 "parzhadur astennet mar plij"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Taolenn barzha� saveteerezh"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Dizober"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Skriva� an daolenn barzha�"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Adkarga�"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "savetei�"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Goullo"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "All"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Disloa�"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Goullo"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "All"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Seurt ar reizhiado� restro� :"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Munudo�"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -758,17 +984,17 @@ msgstr ""
 "Alia� a ran ouzoc'h adventa� ar parzhadur-se\n"
 "(klikit warni, da c'houde klikit war \"Adventa�\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Gwarezit ho roado� da genta� mar plij"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Lennit aketus !"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -778,77 +1004,77 @@ msgstr ""
 "rann\n"
 "a zo a-walc'h) e dero� ar bladenn"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Bezit war evezh : arvarus eo an obererezh-ma�."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Fazi"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Poent marc'ha� :"
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Trobarzhell :"
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Lizher ar bladenn DOS : %s (diwar varteze hepken)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Seurt : "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "O kregi� : rann %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Ment: %d Mo"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s rann"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Kranenn %d da granenn %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Furmadet\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Ket furmadet\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Marc'het\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Restr(o�) savetei� : %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -856,80 +1082,80 @@ msgstr ""
 "Parzhadur loc'het dre ziouer\n"
 "    (evit loc'ha� MS-DOS, ket evit lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Live %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Ment diaoz %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "Pladenno� RAID %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Anv ar restr savetei� : %s"
 
 #
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Klikit war ur parzhadur mar plij"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Ment: %d Mo\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Mentoniezh : %s kranenn, %s penn, %s rann\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Seurt taolenn barzha� : %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "war bus %d Nn %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Marc'ha�"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Bevaat"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Ouzhpenna� da RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Lemel diwar RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Kemma� RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Implij da savetei�"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Dibabit un obererezh"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -941,7 +1167,7 @@ msgstr ""
 "Pe e implijit LILO ha ne daio ket en-dro, pe ne rit ket ha n'hoc'h eus ket "
 "ezhomm a /boot"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -955,64 +1181,65 @@ msgstr ""
 "Ma vennit implijout ar merour loc'ha� LILO, taolit pled da ouzhpenna� ur "
 "parzhadur /boot"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Grit kentoc'h gant ``%s''"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Implijit ``Divarc'ha�'' da genta�"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
 "Goude kemma� seurt ar parzhadur %s, holl roado� ar parzhadur-se a vo kollet"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Kenderc'hel evelato ?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Kuitaat hep enrolla�"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Kuitaat hep skriva� an daolenn barzha� ?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Kemma� seurt ar parzhadur"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
 msgstr "Pe seurt parzhadur a vennit ?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Pelec'h e mennit marc'ha� ar restr savetei� %s ?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Pelec'h e mennit marc'ha� an drobarzhell %s ?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1020,139 +1247,144 @@ msgstr ""
 "N'hellan ket dizober ar poent marc'ha� dre m'eo implijet ar parzhadur-se\n"
 "evit savetei�. Lamit ar savetei� da genta�"
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "Goude furmadi� ar parzhadur %s, holl roado� ar parzhadur-se a vo kollet"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "O furmadi�"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "O furmadi� ar restr savetei� %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "O furmadi� ar parzhadur %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Goude furmadi� an holl barzhadurio�,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "kollet e vo holl roado� war ar parzhadurio�-se"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Dilec'hia�"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Da beseurt pladenn e mennit dilec'hia� ?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Rann"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Da beseurt rann e mennit dilec'hia� ?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "O tilec'hia�"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "O tilec'hia� ur parzhadur..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "War-nes beza� skrivet war bladenn eo taolenn barzha� an ardivink %s !"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Ret e vo deoc'h adloc'ha� a-raok ma talvezo ar c'hemm"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "O jedi� bevenno� ar reizhiad restro� FAT"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Oc'h adventa�"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Pe seurt parzhadur a vennit ?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "Mat e vije gwarezi� holl roado� ar parzhadur-se"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "Goude adventa� ar parzhadur %s e vo kollet holl roado� ar parzhadur-se"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Dibabit ar ment nevez"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "Mo"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Kroui� ur parzhadur nevez"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Rann kregi� :"
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Ment e Mo :"
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Seurt ar reizhiad restro� :"
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Dibarzh :"
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "N'heller ket implijout ar parzhadur-ma� evit savetei�"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Savetei�"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Anv ar restr savetei� :"
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "Restr implijet gant ur savetei� all endeo, dibabit unan all"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "Ar restr a zo endeo. E implijout ?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Diuzit ar restr"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1160,11 +1392,11 @@ msgstr ""
 "N'eo ket he�vel ment an daolenn barzha� gwarezet\n"
 "Kenderc'hel memestra ?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Ho evezh"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1172,77 +1404,77 @@ msgstr ""
 "Lakait ur bladennig el lenner\n"
 "Kollet e vo holl roado� ar bladennig-se"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "O klask assevel an daolenn barzha�"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "trobarzhell"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "live"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "ment diaoz"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Dibabit da be RAID ouzhpenna�"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "nevez"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "furmadi� er seurt %s eus %s a zo sac'het"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "N'ouzon ket penaos furmadi� %s er seurt %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "marc'ha� NFS sac'het"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "marc'ha� sac'het :"
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "fazi en ur zivarc'ha� %s : %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Poento� marc'ha� a rank kregi� gant /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Bez' ez eus ur parzhadur e boent marc'ha� %s endeo\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Marc'ha� kelc'hiek %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Fazi en ur zigeri� %s evit skriva� : %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1251,77 +1483,81 @@ msgstr ""
 "kroui� reizhiado� restro� nevez warni. Gwiriit abeg ar gudenn-ma� en ho "
 "ardivinkaj mar plij "
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "N'hoc'h eus parzhadur ebet !"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "Dibabit ho yezh muia�-karet evit stalia� hag implijout ar reizhiad."
 
-#: ../../help.pm_.c:10
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Dibabit ar reizhadur a glot gant ho stokellaoueg er roll a-us"
-
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "Dibabit ar reizhadur a glot gant ho stokellaoueg er roll a-us"
+
+#: ../../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
+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"
-"  - 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"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\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"
-msgstr ""
-"Dibabit \"Stalia�\" ma n'eus ket a stumm kent Linux bet staliaet,\n"
-"pe ma vennit implijout meur a stumm pe a zasparzhadenn.\n"
 "\n"
-"Dibabit \"Bremanaat\" ma vennit hizivaat ur stumm kent Mandrake Linux :\n"
-"5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
-"2000\n"
-"pe 7.0 (Air).\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* Recommanded: 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"
-"Diuzit :\n"
 "\n"
-"  - Emgefreek : Ma n'hoc'h eus morse staliaet Linux a-raok, dibabit se. "
-"EVEZH :\n"
-"    ne vo ket kefluniet a rouedad e-kerz ar staliadur, implijit "
-"\"LinuxConf\"\n"
-"    evit keflunia� unan goude diwezh ar staliadur.\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - Neuziet : Ma 'z oc'h kustumet a-walc'h gant GNU/Linux, tu vo neuze "
-"deoc'h\n"
-"    dibab an implij penna� evit ho ardivink. Sellit a-is evit munudo�.\n"
 "\n"
-"  - Mailh : Ma 'z oc'h en ho pleud gant GNU/Linux ha mennet da seveni�\n"
-"    ur staliadur neuziet-tre. Evel evit ar renkad stalia� \"Neuziet\" e vo\n"
-"    tu deoc'h diuz an implij evit hor reizhiad.\n"
-"    Hogen mar plij, NA ZIBABIT KET SE NEMET MA OUZIT PEZH EMAOC'H OC'H OBER "
-"!\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1329,12 +1565,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Diuzit :\n"
 "\n"
@@ -1342,37 +1579,35 @@ msgstr ""
 "deoc'h\n"
 "    dibab an implij penna� evit ho ardivink. Sellit a-is evit munudo�.\n"
 "\n"
+"\n"
 "  - Mailh : Ma 'z oc'h en ho pleud gant GNU/Linux ha mennet da seveni�\n"
 "    ur staliadur neuziet-tre. Evel evit ar renkad stalia� \"Neuziet\" e vo\n"
 "    tu deoc'h diuz an implij evit hor reizhiad.\n"
-"    Hogen mar plij, NA ZIBABIT KET SE NEMET MA OUZIT PEZH EMAOC'H OC'H OBER "
-"!\n"
+"    Hogen mar plij, NA ZIBABIT KET SE NEMET MA OUZIT PEZH EMAOC'H OC'H OBER�!"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "An dibabo� liessek evit implij ho ardivink (en ur c'houlakaat neuze hoc'h "
 "eus\n"
@@ -1399,161 +1634,347 @@ msgstr ""
 "all.\n"
 "    Da heul, na c'hortozit staliadur tamm kinkladur ebet (KDE, GNOME...).\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 a glasko da genta� kavout unan pe vuioc'h a azasaer SCSI PCI.\n"
-"Ma gav anezha� (pe anezho) ha ma oar pe sturier(ien) implijout, e (o)\n"
-"enlakaat a raio ent emgefreek.\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"
+"\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"
-"M'eo ho azasaer SCSI ur gartenn ISA, pe m'eo ur gartenn PCI hogen\n"
-"ne oar ket DrakX pe sturier implijout evit ar gartenn-se, pe n'hoc'h eus\n"
-"tamm azasaer SCSI ebet, goulennet e vo diganeoc'h neuze hag-e� hoc'h\n"
-"eus unan pe get. Ma n'hoc'h eus hini, eilgeriit \"Ket\". M'hoc'h eus\n"
-"unan pe vuioc'h, eilgeriit \"Ya\". Ur roll sturierien a zeuio neuze\n"
-"war wel, a vo ret deoc'h diuz unan anezho.\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"
-"Goude m'ho po diuzet ar sturier, DrakX a c'houlenno ma vennit spisaat\n"
-"dibarzho� evita�. Da genta�, klaskit leuskel ar sturier amproui�\n"
-"ar periant : peurliesa� e da mat en-dro.\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"
-"Ma ne ra ket, na ziso�jit ket an titouro� war ho periant a c'hellit\n"
-"kavout en ho teuliadur pe digant Windows (m'hoc'h eus hema� war ho\n"
-"reizhiad), evel m'eo aliet gant ar sturlevr stalia�. An dibarzho� a\n"
-"vo ret deoc'h pourveza� d'ar sturier eo a zo e kaoz."
+"\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."
+msgstr ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:160
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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"
 "\n"
+"   * Auto allocate:: this option allows you to automatically create Ext2 and "
+"swap partitions in free space of your\n"
+"     hard drive.\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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
-"- Ctrl-d  to delete a partition\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"
-"- Ctrl-m  to set the mount point\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"
 msgstr ""
-"D'ar poent-ma�, e c'hellit dibab pe barzhadur(io�) implijout evit\n"
-"stalia� ho reizhiad Linux-Mandrake, ma 'z int bet termenet endeo (diwar\n"
-"ur staliadur kent Linux pe diwar ur benveg parzha� all). E degouezho�\n"
-"all, ret eo termeni� parzhadurio� ar bladenn galet. Talvezout a ra an\n"
-"obererezh-se kement ha ranna� dre meiz egor pladenn galet an urzhiataer\n"
-"e takado� distag o implij.\n"
+
+#: ../../help.pm_.c:218
+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"
-"M'hoc'h eus da groui� parzhadurio� nevez, implijit \"Ac'hubi� ent "
-"emgefreek\"\n"
-"a-benn kroui� parzhadurio� evit Linux ent engrefreek. Gallout a rit diuz\n"
-"ar bladenn da parzha� dre glika� war \"hda\" evit an drobarzhell IDE "
-"kenta�,\n"
-"\"hdb\" evit an eil pe \"sda\" evit an drobarzhell SCSI kenta� hag all.\n"
+"For information, each partition is listed as follows: \"Name\", "
+"\"Capacity\".\n"
 "\n"
 "\n"
-"Daou barzhadur boutin-tre a zo : ar parzhadur gwrizienn (/), a zo penn\n"
-"kenta� urzhaz renkello� ar reizhiad restro�, ha /boot, a zo enna� an holl\n"
-"restro� ret evit loc'ha� ar reizhiad korvoi� p'emeur o paouez enaoui�\n"
-"an urzhiataer.\n"
+"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
 "\n"
-"Gant ma n'heller ket diverka� efedo� an argerzh-ma�, parzha� a c'hell\n"
-"beza� abafus ha bec'hius d'an arveriad deraouat. DiskDrake a aesa kement\n"
-"an argerzh ha n'eus ket aon da gaout. Sellit ouzh an teuliadur hag it\n"
-"war ho pouez a-raok kregi� ganti.\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"
-"Gallout a rit tizhout kement dibarzh 'zo gant ar stokello� : merdei� dre ar "
-"parzhadurio�\n"
-"gant Tab ha biro� Laez/Trao�. P'hoc'h eus diuzet ur parzhadur, grit gant :\n"
 "\n"
-"- Ctrl-c  evit kroui� ur parzhadur nevez (m'eo goullo ar parzhadur diuzet)\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
+"hard drives:\n"
 "\n"
-"- Ctrl-d  evit lemel ur parzhadur\n"
+"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-m  evit termeni� ar poent marc'ha�\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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:252
 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."
+"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 ""
-"Kement parzhadur a zo bet nevez termenet a zle beza� furmadet a-benn\n"
-"e implijout (furmadi� a dalvez kroui� ur reizhiad restro�). Er poent-se,\n"
-"e c'hellit mennout adfurmadi� parzhadurio� 'zo o veza� endeo evit diverka�\n"
-"ar roado� a zo enno. Ho evezh : n'eo ket ret adfurmadi� parzhadurio� o\n"
-"veza� endeo, dreist-holl ma 'z eus enno restro� pe roado� a vennit "
-"derc'hel.\n"
-"Skouerio� dibar eo /home ha /usr."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:257
+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 ""
+
+#: ../../help.pm_.c:267
+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 ""
+
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
+
+#: ../../help.pm_.c:303
+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 ""
+
+#: ../../help.pm_.c:329
+#, 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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 ""
 "Gallout a rit brema� diuz ar strollad pakado� a vennit\n"
 "stalia� pe vremanaat.\n"
@@ -1567,138 +1988,153 @@ msgstr ""
 "\"Diuz pakado� unan hag unan\" ; en degouezh-se e vo ret deoc'h furchal\n"
 "a-dreuz tremen 1000 pakad..."
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:358
+#, 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 ""
 "M'hoc'h eus an holl CDo� er roll a-is, gwaskit Mat eo.\n"
 "Ma n'hoc'h eus hini eus ar CDo�-se, gwaskit Nulla�.\n"
 "Ma fazi deoc'h lod eus ar CDo�, andiuzit anezho ha gwaskit Mat eo."
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:363
 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."
+"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 ""
-"Ema� ar pakado� diuzet o veza� staliaet brema�. Un nebeut munut\n"
-"e zlefe padout an obererezh-se nemet m'ho pije dibabet bremanaat\n"
-"ur reizhiad o veza�, en degouezh-se e c'hell kemer muioc'h a amzer\n"
-"zoken a-raok na grogfe ar bremanaat."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:371
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"Ma ne c'hell ket DrakX kavout ho logodenn, pe ma vennit\n"
-"gwiria� pezh en deus graet, kinniget e vo deoc'h ur roll\n"
-"logodennou a-us.\n"
-"\n"
-"\n"
-"Ma 'z oc'h a-du gant kefluniadur DrakX, n'hoc'h eus ken nemet lammat\n"
-"d'ar rann a fell deoc'h en ur glika� el la�ser a gleiz. Mod all,\n"
-"dibabit el la�ser ar seurt logodenn a gav deoc'h ez eo hini a zegouezh\n"
-"ar gwella� evit ho logodenn.\n"
-"\n"
-"Ma 'z eo ul logodenn a-steud, ret e vo ivez deoc'h lavaret da DrakX\n"
-"war be borzh a-steud eo luget ho logodenn."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
 "Diuzit ar porzh a zere mar plij. Da skouer, porzh COM1 dindan MS Windows\n"
 "a vez anvet ttyS0 gant Linux."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"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"
-"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"
-"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"
-"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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"Gouestlet eo ar rann-ma� da geflunia� ur rouedad takad lec'hel\n"
-"(LAN) pe ur modem.\n"
-"\n"
-"Dibabit \"Rouedad lec'hel\" ha DrakX a glasko kavout un azasaer\n"
-"Ethernet war ho ardivink. Azasaerien PCI a zlefe beza� kavet\n"
-"ha deraouekaet ent emgefreek. Evelato, m'eo ho trobarzhell unan ISA,\n"
-"ne daio ket en-dro an emzinoi�, hag e vo ret deoc'h diuz ur sturier\n"
-"diwar ar roll a zeuio war wel neuze.\n"
-"\n"
-"\n"
-"Evel evit azasaerien SCSI e c'hellit leuskel ar sturier amproui�\n"
-"an azasaer ar wech kenta�, mod all e vo ret deoc'h spisaat d'ar\n"
-"sturier dibarzho� ho pije tapet diwar teuliadur ho periant.\n"
-"\n"
-"\n"
-"Ma stalhit ur reizhiad Linux-Mandrake war un ardivink a zo\n"
-"lodek en ur rouedad a zo c'hoazh, merour ar rouedad en devo\n"
-"roet deoc'h an holl titouro� ret (chomlec'h IP, ismaskl rouedad\n"
-"pe verroc'h rouedmaskl, hag anv ostiz). M'emaoc'h o sevel ur\n"
-"rouedad prevez er g�r da skouer, mat e vije deoc'h dibab\n"
-"chomlec'hio� \n"
-"\n"
-"Dibabit \"Sifrenna� gant ar modem\" hag e vo kefluniet ar gevreadenn\n"
-"ouzh ar Genrouedad gant ur modem. Klask a raio DrakX kavout ho modem,\n"
-"ma ne teu ket a-benn e vo ret deoc'h diuz ar porzh a-steud m'eo luget\n"
-"ho modem outa�."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"Gallout a rit brema� skriva� dibarzho� sifrenna�. Ma n'oc'h ket sur petra\n"
+"skriva�, an titouro� reizh ho po digant ho PMG."
+
+#: ../../help.pm_.c:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
 "Skrivit :\n"
 "\n"
@@ -1715,7 +2151,23 @@ msgstr ""
 "IP\".\n"
 "M'hoc'h eus doueta�s, goulennit digant merour ho rouedad.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"Ma implij ho rouedad NIS, diuzit \"Implijout NIS\". Ma ne ouzit ket, "
+"goulennit\n"
+"digant merour ho rouedad."
+
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1723,7 +2175,7 @@ msgstr ""
 "Gallout a rit brema� skriva� dibarzho� sifrenna�. Ma n'oc'h ket sur petra\n"
 "skriva�, an titouro� reizh ho po digant ho PMG."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1731,13 +2183,15 @@ msgstr ""
 "Ma implijit proksio�, keflugnit anezho brema� mar plij. Ma ne ouzit ket hag\n"
 "e rankit implijout proksio�, goulennit digant merour ho rouedad pe ho PMG."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1749,13 +2203,19 @@ msgstr ""
 "Taolit evezh e rankit diuz ar melezour hag ar rinegouriezh hervez al\n"
 "lezenno� o ren du-se."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "Brema� e c'hellit diuz ho takad-eur diouzh al lec'h ma chomit enna�.\n"
 "\n"
@@ -1763,15 +2223,22 @@ msgstr ""
 "Linux a vera an eur e GMT pe \"Greenwich Mean Time\" hag e amdrei� a ra\n"
 "en eur lec'hel hervez an takad-eur hoc'h eus diuzet."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 ""
 "Brema� e c'hellit diuz pe servijo� a vennit e vije la�set pa loc'her.\n"
 "Pa zeu ho logodenn war un draez, ul lagadenn skoazell a zeuio war wel hag\n"
@@ -1782,80 +2249,159 @@ msgstr ""
 "ket\n"
 "c'hoant."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
 msgid ""
-"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"
+"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:490
+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:505
+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 ""
+
+#: ../../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"
-"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"
+"   * 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"
-"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"
+"   * 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"
-"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."
+"   * 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 ""
-"Linux a oar en em zibab gant kalz a seurto� moullerezed. Pep hini eus\n"
-"ar seurto�-se en deus ezhomm ur c'hefluniadur dishe�vel. Taolit evezh\n"
-"avat ar spooler moulla� a laka 'lp' da anv ar voullerrez dre ziouer ;\n"
-"ret eo deoc'h eta kaout ur voullerez gant an anv-se ; hogen meur a anv,\n"
-"pep hini dsipartiet gant an arouezenn '|', a c'hellit rei� d'ur voullerez.\n"
-"Neuze, mar kavit gwelloc'h beza� un anv splannoc'h, n'hoc'h eus ken nemet\n"
-"e lakaat da genta�, da sk. \"Ma Voullerez|lp\".\n"
-"Ar voullerez he deus \"lp\" en he anv(io�) a vo hini dre ziouer.\n"
+
+#: ../../help.pm_.c:542
+msgid ""
+"You need to enter some informations here.\n"
 "\n"
 "\n"
-"M'eo luget ho moullerez end-eeun ouzh ho urzhiataer, diuzit\n"
-"\"Moullerez lec'hel\". Neuze e rankot lavaret ouzh be borzh eo\n"
-"luget ho moullerez, ha diuz ar sil a zere.\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"
-"Ma vennit tizhout ur voullerez a zo lec'hiet war un ardivink Unix\n"
-"a-bell, rankout a reot diuz \"lpd a-bell\". Evit ma 'z afe en-dro,\n"
-"n'eus ezhomm nag anv na tremenger, hogen e rankot anavezout anv\n"
-"ar steud moulla� war ar servijer-se.\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"
-"Ma vennit tizhout ur voullerez SMB (da lavaret eo ur voullerez\n"
-"lec'hiet war un ardivink Windows 9x/NT a-bell), e rankot spisaat\n"
-"e anv SMB (n'eo ket e anv TCP/IP), ha marteze e chomlec'h IP, mui\n"
-"an anv arveriad, ar strollad labour hag an tremenger ret a-benn tizhout\n"
-"ar voullerez, hag evel-just anv ar voullerez. He�vel tra evit ur\n"
-"voullerez NetWare, war-bouez titour ar strollad labour a zo diezhomm."
+"\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:286
+#: ../../help.pm_.c:567
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"Your printer has not been detected. Please enter the name of the device on\n"
+"which it is connected.\n"
 "\n"
 "\n"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"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:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
+"\n"
+"Do not make the password too long or complicated, though: you must be able "
+"to\n"
+"remember it without too much effort."
 msgstr ""
 "Brema� e c'hellit skriva� an tremenger root evit ho reizhiad\n"
 "Linux-Mandrake. An tremenger a zle beza� roet div wech evit\n"
@@ -1872,7 +2418,7 @@ msgstr ""
 "pe re luziet, memestra : dav eo deoc'h kaout so�j anezha� hep re a\n"
 "strivo�."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1881,7 +2427,7 @@ msgstr ""
 "kuzhet\"\n"
 "hag \"Implijout tremegerio� MD5\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1890,7 +2436,7 @@ msgstr ""
 "goulennit\n"
 "digant merour ho rouedad."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1934,22 +2480,18 @@ msgstr ""
 "gont arveriad ho po krouet ama�, hag erea� evel root evit kefridio� a\n"
 "vererezh ha trezerc'hel hepken."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Mar plij, me ho ped, respontit \"Ya\" ama� ! Lakaomp da skouer e\n"
-"adstalhit Windows diwezhatoc'h hag e rasklo ar rann loc'ha�. Nemet\n"
-"m'ho pije graet ar bladenn loc'ha� evel aliet, ne viot ket evit\n"
-"loc'ha� Linux e mod ebet ken !"
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
+#, fuzzy
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
@@ -1962,7 +2504,7 @@ msgstr ""
 "Nemet ma ouifec'h resis ar pezh a rit, dibabit \"Rann genta�\n"
 "ar bladenn (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1970,10 +2512,11 @@ msgstr ""
 "Nemet ma ouifec'h a-zevri ez eo dishe�vel, \"/dev/hda\" eo an dibab boas\n"
 "(pladenn IDE mestr kenta�) pe \"/dev/sda\" (pladenn SCSI kenta�)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1996,7 +2539,8 @@ msgstr ""
 "Hogen\n"
 "neuze e vo ret deoc'h kaout ur bladennig loc'ha� evit loc'ha� anezho."
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -2013,7 +2557,9 @@ msgid ""
 "\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."
 msgstr ""
 "Setu dibabo� penna� LILO ha grub :\n"
@@ -2036,10 +2582,73 @@ msgstr ""
 "    * boas : a ziuz ar mod skrid 80x25 boas.\n"
 "    * <niver> : a implij ar mod skrid a zegouezh."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+#, 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 (the LInux LOader) ha Grub a zo kargerien loc'ha� : barrek int da "
+"loc'ha�\n"
+"pe Linux pe forzh pe reizhiad korvoi� all beza�t war ho urzhiataer.\n"
+"Peurvuia�, ar reizhiado� korvoi� all-se a vez dinoet ha staliet reizh.\n"
+"Ma n'eo ket kont evel-hen, gallout a rit ouzhpenna� un enmont gant an dorn\n"
+"er skramm-ma�. Taolit pled da zibab an arventenno� reizh.\n"
+"\n"
+"\n"
+"Gallout a rafec'h ivez mennout na lakaat hegerz hini ebet eus ar reizhiado�\n"
+"korvoi�-se, neuze n'hoc'h eus ken nemet dilemel an enmonto� a zegouezh. "
+"Hogen\n"
+"neuze e vo ret deoc'h kaout ur bladennig loc'ha� evit loc'ha� anezho."
+
+#: ../../help.pm_.c:692
+#, 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 ""
+"Setu dibabo� penna� LILO ha grub :\n"
+"  - Trobarzhell loc'ha� : a dermen anv an drobarzhell (da sk. parzhadur\n"
+"ur bladenn galet) a zo enni ar rann loc'ha�. Nemet ma ouifec'h a-zevri\n"
+"ez eo dishe�vel, dibabit \"/dev/hda\".\n"
+"\n"
+"\n"
+"  - Gedvezh a-raok loc'ha� ar skeudenn dre ziouer : a spisa an niver a\n"
+"zekvet eilenno� a rankfe gortoz ar c'harger loc'ha� kent loc'ha� ar "
+"skeudenn\n"
+"genta�. Talvoudus eo war reizhiado� a loc'h diouzhtu adalek ar bladenn "
+"galet\n"
+"goude beza� enaouet ar stokellaoueg. Ne gortoz ket ar c'harger loc'ha� m'eo\n"
+"diso�jet \"gedvezh\" pe dermenet da mann.\n"
+"\n"
+"\n"
+"  - Mod video : a spisa ar mod skrid VGA a rankfe beza� diuzet pa loc'her.\n"
+"An talvoudo� a heul a zo hegerz :\n"
+"    * boas : a ziuz ar mod skrid 80x25 boas.\n"
+"    * <niver> : a implij ar mod skrid a zegouezh."
+
+#: ../../help.pm_.c:705
+#, fuzzy
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2062,7 +2671,7 @@ msgstr ""
 "sellet ha plijet oc'h gant an dibarzho�. Ma n'oc'h ket, e c'hellit\n"
 "mont war gil hag o c'hemma�, ken lies gwech ha ma karot."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2070,7 +2679,7 @@ msgstr ""
 "M'eo siek un dra bennak en ho kefluniadur X, implijit an dibarzho�-se\n"
 "a-benn keflunia� reizh ar reizhiad X Window."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2078,42 +2687,47 @@ msgstr ""
 "Ma kavit gwelloc'h implijout un ereadur grafikel, diuzit \"Ya\". Mod all,\n"
 "diuzit \"Ket\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\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"
+"\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"\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."
 msgstr ""
 "Gallout a rit brema� diuz bibarzho� a bep seurt evit ho reizhiad.\n"
 "\n"
@@ -2154,7 +2768,7 @@ msgstr ""
 "loc'her\n"
 "    diuzit an dibarzh-ma� (Evezh : ne daio ket en-dro dre ret dindan X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2170,187 +2784,131 @@ msgstr ""
 "ouzhpenn\n"
 "mar plij."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Dibabit ho yezh"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Diuzit renkad ar staliadur"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Dinoi� ar bladenn galet"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Keflunia� al logodenn"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Dibabit ho stokellaoueg"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "A bep seurt"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Keflunia� reizhiado� restro�"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Furmadi� parzhadurio�"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Dibabit pakado� da stalia�"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Stalia� ar reizhiad"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Keflunia� ur rouedad"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Rinegouriezh"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Keflunia� an takad-eur"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Keflunia� servijo�"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Keflunia� ar voullerez"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Termeni� tremenger root"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Ouzhpenna� un arveriad"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Kroui� ur bladennig loc'ha�"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Stalia� ar c'harger loc'ha�"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Keflunia� X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Pladennig stalia� emgefreek"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Dilezel ar staliadur"
 
-#: ../../install2.pm_.c:337
-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 ""
-"Ret eo deoc'h kaout ur parzhadur gwrizienn.\n"
-"Evit se, krouit ur parzhadur (pe glikit war unan a zo c'hoazh).\n"
-"Da c'houde dibabit an ober ``Poent marc'ha�'' ha lakait anezha� da `/'"
-
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"N'hella� ket lenn ho taolenn barzha�, re vrein eo evidon :(\n"
-"Klask a rin kenderc'hel en ur ziverka� ar parzhadurio� siek"
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Fazi en ur lenn ar restr $f"
 
-#: ../../install_any.pm_.c:351
-msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
-msgstr ""
-"Ne c'hellas ket DiskDrake lenn ent reizh an daolenn barzha�.\n"
-"Kendalc'hit war ho mar !"
+#: ../../install_gtk.pm_.c:426
+#, fuzzy
+msgid "Please test the mouse"
+msgstr "Dibabit seurt ho logodenn, mar plij."
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "O klask ar parzhadur gwrizienn."
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Dibabit seurt ho logodenn, mar plij."
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Titouro�"
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
+#: ../../install_interactive.pm_.c:23
 #, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s : N'eo ket ur parzhadur gwrizienn, diuzit un all mar plij."
-
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Parzhadur gwrizienn kavet ebet"
-
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "N'hella� ket implijout ar skigna� hep domani NIS"
-
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Fazi en ur lenn ar restr $f"
-
-#: ../../install_steps.pm_.c:75
 msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
+"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
+"You can find some information about them at: %s"
 msgstr ""
-"Degouezhet ez eus ur fazi, hogen n'ouzon ket e vera� naet.\n"
-"Kendalc'hit war ho mar."
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Poent marc'ha� doubl %s"
-
-#: ../../install_steps.pm_.c:323
+#: ../../install_interactive.pm_.c:41
 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"
+"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 ""
+"Ret eo deoc'h kaout ur parzhadur gwrizienn.\n"
+"Evit se, krouit ur parzhadur (pe glikit war unan a zo c'hoazh).\n"
+"Da c'houde dibabit an ober ``Poent marc'ha�'' ha lakait anezha� da `/'"
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Degemer e %s"
-
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Lenner pladennig hegerz ebet"
-
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
-#, c-format
-msgid "Entering step `%s'\n"
-msgstr "O kregi� gant al lankad `%s'\n"
-
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
+#: ../../install_interactive.pm_.c:46
 msgid "You must have a swap partition"
 msgstr "Ret eo deoc'h kaout ur parzhadur disloa�"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:47
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -2360,98 +2918,78 @@ msgstr ""
 "\n"
 "Kenderc'hel evelato ?"
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Dibabit ar ment a vennit stalia�"
+#: ../../install_interactive.pm_.c:68
+#, fuzzy
+msgid "Use free space"
+msgstr "Implij da savetei�"
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Ment hollek :"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Stumm : %s\n"
+#: ../../install_interactive.pm_.c:78
+#, fuzzy
+msgid "Use existing partition"
+msgstr "O furmadi� parzhadurio�"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "Ment : %d Ko\n"
+#: ../../install_interactive.pm_.c:80
+#, fuzzy
+msgid "There is no existing partition to use"
+msgstr "O klask assevel an daolenn barzha�"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Dibabit ar pakado� a vennit stalia�"
+#: ../../install_interactive.pm_.c:87
+#, fuzzy
+msgid "Use the Windows partition for loopback"
+msgstr "Implij da savetei�"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Titouro�"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Pe barzhadur a vennit implijout evit lakaat Linux4Win ?"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Stalia�"
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Dibabit ar mento�"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "O stalia�"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Ment ar parzhadur gwrizienn e Mo :"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Gortozit mar plij,"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Ment ar parzhadur disloa� e Mo :"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Amzer a chom"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Amzer hollek"
+#: ../../install_interactive.pm_.c:105
+#, fuzzy
+msgid "Which partition do you want to resize?"
+msgstr "Pe seurt parzhadur a vennit ?"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "O prienti� ar staliadur"
+#: ../../install_interactive.pm_.c:107
+#, fuzzy
+msgid "Computing Windows filesystem bounds"
+msgstr "O jedi� bevenno� ar reizhiad restro� FAT"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Installing package %s"
-msgstr "O stalia� ar pakad %s"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Kenderc'hel evelato ?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Ur fazi a zo bet en ur rumma� pakado� :"
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Implijout ar c'hefluniadur o ren evit X11 ?"
-
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Dibabit unan eus ar renkado� stalia� a-heul mar plij :"
-
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "N'hoc'h eus parzhadur windows ebet !"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "N'hoc'h eus ket a-walc'h a egor evit Lnx4win !"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_interactive.pm_.c:113
+#, fuzzy
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
 "dangerous. If you have not already done so, you should first exit the\n"
 "installation, run scandisk under Windows (and optionally run defrag), then\n"
 "restart the installation. You should also backup your data.\n"
@@ -2466,33 +3004,148 @@ msgstr ""
 "ar\n"
 "parzhadur-se, ha gwarezi� ho roado�. Pa vezit sur, gwaskit \"Mat eo\""
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
+#: ../../install_interactive.pm_.c:122
+#, fuzzy
+msgid "Which size do you want to keep for windows on"
+msgstr "Da beseurt rann e mennit dilec'hia� ?"
+
+#: ../../install_interactive.pm_.c:123
+#, fuzzy, c-format
+msgid "partition %s"
+msgstr "Parzhadur"
+
+#: ../../install_interactive.pm_.c:129
+#, fuzzy, c-format
+msgid "FAT resizing failed: %s"
 msgstr "Adventa� ent emgefreek sac'het"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Pe barzhadur a vennit implijout evit lakaat Linux4Win ?"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Dibabit ar mento�"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Ment ar parzhadur gwrizienn e Mo :"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Ment ar parzhadur disloa� e Mo :"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:156
+#, fuzzy, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "Goude adventa� ar parzhadur %s e vo kollet holl roado� ar parzhadur-se"
+
+#: ../../install_interactive.pm_.c:164
+#, fuzzy
+msgid "Expert mode"
+msgstr "Mailh"
+
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:171
+#, fuzzy, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Gallout a rit brema� parzha� ho pladenn galet %s\n"
+"Pa 'z eo graet, na ziso�jit ket enrolla� dre implijout `w'"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "N'hoc'h eus parzhadur windows ebet !"
+
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "N'hellan ouzpenna� parzhadur ebet ken"
+
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:218
+#, fuzzy, c-format
+msgid "Partitioning failed: %s"
+msgstr "Seurt taolenn barzha� : %s\n"
+
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "O la�sa� ar rouedad"
+
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "O tizenaoui� ar rouedad"
+
+#: ../../install_steps.pm_.c:74
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
+"Degouezhet ez eus ur fazi, hogen n'ouzon ket e vera� naet.\n"
+"Kendalc'hit war ho mar."
+
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Poent marc'ha� doubl %s"
+
+#: ../../install_steps.pm_.c:375
+msgid ""
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
+msgstr ""
+
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Degemer e %s"
+
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Lenner pladennig hegerz ebet"
+
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "O kregi� gant al lankad `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Dibabit unan eus ar renkado� stalia� a-heul mar plij :"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "Ment hollek ar strollado� hoc'h eus diuzet a zo war-dro %d Mo.\n"
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2506,7 +3159,7 @@ msgstr ""
 "Un dregantad izel a stalio hepken ar pakado� pouezusa�;\n"
 "un dregantad a 100%% a stalio an holl bakado� diuzet."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2522,58 +3175,101 @@ msgstr ""
 "Un dregantad izel a stalio hepken ar pakado� pouezusa�;\n"
 "un dregantad a %d%% a stalio kement a bakado� ma 'z eus tu."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "Tu vo deoc'h o dibab spisoc'h el lankad a zeu."
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Dregantad a bakado� da stalia�"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Dibabit ar pakado� a vennit stalia�"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Titouro�"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Stalia�"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Sujedigezh emgefreek"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Astenn ar wezenn"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Plega� ar wezenn"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Gwinta� etre kompez ha rummet dre strollad"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Pakad siek"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Anv: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Stumm : %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Ment : %d Ko\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Talvoudegezh : %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Ment hollek : %d / %d Mo"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+#, fuzzy
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr "N'hellit ket andiuz ar pakad-ma�. Staliet eo endo"
+
+#: ../../install_steps_gtk.pm_.c:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "Ar pakado� a-heul a zo war-nes beza� distaliet"
+
+#: ../../install_steps_gtk.pm_.c:387
+#, fuzzy
+msgid "The following packages are going to be removed"
+msgstr "Ar pakado� a-heul a zo war-nes beza� staliet/lamet"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "N'hellit ket diuz/andiuz ar pakad-ma�"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Hema� a zo ur pakad ret, n'hell ket beza� andiuzet"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "N'hellit ket andiuz ar pakad-ma�. Staliet eo endo"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2581,45 +3277,89 @@ msgstr ""
 "Bremanaet e tle beza� ar pabak-ma�\n"
 "Ha sur oc'h e mennit e ziuza� ?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "N'hellit ket andiuz ar pakad-ma�. Ret eo dezha� beza� bremanaet"
 
-#: ../../install_steps_gtk.pm_.c:493
-#, fuzzy
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr "N'hellit ket andiuz ar pakad-ma�. Staliet eo endo"
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Ar pakado� a-heul a zo war-nes beza� staliet/lamet"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "N'hellit ket diuz/andiuz ar pakad-ma�"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "O stalia�"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "O vrasjedi�"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Gortozit mar plij,"
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Amzer a chom"
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Amzer hollek"
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Nulla�"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "O prienti� ar staliadur"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pakad"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U Mo"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "O stalia� ar pakad %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Accept"
+msgstr "Aotren an arveriad"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2634,181 +3374,385 @@ msgstr ""
 "eo da c'houde.\n"
 "Ma n'ema� ket ganeoc'h gwaskit Nulla� evit chom hep stalia� ar Cd-Rom-se."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Adventa�"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Kenderc'hel evelato ?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Ur fazi a zo bet en ur rumma� pakado� :"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Ur fazi a zo bet en ur stalia� ar pakado� :"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Ur fazi a zo bet"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Diuzit ar yezh da implijout, mar plij."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Stokellaoueg"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Dibabit reizhadur ho stokellaoueg, mar plij."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr "Gallout a rit dibab yezho� all hag a vo hegerz goude stalia�"
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Parzhadur gwrizienn"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Pehini eo parzhadur gwrizienn (/) ho reizhiad ?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Renkad stalia�"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Pe renkad stalia� a fell deoc'h ?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Stalia�/Bremanaat"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "Hag ur staliadur pe ur bremanadur eo ?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Emgefreek"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Erbedet"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Neuziet"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Mailh"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
+#, fuzzy
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "Ha sur oc'h beza� ur mailh ? \n"
 "Na rit ket goap, trao� galloudus hogen arvarus a vo aotreet deoc'h ama�."
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Bremanaat"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Boas"
+#: ../../install_steps_interactive.pm_.c:222
+#, fuzzy
+msgid "Workstation"
+msgstr "Titouro�"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Diorren"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Servijer"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+#, fuzzy
+msgid "What is your system used for?"
 msgstr "Pe seurt a vo implij ho reizhiad ?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Dibabit seurt ho logodenn, mar plij."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Porzh al logodenn"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Dibabit ar porzh a-steud m'eo luget ho logodenn outa�, mar plij."
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "O keflunia� kartenno� PCMCIA..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "Keflunia� IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "parzhadur hegerz ebet"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%d Mo)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Dibabit ur parzhadur d'ober anezha� ho parzhadur gwrizienn, mar plij."
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Dibabit at poento� marc'ha�"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, fuzzy, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"N'hella� ket lenn ho taolenn barzha�, re vrein eo evidon :(\n"
+"Klask a rin kenderc'hel en ur ziverka� ar parzhadurio� siek"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"Ne c'hellas ket DiskDrake lenn ent reizh an daolenn barzha�.\n"
+"Kendalc'hit war ho mar !"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Parzhadur gwrizienn"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Pehini eo parzhadur gwrizienn (/) ho reizhiad ?"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Ret eo deoc'h adloc'ha� evit ma talvezo kemmo� an daolenn barzha�"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Dibabit ar parzhadur a vennit furmadi�"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Gwiria� ar bloc'ho� siek ?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "O furmadi� parzhadurio�"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "O kroui� hag o furmadi� ar restr savetei� %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Ket a-walc'h a zisloa� evit peurstalia�, kreskit anezha� mar plij"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "O klask ar pakado� hegerz"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "O kavout pakado� da vremanaat"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, fuzzy, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr "Ho reizhiad n'eus ket wa-walc'h a egor evit stalia� pe vremanaat"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Complete (%dMB)"
+msgstr "Boas"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Minimum (%dMB)"
+msgstr "(%d Mo)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Recommended (%dMB)"
+msgstr "Erbedet"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "Neuziet"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Dibabit ar ment a vennit stalia�"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Diuzadenn strollad pakado�"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Diuz pakado� unan hag unan"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2818,12 +3762,12 @@ msgstr ""
 "Ma n'hoc'h eus hini eus ar CDo�-se, gwaskit Nulla�.\n"
 "Ma fazi deoc'h lod eus ar CDo�, andiuzit anezho ha gwaskit Mat eo."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom skridennet \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2831,174 +3775,11 @@ msgstr ""
 "O stalia� ar pakad %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Kefluniadur goude stalia�"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Derc'hel ar c'hefluniadur IP o ren"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Adgeflunia� ar rouedad brema�"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Na geflunia� ar rouedad"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Kefluniadur ar rouedad"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Kefluniet eo bet ar rouedad lec'hel endeo. Ha mennout a rit :"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Ha mennout a rit keflunia� ur rouedad lec'hel evit ho reizhiad ?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "kartenn rouedad kavet ebet"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Keflunia� ar modem"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr ""
-"Ha mennout a rit keflunia� ur gevreadenn gervel dre modem evit ho reizhiad ?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "O keflunia� an drobarzhell rouedad %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Skrivit ar c'hefluniadur IP evit ar benveg-ma� mar plij.\n"
-"Pep mellad a zlefe beza� skrivet evel ur chomlec'h IP e stumm\n"
-"sifro� dekvel piko� etrezo (da skouer 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "IP emgefreek"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "Chomlec'h IP :"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Maskl rouedad :"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "Er furmad 1.2.3.4 e tlefe beza� ar chomlec'h IP"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Keflunia� ar rouedad"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Roit ho anv ostiz mar plij.\n"
-"Un anv peurzoareet a zlefe beza� hini o ostiz,\n"
-"evel ``mabenveg.mastal.makomp.com''.\n"
-"Gallout a rit ivez rei� chomlec'h IP an dreuzell m'hoc'h eus unan"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "Servijer DNS :"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Trobarzhell an dreuzell :"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Treuzell :"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Anv an ostiz :"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Klask kavout ur modem ?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Dibabit ouzh pe borzh a-steud eo luget ho modem, mar plij."
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Dibarzho� sifrenna�"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Anv ar gevreadenn"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Niverenn bellgomz"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Anv erea�"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Dilesadur"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Diazezet war ur skrid"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Diazezet war un dermenell"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Anv domani"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Servijer DNS kenta�"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Eil servijer DNS"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3070,88 +3851,94 @@ msgstr ""
 "Altadena California 91001\n"
 "SUA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Dibabit ur melezour da dapout ar pakado� diwarna�"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "O tarempredi� ar melezour evit kaout roll ar pakado� hegerz"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Dibabit ar pakado� a vennit stalia�, mar plij."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
+#, fuzzy
 msgid "Which is your timezone?"
-msgstr "Pehini eo ho takad-eur ?"
+msgstr "Pe seurt a vo implij ho reizhiad ?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Ha war GMT eo lakaet ho eurier periantel ?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "Pe seurt parzhadur a vennit ?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Tremenger ebet"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Implijout ur restr kuzhet"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "kuzhet"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Implijout tremegerio� MD5"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Implijout NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "pajenno� melen"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "Re eeun eo an tremenger-se (%d arouezenn a zo ret d'an nebeuta�)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Dilesadur NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "Domani NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "Servijer NIS"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Aotren an arveriad"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Ouzhpenna� un arveriad"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(ouzhpennet %s endeo)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3161,37 +3948,37 @@ msgstr ""
 "Skrivit un arveriad\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Anv gwirion"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Anv arveriad"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Arlun"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Re eeun eo an tremeger"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Roit un anv arveriad mar plij"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -3199,24 +3986,54 @@ msgstr ""
 "An anv arveriad a zle beza� enna� lizherenno� munut, sifro�, `-' ha `_' "
 "hepken"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "En implij eo an anv arveriad-se endeo"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+#, fuzzy
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Ur bladenn loc'ha� neuziet a ro un tu da loc'ha� ho reizhiad Linux hep "
+"beza�\n"
+"dindan beli ar c'harger loc'ha� boas. Talvoudus eo ma ne mennit ket stalia� "
+"LILO\n"
+"(pe grub) war ho reizhiad, pe ma skarzh ur reizhiad oberia� LILO, pe ma ne\n"
+"da ket en-dro LILO war ho kefluniadur periantel. Ur bladenn loc'ha� neuziet\n"
+"a c'hell ivez beza� implijet gant ar skeudenn savetei� Mandrake, en ur "
+"aesaat an\n"
+"assevel pa vefec'h sac'het grevus. Mennout a rit kroui� ur bladenn loc'ha� "
+"evit\n"
+"ho reizhiad ?"
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Lenner pladennig kenta�"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Eil lenner pladennig"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Tremen e-biou"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3241,65 +4058,34 @@ msgstr ""
 "evit\n"
 "ho reizhiad ?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Ho tigarez, lenner pladennig hegerz ebet"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 "Dibabit al lenner pladennig a vennit implijout evit ober ar bladenn loc'ha�"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Lakait ur bladennig el lenner %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "O kroui� ar bladenn loc'ha�"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "Staliadur LILO a zo sac'het. Degouezhet eo ar fazi a heul :"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Mennout a rit implijout SILO ?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "Dibarzho� penna� SILO"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Setu da heul enmonto� a vez e SILO.\n"
-"Gallout a rit ouzhpenna� lod pe gemma� a re a zo."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Parzhadur"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "War implij eo ar skridennad-se endeo"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "Staliadur SILO zo sac'het. Degouezhet eo ar fazi a heul :"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "O prienti� ar c'harger loc'ha�"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
+#, fuzzy
 msgid "Do you want to use aboot?"
-msgstr "Mennout a rit implijout aboot ?"
+msgstr "Mennout a rit implijout SILO ?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3307,125 +4093,114 @@ msgstr ""
 "Fazi en ur stalia� aboot,\n"
 "klask redia� ar staliadur zoken ma tistruj ar parzhadur kenta� ?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Keflunia� ar proksio�"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "Proksi HTTP"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "Proksi FTP"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "http://... a zlefe beza� ar proksi"
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "ftp://... a zlefe beza� ar proksi"
+#: ../../install_steps_interactive.pm_.c:925
+#, fuzzy
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "Staliadur LILO a zo sac'het. Degouezhet eo ar fazi a heul :"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Bezit deuet mat, preizherien !"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Paour"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Izel"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Etre"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Uhel"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Ankeniet"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Goulenno� a bep seurt"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(a c'hell breina� roado�)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Implijout gwelladur ar bladenn galet ?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Dibabit al live surentez"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Spisait ment ar memor vev diouzh ret (kavet %d Mo)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Emvarc'ha� ar skoro� lem/laka"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Skara� /tmp bep ma loc'her"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Aotren lies trolinenn"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Enaoui� KrouilhNiv pa loc'her"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Roit ment ar memor vev e Mo"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "N'hellan ket implijout supermount el live surentez uhel"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"Genel a raio DrakX restro� keflunia� ken evit XFree 3.3 ken evit XFree 4.0\n"
-"Dre ziouer eo implijet ar servijer 3.3 hag a ya en-dro war muioc'h a "
-"c'hartenno� grafek.\n"
-"Ha mennout a rit klask XFree 4.0 ?"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Klask kavout trobarzhello� PCI ?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Implijout ar c'hefluniadur o ren evit X11 ?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Lakait ur bladennig gwerc'h el lenner %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "O kroui� ur bladennig stalia� emgefreek"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3435,7 +4210,7 @@ msgstr ""
 "\n"
 "Mennout a rit kuitaat da vat brema� ?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3456,155 +4231,18 @@ msgstr ""
 "Titouro� war geflunia� ho reizhiad a zo hegerz e rannbennad Goude\n"
 "Stalia� Sturier ofisiel an Arveriad Linux-Mandrake."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "O tizenaoui�"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "O stalia� ur sturier evit kartenn %s %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(mollad %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Pe sturier %s a zlefen amproui� ?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"E degouezho� 'zo, ar sturier %s en deus ezhomm titouro� ouzhpenn evit mont\n"
-"en-dro reizh, daoust ma da en-dro mat hepto peurvuia�. Ha mennout a rit "
-"spisaat\n"
-"dibabo� ouzphenn evita�, pe aotren d'ar sturier amproui� ho penvek evit\n"
-"an titouro� en deus ezhomm ? A-wecho�, amproui� a c'hell sac'ha� un "
-"urzhiataer,\n"
-"hogen ne raio reuz ebet."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Embroui�"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Spisait dibarzho�"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Brema� e c'hellit pourveza� e zibarzho� d'ar mollad %s"
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Brema� e c'hellit pourveza� e zibarzho� d'ar mollad %s.\n"
-"Diouzh ar furmad ``anv=talvoud anv2=talvoud2...'' eo an dibabo�.\n"
-"Da skouer, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Dibarzho� ar mollad :"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Karga� ar mollad %s a zo sac'het.\n"
-"Mennout a rit klask adarre gant arventenno� all ?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Klask kavout kartenno� PCMCIA ?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "O keflunia� kartenno� PCMCIA..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Klask kavout trobarzhello� %s ?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Kavet etrefas %s %s"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Hag un all hoc'h eus ?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Hag un etrefas %s bennak a zo ganeoc'h ?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Ket"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Ya"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Gwelet titouro� periantel"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "O la�sa� ar rouedad"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "O tizenaoui� ar rouedad"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Staliadur Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> etre elfenno� | <Esaouenn> a ziuz | <F12> skramm a heul "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"Gallout a rit brema� parzha� ho pladenn galet %s\n"
-"Pa 'z eo graet, na ziso�jit ket enrolla� dre implijout `w'"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Gortozit mar plij"
 
@@ -3614,7 +4252,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Amsklaer (%s), bezit spisoc'h\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Dibab fall, klaskit adarre\n"
 
@@ -3628,453 +4266,976 @@ msgstr "? (%s dre ziouer)"
 msgid "Your choice? (default %s) "
 msgstr "Ho tibab ? (%s dre ziouer)"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Ho tibab ? (%s dre ziouer, skrivit `none' evit hini ebet)"
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "Tchek"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Alaman"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Spagnol"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Finnek"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Gall"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norvegek"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Polonek"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Rusiek"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Stokellaoueg RU"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "Stokellaoueg SUA"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armeniek (kozh)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armeniek (skriverez)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armeniek (soniadel)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belgian"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulgarek"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasilek"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 #, fuzzy
 msgid "Belarusian"
 msgstr "Bulgarek"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Suis (reizhadur alaman)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Suis (reizhadur gall)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Alaman (stokell marv ebet)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Danek"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+#, fuzzy
+msgid "Dvorak (US)"
+msgstr "Dvorak"
+
+#: ../../keyboard.pm_.c:139
+#, fuzzy
+msgid "Dvorak (Norwegian)"
+msgstr "Norvegek"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Estoniek"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Jorjiek (reizhadur \"Rusiek\")"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Jorjiek (reizhadur \"Latin\")"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Gresian"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Kroatek"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Israelian"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Israelian (soniadel)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+#, fuzzy
+msgid "Iranian"
+msgstr "Ukrainiek"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islandek"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Italian"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Amerikan Latin"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Hollandek"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 #, fuzzy
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lituaniek AZERTY"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 #, fuzzy
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lituaniek AZERTY"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lituaniek QUERTY \"linenn sifro�\""
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituaniek QUERTY \"soniadel\""
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Polonek (reizhadur qwerty)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Polonek (reizhadur qwerty)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugalek"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanadian (Kebek)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Rusiek (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Svedek"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Slovek"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slovakek"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Stokellaoueg Thai"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turkek (hengounel doare \"F\")"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turkek (arnevez doare \"Q\")"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukrainiek"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "Stokellaoueg SUA (etrevroadel)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+#, fuzzy
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Lituaniek QUERTY \"linenn sifro�\""
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Yougoslaviek (reizhadur latin)"
 
-# 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
-#
-# '�'    is the '�' (ntilde) in cp437 encoding.
-# '\227' is the '�' (ugrave) in cp437 encoding. 
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Logodenn Sun"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+#, fuzzy
+msgid "GlidePoint"
+msgstr "ALPS GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Logodenn Kensington Thinking"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Rummel"
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "live"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "a-steud"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Logodenn rummel 2 nozelenn"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Logodenn rummel 3 nozelenn"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech doare CC (a-steud)"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+#, fuzzy
+msgid "MM Series"
+msgstr "Doare MM"
+
+#: ../../mouse.pm_.c:59
+#, fuzzy
+msgid "MM HitTablet"
+msgstr "MM HitTablet (a-steud)"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logodenn Logitech (a-steud, seurt C7 kozh)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Logodenn ebet"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+#, fuzzy
+msgid "none"
+msgstr "Graet"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Logodenn ebet"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Ha reizh eo ?"
+
+#: ../../netconnect.pm_.c:93
+#, fuzzy
+msgid "Internet configuration"
+msgstr "Keflunia� ar proksio�"
+
+#: ../../netconnect.pm_.c:94
+#, fuzzy
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Mennout a rit amproui� ar c'hefluniadur ?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Keflunia� ur rouedad"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Da beseurt pladenn e mennit dilec'hia� ?"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Anv ar gevreadenn"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+#, fuzzy
+msgid "ISDN Configuration"
+msgstr "Kefluniadur"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "Keflunia� ar proksio�"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr ""
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr ""
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr ""
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:169
+#, fuzzy
+msgid "Provider phone number"
+msgstr "Niverenn bellgomz"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr ""
+
+#: ../../netconnect.pm_.c:172
+#, fuzzy
+msgid "Dialing mode"
+msgstr "Anv domani"
+
+#: ../../netconnect.pm_.c:174
+#, fuzzy
+msgid "Account Login (user name)"
+msgstr "Poent marc'ha�"
+
+#: ../../netconnect.pm_.c:175
+#, fuzzy
+msgid "Account Password"
+msgstr "Tremenger"
+
+#: ../../netconnect.pm_.c:176
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Tremenger"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "Amproui� ar c'hefluniadur"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:214
+#, fuzzy
+msgid "Which protocol do you want to use ?"
+msgstr "Pe seurt parzhadur a vennit ?"
+
+#: ../../netconnect.pm_.c:224
+#, fuzzy
+msgid "ISA / PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+#, fuzzy
+msgid "PCI"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr ""
+
+#: ../../netconnect.pm_.c:233
+#, fuzzy
+msgid "What kind of card do you have?"
+msgstr "Peseurt moullerez hoc'h eus ?"
+
+#: ../../netconnect.pm_.c:239
+#, fuzzy
+msgid "Continue"
+msgstr "Kenderc'hel evelato ?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr ""
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:257
+#, fuzzy
+msgid "Which is your ISDN card ?"
+msgstr "Pehini eo ho takad-eur ?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:287
+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 ""
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr ""
+
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "Dibabit ar ment nevez"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Dibabit ar porzh a-steud m'eo luget ho logodenn outa�, mar plij."
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
+"Do you agree?"
 msgstr ""
-"Degemer mat e LILO, an dibaber reizhiad oberia� !\n"
+
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Mennout a rit amproui� ar c'hefluniadur ?"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "Kefluniadur"
+
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "Mennout a rit implijout aboot ?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Klask kavout ur modem ?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Dibabit ouzh pe borzh a-steud eo luget ho modem, mar plij."
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Dibarzho� sifrenna�"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Anv ar gevreadenn"
+
+#: ../../netconnect.pm_.c:546
+#, fuzzy
+msgid "Phone number"
+msgstr "Niverenn bellgomz"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Anv erea�"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Dilesadur"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Diazezet war ur skrid"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Diazezet war un dermenell"
+
+#: ../../netconnect.pm_.c:550
+#, fuzzy
+msgid "Domain name"
+msgstr "Anv ar gevreadenn"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Servijer DNS kenta�"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Eil servijer DNS"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
 "\n"
-"Evit rolla� an dibabo� aotreet, stokit <TAB>.\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Anv ar gevreadenn"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
 "\n"
-"Evit karga� unan anezho, skrivit e anv ha stokit <ENKAS> pe c'hortozit %d "
-"eilenn evit al loc'ha� dre ziouer.\n"
+"You can reconfigure your connection."
+msgstr "Keflunia� ur rouedad"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Da beseurt pladenn e mennit dilec'hia� ?"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
 "\n"
+"You can disconnect or reconfigure your connection."
+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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Degemer mat e GRUB an dibaber reizhiad oberia� !"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Da beseurt pladenn e mennit dilec'hia� ?"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "Implijit ar stokello� %c ha %c evit diuz pe enmont zo war wel"
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Anv ar gevreadenn"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Stokit enkas evit loc'ha� ar RK diuzet, 'e' evit aoza� an"
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Anv ar gevreadenn"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "urzhiado� kent loc'ha�, pe 'c' evit ul linenn-urzhia�."
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Keflunia� ur rouedad"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "An enmont war wel a vo loc'het ent emgefreek e %d eilenn."
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "Lugerezh ar voullerez"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Gorretaol"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Keflunia� ur rouedad"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Meuziad La�sa�"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Keflunia� ur rouedad"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Logodenn Sun"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr ""
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Logodenn Apple ADB"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Mailh"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Logodenn Apple ADB (2 nozelenn)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+#, fuzzy
+msgid "Connect to the Internet"
+msgstr "Anv ar gevreadenn"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Logodenn Apple ADB (3 nozelenn pe vuioc'h)"
+#: ../../netconnect.pm_.c:672
+#, fuzzy
+msgid "What kind is your ISDN connection?"
+msgstr "Ouzh pe borzh a-steud eo luget ho logodenn ?"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Logodenn Apple ADB "
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Keflunia� ur rouedad"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Logodenn Apple USB (2 nozelenn)"
+#: ../../netconnect.pm_.c:700
+#, fuzzy
+msgid "France"
+msgstr "Nulla�"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Logodenn Apple USB (3 nozelenn pe vuioc'h)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr ""
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Logodenn rummel (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr ""
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Logodenn rummel 3 nozelenn (PS/2)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "Mailh"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Logodenn Kensington Thinking (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Keflunia� ur rouedad"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Pe seurt parzhadur a vennit ?"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Keflunia� ur rouedad"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "Keflunia� ur rouedad"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "Logodenn bus ATI"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Kefluniadur ar rouedad"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Logodenn bus Microsoft"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Mennout a rit amproui� ar c'hefluniadur ?"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logodenn bus Logitech"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "Keflunia� ur rouedad"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "Logodenn USB"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Anv ar gevreadenn"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "Logodenn USB (3 nozelenn pe vuioc'h)"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "Kefluniet eo bet ar rouedad lec'hel endeo. Ha mennout a rit :"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Logodenn ebet"
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "Da beseurt pladenn e mennit dilec'hia� ?"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Stumm 2.1A pe uheloc'h (a-steud)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Kefluniadur ar rouedad"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech doare CC (a-steud)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (a-steud)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "kartenn rouedad kavet ebet"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (a-steud)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Keflunia� ar rouedad"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (a-steud)"
+#: ../../network.pm_.c:274
+#, fuzzy
+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 ""
+"Roit ho anv ostiz mar plij.\n"
+"Un anv peurzoareet a zlefe beza� hini o ostiz,\n"
+"evel ``mabenveg.mastal.makomp.com''.\n"
+"Gallout a rit ivez rei� chomlec'h IP an dreuzell m'hoc'h eus unan"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (a-steud)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+#, fuzzy
+msgid "Host name"
+msgstr "Anv an ostiz :"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "Doare MM (a-steud)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (a-steud)"
+#: ../../network.pm_.c:302
+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 ""
+"Skrivit ar c'hefluniadur IP evit ar benveg-ma� mar plij.\n"
+"Pep mellad a zlefe beza� skrivet evel ur chomlec'h IP e stumm\n"
+"sifro� dekvel piko� etrezo (da skouer 1.2.3.4)."
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logodenn Logitech (a-steud, seurt C7 kozh)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "O keflunia� an drobarzhell rouedad %s"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (a-steud)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "IP emgefreek"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Logodenn rummel (a-steud)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "IP address"
+msgstr "Chomlec'h IP :"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Kenglotus Microsoft (a-steud)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Netmask"
+msgstr "Maskl rouedad :"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Logodenn rummel 3 nozelenn (a-steud)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (a-steud)"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "Er furmad 1.2.3.4 e tlefe beza� ar chomlec'h IP"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Ha reizh eo ?"
+#: ../../network.pm_.c:341
+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 ""
+"Roit ho anv ostiz mar plij.\n"
+"Un anv peurzoareet a zlefe beza� hini o ostiz,\n"
+"evel ``mabenveg.mastal.makomp.com''.\n"
+"Gallout a rit ivez rei� chomlec'h IP an dreuzell m'hoc'h eus unan"
+
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "Servijer DNS :"
+
+#: ../../network.pm_.c:347
+#, fuzzy
+msgid "Gateway"
+msgstr "Treuzell :"
+
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "Trobarzhell an dreuzell :"
+
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Kefluniadur goude stalia�"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "Proksi HTTP"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "Proksi FTP"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "http://... a zlefe beza� ar proksi"
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "ftp://... a zlefe beza� ar proksi"
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4084,21 +5245,21 @@ msgstr ""
 "Fi�val ar parzhadurio� kenta� derez evit ma vo an toull stok ouzh ar "
 "parzhadurio� astennet eo an diskoulm"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fazi en ur lenn ar restr %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Assevel adalek ar restr %s sac'het %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Restr gwarezi� siek"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Fazi en ur skriva� er restr %s"
@@ -4132,42 +5293,56 @@ msgstr "dedennus"
 msgid "maybe"
 msgstr "marteze"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (a-bouez)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (brav-tre)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (brav)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Diskouez nebeutoc'h"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Diskouez muioc'h"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Moullerez lec'hel"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+#, fuzzy
+msgid "Remote printer"
+msgstr "Dibarzho� ar voullerez lpd a-bell"
+
+#: ../../printer.pm_.c:21
+#, fuzzy
+msgid "Remote CUPS server"
+msgstr "Steud a-bell"
+
+#: ../../printer.pm_.c:22
+#, fuzzy
+msgid "Remote lpd server"
 msgstr "lpd a-bell"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "Dibarzho� ar voullerez NetWare"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Trobarzhell ar voullerez"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "O tinoi� trobarzhello�..."
@@ -4181,11 +5356,11 @@ msgstr "Amproui� ar porzhio�"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Ur voullerez, doare \"%s\", zo bet dinoet war "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Trobarzhell voullerez lec'hel"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4193,15 +5368,15 @@ msgstr ""
 "Ouzh pe drobarzhell eo luget ho moullerez  \n"
 "(taolit evezh /dev/lp0 a zo kevatal da LPT1:) ?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Trobarzhell ar voullerez"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Dibarzho� ar voullerez lpd a-bell"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4211,19 +5386,19 @@ msgstr ""
 "pourveza� anv ostiz ar servijer moulla� hag anv as steud\n"
 "war ar servijer-se ma zlefe beza� kaset an dleado� moulla�."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Anv an ostiz a-bell"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Steud a-bell"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Dibarzho� moulla� SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4237,27 +5412,27 @@ msgstr ""
 "kement hag anv rannet ar voullerez a glaskit tizhout ha ne vern pe\n"
 "ditour a anv arveriad, tremenger ha strollad labour en implij."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "Anv ar servijer SMB"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP ar servijer SMB"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Anv rannet"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Strollad labour"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "Dibarzho� ar voullerez NetWare"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4269,130 +5444,155 @@ msgstr ""
 "anv ostiz TCP/IP !) kement hag anv ar steud moulla� evit ar voullerez\n"
 "a glaskit tizhout ha ne vern pe anv arveriad ha tremenger en implij."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Servijer moulla�"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Anv ar steud moulla�"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "Dibarzho� ar voullerez NetWare"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "Dibarzho� ar voullerez"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "Paour"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Peseurt moullerez hoc'h eus ?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Ha mennout a rit amproui� moulla� skrid ?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "O voulla� pajenn(o�) skrid..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"Pajenn(o�) arnod zo bet kaset d'an diaoul moulla�.\n"
+"Ur pennadig e c'hell padout a-raok ma loc'hfe a voullerez.\n"
+"Stad ar moulla� :\n"
+"%s\n"
+"\n"
+"Ha mont a ra en-dro reizh ?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"Pajenn(o�) arnod zo bet kaset d'an diaoul moulla�.\n"
+"Ur pennadig e c'hell padout a-raok ma loc'hfe a voullerez.\n"
+"Ha mont a ra en-dro reizh ?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Ya, moullit ur bajenn arnod ASCII"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Ya, moullit ur bajenn arnod PostScript"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Ya, moullit an div bajenn arnod"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Keflunia� ar voullerez"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Peseurt moullerez hoc'h eus ?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Dibarzho� ar voullerez"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Ment ar paper"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Stlepel ar bajenn goude moulla� ?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Dibarzho� ar sturier Uniprint"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Dibarzho� donder liv"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Moulla� skrid evel PostScript ?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Eilpenna� urzh ar pajenno�"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Kempenn an efed-diri ?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Niver a bajenno� dre bajenn ziskas"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Marzo� Deho�/Kleiz e poento� (1/72 ur meudad)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Marzo� Krec'h/Trao� e poento� (1/72 ur meudad)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Dibarzho� GhostScript ouzhpenn"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Dibarzho� skrid ouzhpenn"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Ha mennout a rit amproui� moulla� skrid ?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "O voulla� pajenn(o�) skrid..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"Pajenn(o�) arnod zo bet kaset d'an diaoul moulla�.\n"
-"Ur pennadig e c'hell padout a-raok ma loc'hfe a voullerez.\n"
-"Stad ar moulla� :\n"
-"%s\n"
-"\n"
-"Ha mont a ra en-dro reizh ?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"Pajenn(o�) arnod zo bet kaset d'an diaoul moulla�.\n"
-"Ur pennadig e c'hell padout a-raok ma loc'hfe a voullerez.\n"
-"Ha mont a ra en-dro reizh ?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Moullerez"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Mennout a rit keflunia� ur voullerez ?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4400,19 +5600,69 @@ msgstr ""
 "Setu da heul ar steudado� moulla�.\n"
 "Gallout a rit ouzhpenna� lod pe gemma� a re a zo."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "O vrasjedi�"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Diuzit lugerezh ar voullerez"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Penaos eo luget ar voullerez ?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+#, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "Diuzit lugerezh ar voullerez"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Lemel ar steudad"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+#, fuzzy
+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 ""
+"Pep steud moulla� (m'eo kaset an dleado� moulla� daveta�) en deus\n"
+"ezhomm un anv (lp alies) hag ur renkell spool kevret ganta�. Pe anv\n"
+"ha renkell a zo da implijout evit ar steud-ma� ha penaos eo luget ar "
+"voullerrez ?"
+
+#: ../../printerdrake.pm_.c:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "Moullerez lec'hel"
+
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "Spisait dibarzho�"
+
+#: ../../printerdrake.pm_.c:406
+#, fuzzy
+msgid "Location"
+msgstr "Titouro�"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4424,45 +5674,45 @@ msgstr ""
 "ha renkell a zo da implijout evit ar steud-ma� ha penaos eo luget ar "
 "voullerrez ?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Anv ar steud"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Renkell ar spool"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Lugerezh ar voullerez"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "N'hellan ket ouzhpenna� ur parzhadur da RAID md%d _furmadet_"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "N'hellan ket skriva� e $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid sac'het"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid sac'het (raidtools a vank emicha�s ?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ket a-walc'h a parzhadurio� evit RAID live %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, ur steu�vaer urzhiado� mareadek."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4471,7 +5721,7 @@ msgstr ""
 "syslog.\n"
 "Gallout a ra ivez servijout da lazha� an ardivink pa vez izel an daspugner."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4479,7 +5729,7 @@ msgstr ""
 "Seveni� an urzhiado� steu�vaet gant an urzhiad at d'ar pred laket pa 'z eo\n"
 "bet sevenet at, ha seveni� urzhiado� dre lod pa 'z eo izel a-walc'h ar garg."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4491,7 +5741,7 @@ msgstr ""
 "arc'hwelo�\n"
 "d'ar cron UNIX diazez, en o zouez surentez ha dibarzho� keflunia� gwelloc'h."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4502,7 +5752,7 @@ msgstr ""
 "Midnight Commander. Rei� a ra tu da seveni� obererezho� troc'ha�-ha-pega�,\n"
 "ha skor evit meuziado� kemperzhel war al letrin."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4510,7 +5760,7 @@ msgstr ""
 "Ur servijer evit ar Gwiad Bedel eo Apache. Implijet e vez evit servija�\n"
 "restro� HTML ha CGI."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4525,7 +5775,7 @@ msgstr ""
 "eo, en o zouez telnet, ftp, rsh, and rlogin. Dizoberia� inetd a zizoberia\n"
 "an holl servijo� m'eo e� atebek warno."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4535,7 +5785,7 @@ msgstr ""
 "/etc/sysconfig/keyboard. Dre ar maveg kbdconfig e c'hell beza� diuzet\n"
 "kement-se. Gwell deoc'h leuskel se gweredekaet war darn vuia� an ardivinko�."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4543,7 +5793,7 @@ msgstr ""
 "An diaoul moulla� ret evit ma dafez en-ro reizh lpr eo lpd. Dre vras\n"
 "ez eo ur servijer a vera dleado� moulla� evir ar voullerez(ed)."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4551,7 +5801,7 @@ msgstr ""
 "named (BIND) a zo ur Servijer Anvio� Domani (DNS) a zo implijet evit\n"
 "amdrei� anvio� ostiz e chomlec'hio� IP."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4559,7 +5809,7 @@ msgstr ""
 "Evit marc'ha� ha divarc'ha� poento� marc'ha� an holl Reizhiado� Restro�\n"
 "Rouedad (NFS), SMB (Lan Manager/Windows) ha NCP (NetWare)."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4567,7 +5817,7 @@ msgstr ""
 "Oberia/Dizoberia an holl etrefaso� rouedad kefluniet da la�sa�\n"
 "da vare al loc'ha�."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4577,7 +5827,7 @@ msgstr ""
 "Ar servij-ma� a bourvez arc'hwelo� ur servijer NFS, a vez kefluniaet dre ar\n"
 "restr /etc/exports."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4585,7 +5835,7 @@ msgstr ""
 "NFS a zo ur c'homenad brudet evit ranna� restro� dre rouedado�\n"
 "TCP/IP. Ar servij-ma� a bourvez un arc'hwel morailha� restro� NFS."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4597,7 +5847,7 @@ msgstr ""
 "diarvar\n"
 "e stalia� war ardivinko� n'o deus ket ezhomm anezha�."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4609,7 +5859,7 @@ msgstr ""
 "en-dro\n"
 "war ardivinko� anezho servijerien komenado� a implij ar reizhiad  RPC."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4617,7 +5867,7 @@ msgstr ""
 "Ur Gwazour Treuzdougen Postel eo Postfix, a zo ar goulev a\n"
 "zilech postelo� etre un ardivink hag un all."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4625,7 +5875,7 @@ msgstr ""
 "Enroll hag assav poul dizurzh ar reizhiad evit genel nivero�\n"
 "dargouezhek gant gwelloc'h perzhded."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4636,7 +5886,7 @@ msgstr ""
 "bihan,\n"
 "ezhomm a zo komenado� hencha� kemplezhoc'h evit rouedado� rouestlet."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4644,7 +5894,7 @@ msgstr ""
 "Ar c'homenad rstat a ro tu da implijerien ur rouedad da zastum\n"
 "muzulio� barregezh diwar ne vern pe ardivink er rouedad-se."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4652,7 +5902,7 @@ msgstr ""
 "Ar c'homenad rusers a ro tu da implijerien ur rouedad da anavezout piv\n"
 "a zo kevreet ouzh ardivinko� all a respont."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4662,7 +5912,7 @@ msgstr ""
 "kevreet ouzh un ardivink ma da en-dro warna� an diaoul rwhod (he�vel ouzh "
 "finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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."
@@ -4671,57 +5921,201 @@ msgstr ""
 "c'hemennado�\n"
 "e kerzhlevrio� liesseurt ar reizhiad. Ur mennozh mat eo seveni� ingal syslog."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr "An urzhiaoueg loc'ha� a glask karga� mollado� evit ho logodenn usb."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
 "Enaou ha dizenaou ar servijer Fonto� X da vare al loc'ha� hag al lazha�."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Dibabit pe servijo� a zlefe beza� la�set ent emgefreek pa loc'her"
 
-# This message is shown before booting Linux; so the encoding depends
-# on what the hardware supports... it is safer to assume ascii-only
-# � and � etc are transcribed unaccented.
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Degemer mat e SILO, an dibaber reizhiad oberia� !\n"
-"\n"
-"Evit rolla� an dibabo� aotreet, stokit <TAB>.\n"
-"\n"
-"Evit karga� unan anezho, skrivit e anv ha stokit <ENKAS> pe c'hortozit %d "
-"eilenn evit al loc'ha� dre ziouer.\n"
-"\n"
+"N'hella� ket lenn ho taolenn barzha�, re vrein eo evidon :(\n"
+"Klask a rin kenderc'hel en ur ziverka� ar parzhadurio� siek"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Keflunia� LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Kroui� ur bladennig loc'ha�"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Furmadi� ar bladennig"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Dibab"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "Staliadur LILO a zo sac'het. Degouezhet eo ar fazi a heul :"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Taolenn"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Keflunia� X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Taolenn"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+#, fuzzy
+msgid "Internet Connection Sharing"
+msgstr "Lugerezh ar voullerez"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Anv domani"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "o lenn ar c'hefluniadur"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Keflunia� IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Gourc'hemenno�!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4787,23 +6181,36 @@ msgstr "O termeni� al live surentez"
 msgid "Choose the tool you want to use"
 msgstr "Dibabit ar benveg a vennit stalia�"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Petra eo reizhadur ho stokellaoueg ?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Kemma� ar spister"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Peseurt eo ho logodenn ?"
+#: ../../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 ""
+"Kemmit ho Cd-Rom!\n"
+"\n"
+"Lakait el lenner ar Cd-Rom warna� an diketenn \"%s\" mar plij ha gwaskit Mat "
+"eo da c'houde.\n"
+"Ma n'ema� ket ganeoc'h gwaskit Nulla� evit chom hep stalia� ar Cd-Rom-se."
+
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "serial_usb kavet ebet\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Kendarvan an trede nozelenn ?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Ouzh pe borzh a-steud eo luget ho logodenn ?"
 
@@ -5016,15 +6423,829 @@ msgstr "O klask delio�"
 msgid "Finding leaves takes some time"
 msgstr "Klask delio� a bad ur frapadig"
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Keflunia� ar proksio�"
+
+#, fuzzy
+msgid "Internet"
+msgstr "dedennus"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Burev"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Liesvedia"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Liesvedia"
+
+msgid "KDE"
+msgstr "KDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Liesvedia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Liesvedia"
+
+#, fuzzy
+msgid "Gnome"
+msgstr "Graet"
+
+msgid "Documentation"
+msgstr "Teuliadur"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Liesvedia"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Dibabit ar ment a vennit stalia�"
+
+#~ msgid "Total size: "
+#~ msgstr "Ment hollek :"
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "Adgeflunia� ar rouedad brema�"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Anv ar gevreadenn"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Anv ar gevreadenn"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Anv ar gevreadenn"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Anv ar gevreadenn"
+
+#, fuzzy
+#~ msgid "Germany"
+#~ msgstr "Alaman"
+
+#, fuzzy
+#~ msgid "Germany (1TR6)"
+#~ msgstr "Alaman"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "Petra a vennit ober ? "
+
+#, fuzzy
+#~ msgid "Install/Rescue"
+#~ msgstr "Stalia�"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "Adventa�"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Pe seurt parzhadur a vennit ?"
+
+#, 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Dibabit \"Stalia�\" ma n'eus ket a stumm kent Linux bet staliaet,\n"
+#~ "pe ma vennit implijout meur a stumm pe a zasparzhadenn.\n"
+#~ "\n"
+#~ "Dibabit \"Bremanaat\" ma vennit hizivaat ur stumm kent Mandrake Linux :\n"
+#~ "%s pe %s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Diuzit :\n"
+#~ "\n"
+#~ "  - Emgefreek : Ma n'hoc'h eus morse staliaet Linux a-raok, dibabit se. "
+#~ "EVEZH :\n"
+#~ "    ne vo ket kefluniet a rouedad e-kerz ar staliadur, implijit "
+#~ "\"LinuxConf\"\n"
+#~ "    evit keflunia� unan goude diwezh ar staliadur.\n"
+#~ "\n"
+#~ "  - Neuziet : Ma 'z oc'h kustumet a-walc'h gant GNU/Linux, tu vo neuze "
+#~ "deoc'h\n"
+#~ "    dibab an implij penna� evit ho ardivink. Sellit a-is evit munudo�.\n"
+#~ "\n"
+#~ "  - Mailh : Ma 'z oc'h en ho pleud gant GNU/Linux ha mennet da seveni�\n"
+#~ "    ur staliadur neuziet-tre. Evel evit ar renkad stalia� \"Neuziet\" e vo\n"
+#~ "    tu deoc'h diuz an implij evit hor reizhiad.\n"
+#~ "    Hogen mar plij, NA ZIBABIT KET SE NEMET MA OUZIT PEZH EMAOC'H OC'H OBER "
+#~ "!\n"
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "D'ar poent-ma�, e c'hellit dibab pe barzhadur(io�) implijout evit\n"
+#~ "stalia� ho reizhiad Linux-Mandrake, ma 'z int bet termenet endeo (diwar\n"
+#~ "ur staliadur kent Linux pe diwar ur benveg parzha� all). E degouezho�\n"
+#~ "all, ret eo termeni� parzhadurio� ar bladenn galet. Talvezout a ra an\n"
+#~ "obererezh-se kement ha ranna� dre meiz egor pladenn galet an urzhiataer\n"
+#~ "e takado� distag o implij.\n"
+#~ "\n"
+#~ "\n"
+#~ "M'hoc'h eus da groui� parzhadurio� nevez, implijit \"Ac'hubi� ent "
+#~ "emgefreek\"\n"
+#~ "a-benn kroui� parzhadurio� evit Linux ent engrefreek. Gallout a rit diuz\n"
+#~ "ar bladenn da parzha� dre glika� war \"hda\" evit an drobarzhell IDE "
+#~ "kenta�,\n"
+#~ "\"hdb\" evit an eil pe \"sda\" evit an drobarzhell SCSI kenta� hag all.\n"
+#~ "\n"
+#~ "\n"
+#~ "Daou barzhadur boutin-tre a zo : ar parzhadur gwrizienn (/), a zo penn\n"
+#~ "kenta� urzhaz renkello� ar reizhiad restro�, ha /boot, a zo enna� an holl\n"
+#~ "restro� ret evit loc'ha� ar reizhiad korvoi� p'emeur o paouez enaoui�\n"
+#~ "an urzhiataer.\n"
+#~ "\n"
+#~ "\n"
+#~ "Gant ma n'heller ket diverka� efedo� an argerzh-ma�, parzha� a c'hell\n"
+#~ "beza� abafus ha bec'hius d'an arveriad deraouat. DiskDrake a aesa kement\n"
+#~ "an argerzh ha n'eus ket aon da gaout. Sellit ouzh an teuliadur hag it\n"
+#~ "war ho pouez a-raok kregi� ganti.\n"
+#~ "\n"
+#~ "Gallout a rit tizhout kement dibarzh 'zo gant ar stokello� : merdei� dre ar "
+#~ "parzhadurio�\n"
+#~ "gant Tab ha biro� Laez/Trao�. P'hoc'h eus diuzet ur parzhadur, grit gant :\n"
+#~ "\n"
+#~ "- Ctrl-c  evit kroui� ur parzhadur nevez (m'eo goullo ar parzhadur diuzet)\n"
+#~ "\n"
+#~ "- Ctrl-d  evit lemel ur parzhadur\n"
+#~ "\n"
+#~ "- Ctrl-m  evit termeni� ar poent marc'ha�\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."
+#~ msgstr ""
+#~ "Kement parzhadur a zo bet nevez termenet a zle beza� furmadet a-benn\n"
+#~ "e implijout (furmadi� a dalvez kroui� ur reizhiad restro�). Er poent-se,\n"
+#~ "e c'hellit mennout adfurmadi� parzhadurio� 'zo o veza� endeo evit diverka�\n"
+#~ "ar roado� a zo enno. Ho evezh : n'eo ket ret adfurmadi� parzhadurio� o\n"
+#~ "veza� endeo, dreist-holl ma 'z eus enno restro� pe roado� a vennit "
+#~ "derc'hel.\n"
+#~ "Skouerio� dibar eo /home ha /usr."
+
+#~ 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."
+#~ msgstr ""
+#~ "Ema� ar pakado� diuzet o veza� staliaet brema�. Un nebeut munut\n"
+#~ "e zlefe padout an obererezh-se nemet m'ho pije dibabet bremanaat\n"
+#~ "ur reizhiad o veza�, en degouezh-se e c'hell kemer muioc'h a amzer\n"
+#~ "zoken a-raok na grogfe ar bremanaat."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Ma ne c'hell ket DrakX kavout ho logodenn, pe ma vennit\n"
+#~ "gwiria� pezh en deus graet, kinniget e vo deoc'h ur roll\n"
+#~ "logodennou a-us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ma 'z oc'h a-du gant kefluniadur DrakX, n'hoc'h eus ken nemet lammat\n"
+#~ "d'ar rann a fell deoc'h en ur glika� el la�ser a gleiz. Mod all,\n"
+#~ "dibabit el la�ser ar seurt logodenn a gav deoc'h ez eo hini a zegouezh\n"
+#~ "ar gwella� evit ho logodenn.\n"
+#~ "\n"
+#~ "Ma 'z eo ul logodenn a-steud, ret e vo ivez deoc'h lavaret da DrakX\n"
+#~ "war be borzh a-steud eo luget ho logodenn."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "Gouestlet eo ar rann-ma� da geflunia� ur rouedad takad lec'hel\n"
+#~ "(LAN) pe ur modem.\n"
+#~ "\n"
+#~ "Dibabit \"Rouedad lec'hel\" ha DrakX a glasko kavout un azasaer\n"
+#~ "Ethernet war ho ardivink. Azasaerien PCI a zlefe beza� kavet\n"
+#~ "ha deraouekaet ent emgefreek. Evelato, m'eo ho trobarzhell unan ISA,\n"
+#~ "ne daio ket en-dro an emzinoi�, hag e vo ret deoc'h diuz ur sturier\n"
+#~ "diwar ar roll a zeuio war wel neuze.\n"
+#~ "\n"
+#~ "\n"
+#~ "Evel evit azasaerien SCSI e c'hellit leuskel ar sturier amproui�\n"
+#~ "an azasaer ar wech kenta�, mod all e vo ret deoc'h spisaat d'ar\n"
+#~ "sturier dibarzho� ho pije tapet diwar teuliadur ho periant.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ma stalhit ur reizhiad Linux-Mandrake war un ardivink a zo\n"
+#~ "lodek en ur rouedad a zo c'hoazh, merour ar rouedad en devo\n"
+#~ "roet deoc'h an holl titouro� ret (chomlec'h IP, ismaskl rouedad\n"
+#~ "pe verroc'h rouedmaskl, hag anv ostiz). M'emaoc'h o sevel ur\n"
+#~ "rouedad prevez er g�r da skouer, mat e vije deoc'h dibab\n"
+#~ "chomlec'hio� \n"
+#~ "\n"
+#~ "Dibabit \"Sifrenna� gant ar modem\" hag e vo kefluniet ar gevreadenn\n"
+#~ "ouzh ar Genrouedad gant ur modem. Klask a raio DrakX kavout ho modem,\n"
+#~ "ma ne teu ket a-benn e vo ret deoc'h diuz ar porzh a-steud m'eo luget\n"
+#~ "ho modem outa�."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "Linux a oar en em zibab gant kalz a seurto� moullerezed. Pep hini eus\n"
+#~ "ar seurto�-se en deus ezhomm ur c'hefluniadur dishe�vel. Taolit evezh\n"
+#~ "avat ar spooler moulla� a laka 'lp' da anv ar voullerrez dre ziouer ;\n"
+#~ "ret eo deoc'h eta kaout ur voullerez gant an anv-se ; hogen meur a anv,\n"
+#~ "pep hini dsipartiet gant an arouezenn '|', a c'hellit rei� d'ur voullerez.\n"
+#~ "Neuze, mar kavit gwelloc'h beza� un anv splannoc'h, n'hoc'h eus ken nemet\n"
+#~ "e lakaat da genta�, da sk. \"Ma Voullerez|lp\".\n"
+#~ "Ar voullerez he deus \"lp\" en he anv(io�) a vo hini dre ziouer.\n"
+#~ "\n"
+#~ "\n"
+#~ "M'eo luget ho moullerez end-eeun ouzh ho urzhiataer, diuzit\n"
+#~ "\"Moullerez lec'hel\". Neuze e rankot lavaret ouzh be borzh eo\n"
+#~ "luget ho moullerez, ha diuz ar sil a zere.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ma vennit tizhout ur voullerez a zo lec'hiet war un ardivink Unix\n"
+#~ "a-bell, rankout a reot diuz \"lpd a-bell\". Evit ma 'z afe en-dro,\n"
+#~ "n'eus ezhomm nag anv na tremenger, hogen e rankot anavezout anv\n"
+#~ "ar steud moulla� war ar servijer-se.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ma vennit tizhout ur voullerez SMB (da lavaret eo ur voullerez\n"
+#~ "lec'hiet war un ardivink Windows 9x/NT a-bell), e rankot spisaat\n"
+#~ "e anv SMB (n'eo ket e anv TCP/IP), ha marteze e chomlec'h IP, mui\n"
+#~ "an anv arveriad, ar strollad labour hag an tremenger ret a-benn tizhout\n"
+#~ "ar voullerez, hag evel-just anv ar voullerez. He�vel tra evit ur\n"
+#~ "voullerez NetWare, war-bouez titour ar strollad labour a zo diezhomm."
+
+#, fuzzy
+#~ 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."
+#~ msgstr ""
+#~ "Mar plij, me ho ped, respontit \"Ya\" ama� ! Lakaomp da skouer e\n"
+#~ "adstalhit Windows diwezhatoc'h hag e rasklo ar rann loc'ha�. Nemet\n"
+#~ "m'ho pije graet ar bladenn loc'ha� evel aliet, ne viot ket evit\n"
+#~ "loc'ha� Linux e mod ebet ken !"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Diso�jal ar c'hemmo�"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "Lugerezh ar voullerez"
+
+#~ msgid "Host name:"
+#~ msgstr "Anv an ostiz :"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Peseurt eo ho logodenn ?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Spisterio� emgefreek"
+
+#~ 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"
+#~ msgstr ""
+#~ "A-benn kavout ar spisterio� hegerz e klaskin meur a hini.\n"
+#~ "C'hwilda� a raio ho skramm...\n"
+#~ "Gallout a rit e tizenaoui� ma fell deoc'h, klevet a rit ur bip pa vo echu"
+
+#~ 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?"
+#~ msgstr ""
+#~ "Klask kavout ar spisterio� hegerz a c'hellan (da sk. 800x600).\n"
+#~ "A-wecho�, evelato, e c'hell sac'ha� an ardivink.\n"
+#~ "Mennout a rit klask ?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Mod reizh ebet kavet\n"
+#~ "Klaskit gant ur gartenn video pe ur skramm all"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Klask ent emgefreek ar spisterio�"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Logodenn Apple ADB"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Logodenn Apple ADB (2 nozelenn)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Logodenn Apple ADB (3 nozelenn pe vuioc'h)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Logodenn Apple ADB "
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Logodenn Apple USB (2 nozelenn)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Logodenn Apple USB (3 nozelenn pe vuioc'h)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Logodenn rummel"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "Logodenn bus ATI"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Logodenn bus Microsoft"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logodenn bus Logitech"
+
+#~ msgid "USB Mouse"
+#~ msgstr "Logodenn USB"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "Logodenn USB (3 nozelenn pe vuioc'h)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Stumm 2.1A pe uheloc'h (a-steud)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (a-steud)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (a-steud)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (a-steud)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Logodenn rummel (a-steud)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Kenglotus Microsoft (a-steud)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Logodenn rummel 3 nozelenn (a-steud)"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "marc'ha� NFS sac'het"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Rinegouriezh"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "Ha mennout a rit keflunia� ur rouedad lec'hel evit ho reizhiad ?"
+
+#~ msgid "Show less"
+#~ msgstr "Diskouez nebeutoc'h"
+
+#~ msgid "Show more"
+#~ msgstr "Diskouez muioc'h"
+
+#~ msgid "curly"
+#~ msgstr "rodellek"
+
+#~ msgid "default"
+#~ msgstr "dre ziouer"
+
+#~ msgid "tie"
+#~ msgstr "frondenn"
+
+#~ msgid "brunette"
+#~ msgstr "duardez"
+
+#~ msgid "girl"
+#~ msgstr "plac'h"
+
+#~ msgid "woman-blond"
+#~ msgstr "meleganez"
+
+#~ msgid "automagic"
+#~ msgstr "emhud"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Petra eo reizhadur ho stokellaoueg ?"
+
+#~ msgid "Normal"
+#~ msgstr "Boas"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Klask kavout kartenno� PCMCIA ?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "Klask kavout trobarzhello� %s ?"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "Keflunia� ar modem"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr ""
+#~ "Ha mennout a rit keflunia� ur gevreadenn gervel dre modem evit ho reizhiad ?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "Klask kavout trobarzhello� PCI ?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "O klask ar parzhadur gwrizienn."
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s : N'eo ket ur parzhadur gwrizienn, diuzit un all mar plij."
+
+#~ msgid "No root partition found"
+#~ msgstr "Parzhadur gwrizienn kavet ebet"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "N'hella� ket implijout ar skigna� hep domani NIS"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr ""
+#~ "Dibabit ur parzhadur d'ober anezha� ho parzhadur gwrizienn, mar plij."
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "N'hoc'h eus ket a-walc'h a egor evit Lnx4win !"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U Mo"
+
+#~ msgid "Automated"
+#~ msgstr "Emgefreek"
+
+# 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
+#
+# '�'    is the '�' (ntilde) in cp437 encoding.
+# '\227' is the '�' (ugrave) in cp437 encoding. 
+#
+#~ 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 ""
+#~ "Degemer mat e LILO, an dibaber reizhiad oberia� !\n"
+#~ "\n"
+#~ "Evit rolla� an dibabo� aotreet, stokit <TAB>.\n"
+#~ "\n"
+#~ "Evit karga� unan anezho, skrivit e anv ha stokit <ENKAS> pe c'hortozit %d "
+#~ "eilenn evit al loc'ha� dre ziouer.\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
+#
+#~ 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 ""
+#~ "Degemer mat e SILO, an dibaber reizhiad oberian~ !\n"
+#~ "\n"
+#~ "Evit rollan~ an dibabou aotreet, stokit <TAB>.\n"
+#~ "\n"
+#~ "Evit kargan~ unan anezho, skrivit e anv ha stokit <ENKAS> pe c'hortozit %d "
+#~ "eilenn evit al loc'han~ dre ziouer.\n"
+#~ "\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "Dibarzho� penna� SILO"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "Setu da heul enmonto� a vez e SILO.\n"
+#~ "Gallout a rit ouzhpenna� lod pe gemma� a re a zo."
+
+#~ msgid "This label is already in use"
+#~ msgstr "War implij eo ar skridennad-se endeo"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "Staliadur SILO zo sac'het. Degouezhet eo ar fazi a heul :"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX a glasko da genta� kavout unan pe vuioc'h a azasaer SCSI PCI.\n"
+#~ "Ma gav anezha� (pe anezho) ha ma oar pe sturier(ien) implijout, e (o)\n"
+#~ "enlakaat a raio ent emgefreek.\n"
+#~ "\n"
+#~ "\n"
+#~ "M'eo ho azasaer SCSI ur gartenn ISA, pe m'eo ur gartenn PCI hogen\n"
+#~ "ne oar ket DrakX pe sturier implijout evit ar gartenn-se, pe n'hoc'h eus\n"
+#~ "tamm azasaer SCSI ebet, goulennet e vo diganeoc'h neuze hag-e� hoc'h\n"
+#~ "eus unan pe get. Ma n'hoc'h eus hini, eilgeriit \"Ket\". M'hoc'h eus\n"
+#~ "unan pe vuioc'h, eilgeriit \"Ya\". Ur roll sturierien a zeuio neuze\n"
+#~ "war wel, a vo ret deoc'h diuz unan anezho.\n"
+#~ "\n"
+#~ "\n"
+#~ "Goude m'ho po diuzet ar sturier, DrakX a c'houlenno ma vennit spisaat\n"
+#~ "dibarzho� evita�. Da genta�, klaskit leuskel ar sturier amproui�\n"
+#~ "ar periant : peurliesa� e da mat en-dro.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ma ne ra ket, na ziso�jit ket an titouro� war ho periant a c'hellit\n"
+#~ "kavout en ho teuliadur pe digant Windows (m'hoc'h eus hema� war ho\n"
+#~ "reizhiad), evel m'eo aliet gant ar sturlevr stalia�. An dibarzho� a\n"
+#~ "vo ret deoc'h pourveza� d'ar sturier eo a zo e kaoz."
+
+#~ msgid "Shutting down"
+#~ msgstr "O tizenaoui�"
+
 #~ msgid "useless"
 #~ msgstr "diezhomm"
 
 #~ msgid "garbage"
 #~ msgstr "lastez"
 
-#~ msgid "Recommended"
-#~ msgstr "Erbedet"
-
 #~ 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/ca.po b/perl-install/share/po/ca.po
index f8f643df6..e111b2c43 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -1,57 +1,114 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Copyright (c) 1999 MandrakeSoft
-# Copyright (c) 1999-2000 SoftCatala
-# Quico Llach <quico@softcatala.org>, 1999-2000.
+# Copyright (c) 1999-2000 Softcatal�
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
-"PO-Revision-Date: 2000-06-05 14:00+0200\n"
-"Last-Translator: Quico Llach <quico@softcatala.org>\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
+"PO-Revision-Date: 2000-10-02 14:17+0200\n"
+"Last-Translator: Quico Llach <traddrake@softcatala.org>\n"
 "Language-Team: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "General"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Targeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Seleccioneu una targeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Escolliu un servidor X"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "Servidor X"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Quina configuraci� de l'XFree voleu tenir?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"La vostra targeta pot tenir acceleraci� 3D de maquinari, per� nom�s amb "
+"l'Xfree %s.\n"
+"L'XFree %s, que pot tenir un suport millor en 2D, suporta la vostra targeta."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, 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:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "Xfree %s amb acceleraci� 3D de maquinari"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"La vostra targeta pot tenir acceleraci� 3D de maquinari, per� nom�s amb "
+"l'Xfree %s,\n"
+"TINGUEU EN COMPTE QUE ES TRACTA D'UN SUPORT EXPERIMENTAL; L'ORDINADOR ES POT "
+"PENJAR.\n"
+"L'XFree %s, que pot tenir un suport millor en 2D, suporta la vostra targeta."
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"La vostra targeta pot tenir acceleraci� 3D de maquinari amb l'Xfree %s,\n"
+"TINGUEU EN COMPTE QUE ES TRACTA D'UN SUPORT EXPERIMENTAL; L'ORDINADOR ES POT "
+"PENJAR."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s amb acceleraci� 3D de maquinari EXPERIMENTAL"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "Configuraci� de l'XFree"
+
+#: ../../Xconfigurator.pm_.c:301
 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:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Escolliu les opcions per al servidor"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Escolliu un monitor"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -74,39 +131,40 @@ msgstr ""
 "el podr�eu fer malb�.\n"
 "En cas de dubte, sigueu conservador amb aquest par�metre."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Velocitat de refresc horitzontal"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Velocitat de refresc vertical"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "El monitor no est� configurat"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "La targeta gr�fica encara no est� configurada"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Encara no s'han escollit les resolucions"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Voleu comprovar la configuraci�?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr "Av�s: �s perill�s fer la comprovaci� en aquesta targeta gr�fica"
+#: ../../Xconfigurator.pm_.c:431
+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:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Comprova la configuraci�"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -114,184 +172,171 @@ msgstr ""
 "\n"
 "intenteu canviar alguns par�metres"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "S'ha produ�t un error:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Sortida en %d segons"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "�s aquest el par�metre corrcte?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 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:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Resolucions autom�tiques"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Per saber quines resolucions estan disponibles, en provar� algunes.\n"
-"La pantalla parpellejar�...\n"
-"Ho podeu desactivar si voleu; sentireu un av�s sonor quan estigui llest"
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Resoluci�"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Escolliu la resoluci� i la profunditat de color"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Targeta gr�fica: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Servidor xFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Mostra'ls tots"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Resolucions"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Puc mirar de trobar les resolucions disponibles (p.ex. 800x600).\n"
-"De vegades, per�, aix� pot penjar l'ordinador.\n"
-"Us hi voleu arriscar?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"No s'han trobat modes v�lids\n"
-"Intenteu-ho amb una altra targeta de v�deo o monitor"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposici� del teclat: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipus de ratol�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Dispositiu del ratol�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Sincronitzaci� horitzontal del monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Refresc vertical del monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Targeta gr�fica: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Mem�ria gr�fica: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "Profunditat del color: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Resoluci�: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Servidor xFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "Controlador de l'xFree86: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "S'est� preparant la configuraci� de l'X-Window"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Canvia el monitor"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Canvia la targeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Canvia les opcions del servidor"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Canvia la resoluci�"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Recerca autom�tica de resolucions"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Mostra la informaci�"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Torna-ho a comprovar"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Surt"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Qu� voleu fer?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Voleu descartar els canvis?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"Voleu conservar els canvis?La configuraci� actual �s:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, 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:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Si us plau, sortiu i utilitzeu Ctrl-Alt-Enrere"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X a l'inici"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -300,228 +345,224 @@ msgstr ""
 "durant l'arrencada.\n"
 "Voleu que X s'inici� quan torneu a arrencar l'ordinador?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Entrada autom�tica"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+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."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Escolliu l'usuri per omissi�:"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "Escolliu el gestor de finestres per executar:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 colors (8 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32.768 colors (15 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65.536 colors (16 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 milions de colors (24 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4.294 milions de colors (32 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB o m�s"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA est�ndard, 640x480 a 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 a 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 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:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "SVGA d'alta freq��ncia, 1024x768 a 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 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:123
+#: ../../Xconfigurator_consts.pm_.c:126
 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:124
+#: ../../Xconfigurator_consts.pm_.c:127
 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:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor que pot fer 1600x1200 a 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor que pot fer 1600x1200 a 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "arrissat"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "predeterminat"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "lla�"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "morena"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "noia"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "dona-rossa"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "automagic"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Primer sector de la partici� d'arrencada"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Primer sector de la unitat (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "Instal�laci� del LILO/grub"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "Instal�laci� del SILO"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "On voleu instal�lar el carregador d'arrencada?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "Instal�laci� del LILO/grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Cap"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Quin(s) carregador(s) d'arrencada voleu utilitzar?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Instal�laci� del carregador d'arrencada"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Dispositiu d'arrencada"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (no funciona en BIOS antics)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Compacte"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "compacte"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Demora abans d'arrencar la imatge predeterminada"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Mode de v�deo"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Demora abans d'arrencar la imatge predeterminada"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Contrasenya (un altre cop)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Limita les opcions de la l�nia d'ordres"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "limita"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Opcions principals del carregador d'arrencada"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Si us plau, torneu-ho a intentar"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Les contrasenyes no coincideixen"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -529,167 +570,354 @@ msgstr ""
 "Aquestes s�n les diferents entrades.\n"
 "Podeu afegir-ne algunes m�s o canviar-ne les existents."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Afegeix"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Fet"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Quin tipus d'entrada voleu afegir?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Un altre SO (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Un altre SO (Windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Quin tipus d'entrada voleu afegir?"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Imatge"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Arrel"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Afegeix"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Lectura-escriptura"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Taula"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "No segur"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Etiqueta"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Predeterminat"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "D'acord"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Elimina l'entrada"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "No es permet una etiqueta buida"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Aquesta etiqueta ja est� en �s"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "S'han trobat %s interf�cies %s"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "En teniu una altra?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Teniu alguna interf�cie %s?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "No"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "S�"
+
+#: ../../any.pm_.c:505
+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:522
+#, 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:523
+#, c-format
+msgid "(module %s)"
+msgstr "(m�dul %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Quin programa de control %s he de provar?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"En alguns casos, el programa de control %s necessita informaci� addicional\n"
+"per funcionar correctament, tot i que normalment funciona b� sense ella.\n"
+"Voleu especificar opcions addicionals o deixar que el programa de control\n"
+"cerqui al vostre ordinador la informaci� que necessita? Aquesta recerca\n"
+"podria blocar l'ordinador, per� aix� no causaria cap dany."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Exploraci� autom�tica"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Especifica les opcions"
+
+#: ../../any.pm_.c:551
+#, 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:557
+#, 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 ""
+"Ara podeu proporcionar les seves opcions per al m�dul %s.\n"
+"Les opcions estan amb el format ``nom=valor nom2=valor2 ...''.\n"
+"Per exemple, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Opcions del m�dul:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Ha fallat la c�rrega del m�dul %s.\n"
+"Voleu tornar-ho a intentar amb altres par�metres?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Benvingut al %s, la utilitat que us permet triar el sistema operatiu!\n"
+"\n"
+"Per obtenir una llista de les eleccions possibles, premeu <TAB>.\n"
+"\n"
+"Per carregar-ne una, escriviu-ne el nom i premeu <INTRO> o espereu %d "
+"segons\n"
+"fins a l'arrencada predeterminada.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Benvingut al GRUB, el selector de sistema operatiu!"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr ""
+"Utilitzeu les tecles %c i %c per seleccionar quina posici� est� ressaltada."
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Premeu Intro per arrencar el SO seleccionat, 'e' per editar les"
+
+#: ../../bootloader.pm_.c:599
+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."
+
+#: ../../bootloader.pm_.c:600
+#, 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:604
+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
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Escriptori"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Men� Inici"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d minuts"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 minute"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d segons"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Crea"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Desmunta"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Formata"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Canvia la mida"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Tipus"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Punt de muntatge"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Escriu a /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Normal > Expert"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Expert > Normal"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Restaura des del fitxer"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Desa al fitxer"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "Assistent"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Restaura des del disquet"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Desa al disquet"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Buida-ho tot"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Formata-ho tot"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Assigna autom�ticament"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "S'utilitzen totes les particions prim�ries"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "No puc afegir cap m�s partici�"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -697,59 +925,63 @@ msgstr ""
 "Per tenir m�s particions, suprimiu-ne una per poder crear una partici� "
 "ampliada"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Rescata la taula de particions"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Desf�s"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Escriu la taula de particions"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Torna a carregar"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Buit"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Altres"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Intercanvia"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Buit"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Altres"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Tipus de sistema de fitxers"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Detalls"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -761,17 +993,17 @@ msgstr ""
 "Suggereixo que primer en canvieu la mida\n"
 "(feu-hi clic i despr�s feu clic a \"Canvia la mida\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 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:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Llegiu-ho atentament!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -780,77 +1012,77 @@ 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:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Aneu amb compte: aquesta operaci� �s perillosa."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Error"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Punt de muntatge: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Dispositiu: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, 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:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Tipus: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Inici: sector %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Mida: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sectors"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Cilindre %d a cilindre %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Formatat\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Sense formatar\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Muntat\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Fitxer(s) de loopback: %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -858,79 +1090,79 @@ 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:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Nivell %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Mida del tros %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "Discs RAID %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Nom del fitxer de loopback: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Si us plau, feu clic a una partici� "
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Mida: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometria: %s cilindres, %s cap�als, %s sectors\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Tipus de taula de particions: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "al bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Munta"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Actiu"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Afegeix al RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Elimina del RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Modifica el RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Utilitza per a loopback"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Trieu una acci�"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -942,7 +1174,7 @@ msgstr ""
 "O esteu utilitzant LILO, i no funcionar�, o no l'esteu utilitzant i no "
 "necessiteu el /boot"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -955,69 +1187,68 @@ msgstr ""
 "Si teniu previst utilitzar el gestor d'arrencada LILO, penseu d'afegir una "
 "partici� /boot"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "Heu seleccionat una partici� de programari RAID com a arrel (/).\n"
 "Aix� no ho pot gestionar cap carregador d'arrencada sense una partici� "
 "/boot.\n"
-"Per tant, assegureu-vos d'afegir una partici� /boot si voleu utilitzar el "
-"LILO o el GRUB"
+"Per tant, assegureu-vos d'afegir una partici� /boot"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Utilitzeu ``%s'' al seu lloc"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Utilitzeu primer ``Unmount''"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, 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:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Voleu continuar igualment?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Surt sense desar"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Voleu sortir sense desar la taula de particions?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Canvia el tipus de partici�"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Quin tipus de partici� voleu?"
+#: ../../diskdrake.pm_.c:471
+msgid "Which filesystem do you want?"
+msgstr "Quin sistema de fitxers voleu?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 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:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "On voleu muntar el fitxer de loopback %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "On voleu muntar el dispositiu %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1025,140 +1256,145 @@ msgstr ""
 "No es pot anul�lar el punt de muntatge, perqu� aquesta partici�\n"
 "s'utilitza per al loopback. Elimineu primer el loopback"
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, 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:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "S'est� formatant"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "S'est� formatant el fitxer de loopback %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "S'est� formatant la partici� %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Despr�s de formatar totes les particions,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "totes les dades d'aquestes particions s'hauran perdut"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Mou"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "A quin disc us voleu despla�ar?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sector"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "A quin sector us voleu despla�ar?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "S'est� despla�ant"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "S'est� despla�ant la partici�..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, 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:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 "Us caldr� tornar a arrencar per tal que les modificacions tinguin efecte"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "S'estan calculant els l�mits del sistema de fitxers de la FAT"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "S'est� canviant la mida"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "A quina partici� voleu canviar la mida?"
+
+#: ../../diskdrake.pm_.c:597
 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.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, 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.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Escolliu la nova mida"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Crea una nova partici�"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "sector d'inici: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Mida en MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Tipus de sistema de fitxers: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Prefer�ncia: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Aquesta partici� no es pot utilitzar per al loopback"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Nom del fitxer de loopback: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "Un altre loopback ja est� utilitzant el fitxer, escolliu-ne un altre"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "El fitxer ja existeix. El voleu utilitzar?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Seleccioneu el fitxer"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1166,11 +1402,11 @@ msgstr ""
 "La c�pia de seguretat de la taula de particions no t� la mateixa mida\n"
 "Voleu continuar igualment?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Advert�ncia"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1178,79 +1414,79 @@ msgstr ""
 "Inseriu un disquet a la unitat\n"
 "Se'n perdran totes les dades"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "S'est� intentant rescatar la taula de particions"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "dispositiu"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "nivell"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "mida del tros"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Escolliu un RAID existent al qual afegir"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "nou"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formatatge de %s ha fallat"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, 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:186
-msgid "nfs mount failed"
-msgstr "ha fallat el muntatge de l'nfs"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "ha fallat el muntatge: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "s'ha produ�t un error en muntar %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Els punts de muntatge han de comen�ar amb una /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, 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:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Muntatges circulars %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+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:259
 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:355
+#: ../../fsedit.pm_.c:335
 #, 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:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1259,81 +1495,130 @@ msgstr ""
 "sistemes de fitxers. Si us plau, comproveu el vostre maquinari per trobar el "
 "problema"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "No teniu cap partici�!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../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:10
+#: ../../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 ""
+"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."
+
+#: ../../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:13
+#: ../../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 ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"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"
-"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).\n"
 "\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
-"  - 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"
+"\t* Recommanded: 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"
-"  - 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"
+"\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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 hi ha instal�lada cap versi� anterior de "
-"Linux,\n"
-"o si voleu utilitzar diverses distribucions o versions.\n"
+"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"
-"Escolliu \"Actualitzaci�\" si voleu actualitzar una versi� anterior de\n"
-"Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000 o 7.0 (Air).\n"
 "\n"
+"Escolliu \"Actualitzaci�\" si voleu actualitzar un versi� de Linux-Mandrake "
+"que ja est� instal�lada.\n"
+"\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"
+"\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"
-"Seleccioneu:\n"
 "\n"
-"  - Autom�tica (recomanada): Si mai no heu instal�lat el Linux,\n"
-"escolliu aquesta. NOTA:\n"
-"    la xarxa no es configurar� durant la instal�laci�, utilitzeu\n"
-"\"LinuxConf\"\n"
-"    per configurar-la despr�s de que finalitzi la instal�laci�.\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"
 "\n"
-"  - Personalitzada: Si esteu prou familiaritzat amb el GNU/Linux, podeu\n"
-"    triar l'�s principal del vostre ordinador. Consulteu-ne els detalls\n"
-"    m�s avall.\n"
 "\n"
-"  - Per a experts: S'assumeix que domineu el GNU/Linux i voleu realitzar "
-"una\n"
-"    instal�laci� altament personalitzada. Com en el cas del tipus\n"
-"    d'instal�laci� \"Personalitzada\", podreu seleccionar l'�s del vostre\n"
-"    sistema.\n"
-"    Per�, SI US PLAU, NO TRIEU AQUESTA OPCI� TRET QUE SAPIGUEU QU� ESTEU "
-"FENT!\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:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1341,12 +1626,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Seleccioneu:\n"
 "\n"
@@ -1362,374 +1648,931 @@ msgstr ""
 "  - 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\".\n"
+"com a \"Personalitzada\"."
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\n"
-msgstr ""
-"Les diferents opcions per a la utilitzaci� del vostre ordinador (assumint\n"
-"que hagueu triat el tipus d'instal�laci� \"Personalitzada\" o \"Experta\")\n"
-"s�n les seg�ents:\n"
-"\n"
-"  - Normal: trieu-la si penseu utilitzar l'ordinador principalement per a\n"
-"l'�s quotidi� (feina d'oficina, manipulaci� de gr�fics, etc.). No\n"
-"s'instal�lar� cap compilador, utilitat de desenvolupament, etc.\n"
-"\n"
-"  - Desenvolupament: com indica el seu nom, trieu-la si penseu utilitzar\n"
-"l'ordinador per a desenvolupament de programari. Disposareu d'un complet\n"
-"ventall de programes per compilar, depurar i formatar codi font, o crear\n"
-"paquets de programari.\n"
-"\n"
-"  - Servidor: trieu-la si l'ordinador on esteu instal�lant la "
-"Linux-Mandrake\n"
-"s'utilitzar� com a servidor, ja sigui un servidor de fitxers (NFS o SMB),\n"
-"d'impressi� (protocol Unix lp (impressora en l�nia) o impressi� SMB de "
-"tipus\n"
-"Windows), d'autenticaci� (NIS), de bases de dades, etc. Per tant, no\n"
-"s'instal�laran coses com el KDE, GNOME...\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."
+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"
+"\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"
+"\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.)"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 ""
-"En primer lloc, el DrakX intentar� trobar un o m�s adaptadors SCSI\n"
-"PCI. Si en troba, i sap quin(s) programa(es) de control utilitzar,\n"
-"l'inserir� o els inserir� autom�ticament.\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"
-"Si el vostre adaptador SCSI �s una targeta ISA, o si �s PCI per�\n"
-"el DrakX no sap amb quin programa de control ha d'utilitzar-la, o\n"
-"si no teniu cap adaptador SCSI, se us preguntar� si en teniu un o\n"
-"no. Si no en teniu cap, respongueu \"No\". Si en teniu un o m�s,\n"
-"respongueu \"S�\". Apareixer� una llista de programes de control,\n"
-"de la qual n'haureu de triar un.\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"
-"Un cop hagueu triat el programa de control, el DrakX us preguntar�\n"
-"si voleu establir-ne les opcions. Primer, per�, deixeu que el\n"
-"programa de control explori el maquinari: normalment funciona b�.\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"
-"Si no, no oblideu la informaci� sobre el vostre maquinari que\n"
-"pugueu aconseguir a la documentaci� o al Windows (si el teniu al\n"
-"sistema), com aconsella la guia d'instal�laci�. Aquestes s�n les\n"
-"opcions que haureu de proporcionar al programa de control."
+"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:94
+#: ../../help.pm_.c:108
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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 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"
-"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"
+"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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
 "\n"
-"- Ctrl-d  to delete a partition\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"
-"- Ctrl-m  to set the mount point\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 ""
-"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"
-"definir (en una instal�laci� anterior del Linux o mitjan�ant una\n"
-"altra eina de partici�). En cas contrari, s'han de definir les\n"
-"particions del disc dur: aquesta operaci� consisteix en dividir el\n"
-"disc dur de l'ordinador en �rees l�giques separades.\n"
+"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"
+"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"
+"\n"
+"\n"
+"At�s que els efectes d'aquest proc�s solen ser irreversibles, el "
+"particionament \n"
+"us pot espantar si sou un usuari sense experi�ncia.\n"
+"Aquest assistent simplifica aquest proc�s; abans de comen�ar, consulteu el\n"
+"manual i preneu-vos el temps que calgui.\n"
+"\n"
+"\n"
+"Necessiteu, com a m�nim, dues particions, una per al sistema operatiu en\n"
+"si i l'altra per a la mem�ria virtual (anomenada tamb� \"Intercanvi\").\n"
+"\n"
+"\n"
+"Si les particions ja s'han definit (en una instal�laci� anterior o "
+"mitjan�ant\n"
+"una altra eina de particionament), nom�s caldr� que seleccioneu les que "
+"voleu\n"
+"utilitzar per instal�lar el sistema Linux.\n"
 "\n"
 "\n"
-"Si heu de crear noves particions, utilitzeu \"Assignaci�\n"
-"autom�tica\" per crear particions per al Linux de manera autom�tica.\n"
-"Podeu triar el disc on s'hi han de fer les particions fent clic a\n"
-"\"hda\" per a la primera unitat IDE, \"hdb\" per a la segona, o\n"
-"\"sda\" per a la primera unitat SCSI, i aix� successivament.\n"
+"Si les particions encara no s'han definit, les heu de crear.\n"
+"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"
+"disc dur una o m�s particions de Linux existents. Si voleu conservar-les,\n"
+"escolliu aquesta opci�.\n"
 "\n"
-"Dues particions habituals s�n: la partici� root (/), que �s el punt\n"
-"d'inici de la jerarquia de directoris del sistema de fitxers, i\n"
-"/boot, que cont� tots els fitxers necessaris per iniciar el sistema\n"
-"operatiu quan s'arrenca l'ordinador per primer cop.\n"
 "\n"
+"\t* 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"
-"Donat que aquest proc�s sol ser irreversible, la partici� d'un disc\n"
-"�s sovint un proc�s que espanta als usuaris sense experi�ncia, per�\n"
-"el DiskDrake simplifica molt aquest proc�s. Consulteu la documentaci�\n"
-"i preneu-vos tant temps com sigui necessari abans de realitzar la\n"
-"partici�.\n"
 "\n"
-"podeu abastar qualsevol opci� mitjan�ant el teclat: desplaceu-vos per les "
-"particions amb el tabulador i les fletxes amunt i avalles tecles ReP�g i "
-"AvP�gYou can reach any option using the keyboard: navigate through the "
+"\t* 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"
+"crear espai lliure per a les dades del Linux. Per fer-ho, podeu suprimir la\n"
+"partici� i les dades del Windows (consulteu les opcions \"Esborrar "
+"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 "
+"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"
+"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 "
+"m�s\n"
+"programari.\n"
+"\n"
+"\n"
+"\t* 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
+msgid ""
+"At this point, you need to choose what\n"
+"partition(s) to use to install your new Linux-Mandrake system. If "
 "partitions\n"
-"using Tab and Up/Down arrows. When a partition is selected, you can use:\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"
+"\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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
 "\n"
-"- Ctrl-d  to delete a partition\n"
+"For information, you can reach any option using the keyboard: navigate "
+"trough the partitions using Tab and Up/Down arrows.\n"
 "\n"
-"- Ctrl-m  to set the mount point\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"
+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 "
+"(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 "
+"contrari,\n"
+"s'han de definir particions al disc dur.\n"
+"\n"
+"\n"
+"Per crear particions, primer heu de seleccionar un disc dur. Podeu "
+"seleccionar\n"
+"el disc que s'ha de particionar fent clic a \"hda\" per a la primera unitat\n"
+"IDE, \"hdb\" per a la segona o \"sda\" per a la primera unitat SCSI, etc.\n"
+"\n"
+"\n"
+"Per particionar el disc dur seleccionat, podeu utilitzar aquestes opcions:\n"
+"\n"
+"   * Buidar-ho tot: aquesta opci� suprimeix totes les particions que hi ha\n"
+"al disc dur seleccionat.\n"
+"\n"
+"\n"
+"   * Assignaci� autom�tica: aquesta opci� us permet crear autom�ticament "
+"les\n"
+"particions Ext2 i Intercanvi en l'espai lliure del disc dur.\n"
+"\n"
+"\n"
+"   * Rescatar la taula de particions: si la taula de particions est�\n"
+"malmesa, podeu intentar recuperar-la mitjan�ant aquesta opci�. Aneu\n"
+"amb compte i penseu que pot fallar.\n"
+"\n"
+"\n"
+"   * Desfer: podeu utilitzar aquesta opci� per anul�lar els canvis.\n"
+"\n"
+"\n"
+"   * Tornar a carregar: podeu utilitzar aquesta opci� si voleu desfer\n"
+"tots els canvis i carregar la taula de particions inicial.\n"
+"\n"
+"\n"
+"   * Assistent: Si voleu utilitzar un assistent per particionar el disc "
+"dur,\n"
+"podeu utilitzar aquesta opci�, que �s la m�s recomanable si no teniu massa\n"
+"coneixements de particionament.\n"
+"\n"
+"\n"
+"   * Restaurar des de disquet: si, en una instal�laci� anterior, vau desar\n"
+"la taula de particions en un disquet, podeu recuperar-la mitjan�ant aquesta\n"
+"opci�.\n"
+"\n"
+"\n"
+"   * Desar en disquet: si voleu desar la taula de particions en un disquet\n"
+"per poder-la recuperar, podeu utilitzar aquesta opci�. �s molt recomanable\n"
+"que l'utilitzeu.\n"
+"\n"
+"\n"
+"   * Fet: quan hagueu acabat de particionar el disc dur, utilizeu aquesta\n"
+"opci� per desar els canvis.\n"
+"\n"
+"\n"
+"Per a la vostra informaci�, podeu accedir a qualsevol opci� mitjan�ant el "
+"teclat:\n"
+"moveu-vos per les particions amb la tecles Tab i Fletxa amunt/Fletxa avall.\n"
+"\n"
+"\n"
+"Quan es selecciona una partici�, podeu utilitzar:\n"
+"\n"
+"           * Ctrl+C per crear una nova partici� (quan se n'ha seleccionat\n"
+"una de buida)\n"
+"\n"
+"           * Ctrl+D per suprimir una partici�\n"
+"\n"
+"           * Ctrl+M per definir el punt de muntatge"
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:218
 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."
+"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 ""
+"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:252
+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:257
+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:267
+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 ""
+"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"
+"\n"
+"\n"
+"Per a la vostra informaci�, cada partici� est� identificada d'aquesta "
+"manera; \"Nom Linux\", \"Nom\n"
+"Windows\" \"Capacitat\".\n"
+"\n"
+"\"Nom Linux\" 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...\n"
+"\n"
+"\"Nom Windows\" �s la lletra de la vostra unitat de disc sota Windows (el "
+"primer disc o partici� s'anomena \"C:\")."
+
+#: ../../help.pm_.c:300
+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:303
+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 ""
-"Cal formatar les particions que s'acaben de definir per poder-les\n"
-"utilitzar ('formatar' significa 'crear un sistema de fitxers').\n"
-"En aquest punt podeu, si voleu, tornar a formatar particions\n"
-"existents per eliminar les dades que contenen. Nota: no �s\n"
-"necessari tornar a formatar les particions existents, especialment\n"
-"si contenen fitxers o dades que voleu conservar.\n"
-"Els directoris que es solen conservar s�n /home i /usr/local."
+"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"
+"\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"
+"\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"
+"\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"
+"\n"
+"Feu clic a \"D'acord\" quan estigueu a punt per formatar les particions.\n"
+"\n"
+"\n"
+"Feu clic a \"Cancel�la\" si voleu seleccionar altres particions per "
+"instal�lar\n"
+"el nou sistema Linux-Mandrake."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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 igualment voleu seguir, continuar� amb la instal�laci� de "
+"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 utils. Al "
+"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..."
 
-#: ../../help.pm_.c:150
-msgid ""
-"If you have all the CDs in the list above, 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 ""
-"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:155
+#: ../../help.pm_.c:341
 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."
-msgstr ""
-"Ara s'estan instal�lant els paquets seleccionats. Aquesta operaci�\n"
-"trigar� pocs minuts, tret que hagueu escollit actualitzar un\n"
-"sistema existent; en aquest cas trigar� m�s temps, fins i tot\n"
-"abans que s'inici� la instal�laci�."
-
-#: ../../help.pm_.c:161
-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 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 agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
+"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
+"\"Toggle flat and group sorted\".\n"
 "\n"
 "\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"Si el DrakX no ha pogut trobar el ratol�, o si voleu comprovar qu�\n"
-"ha fet, a la part superior apareixer� la llista de ratolins.\n"
+"Ara podeu triar individualment tots els paquets que voleu instal�lar.\n"
 "\n"
 "\n"
-"Si esteu d'acord amb els par�metres del DrakX, passeu a la secci�\n"
-"desitjada fent-hi clic al men� de l'esquerra, Si no, escolliu al\n"
-"el tipus de ratol� que us sembli m�s semblant al vostre.\n"
+"Podeu expandir o reduir l'arbre fent clic a les opcions del rac� esquerre de "
+"la finestra de paquets.\n"
 "\n"
 "\n"
-"Si es tracta d'un ratol� s�rie, tamb� us caldr� indicar al DrakX a\n"
-"quin port s�rie est� connectat."
+"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:176
+#: ../../help.pm_.c:358
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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 us plau, seleccioneu el port correcte. Per exemple, el port COM1 del\n"
-"Windows s'anomena ttyS0 en Linux."
+"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:180
+#: ../../help.pm_.c:363
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"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"
-"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"
+"Please be patient."
+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"
-"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"
+"Si us plau, tingueu paci�ncia."
+
+#: ../../help.pm_.c:371
+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:376
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows 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:380
+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 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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"Aquesta secci� est� dedicada a la configuraci� d'una xarxa local\n"
-"(LAN) o d'un m�dem.\n"
+"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"
-"Escolliu \"LAN local\" i el DrakX intentar� trobar un adaptador\n"
-"Ethernet al vostre ordinador. El sistema trobar� i inicialitzar�\n"
-"autom�ticament els adaptadors PCI.\n"
-"No obstant aix�, si el vostre perif�ric �s ISA, la detecci�\n"
-"no funcionar�, i us caldr� escollir un programa de control a la\n"
-"llista que apareixer�.\n"
 "\n"
+"Si no teniu connexi� a Internet ni a cap xarxa local, escolliu \"Inhabilita "
+"el servei de xarxa\".\n"
 "\n"
-"Com en el cas dels adaptadors SCSI, podeu deixar que, d'entrada,\n"
-"el programa de control comprovi l'adaptador; si no ho feu aix�, us\n"
-"caldr� especificar les opcions del programa de control que haureu\n"
-"d'anar a buscar a la documentaci� del vostre maquinari.\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:393
+msgid ""
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
 "\n"
-"Si instal�leu un sistema Linux-Mandrake 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"
-"xarxa privada, com ara a casa, haureu d'escollir les adreces.\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"
-"Escolliu \"Marcatge amb m�dem\" i es configurar� la connexi� a\n"
-"Internet amb un m�dem. El DrakX intentar� trobar el m�dem, per�,\n"
-"si no se'n surt, us caldr� seleccionar el port s�rie al qual est�\n"
-"connectat."
+"Per a la vostra informaci�, el primer port s�rie (anomenat \"COM1\" en "
+"Microsoft Windows) s'anomena \"ttyS0\" en Linux."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:400
 msgid ""
-"Enter:\n"
-"\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
-"\n"
+"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:407
+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:410
+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:413
+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:420
+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:425
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
-"Introdu�u:\n"
-"\n"
-"  - Adre�a IP: si no la sabeu, pregunteu-la a l'administrador de la xarxa.\n"
+"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�.\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"
-"\n"
-"  - IP autom�tica: si la vostra xarxa utilitza el protocol bootp o dhcp,\n"
-"seleccioneu aquesta opci�. Si es selecciona no cal cap valor per a \"Adre�a\n"
-"IP\". Si no n'esteu segur, consulteu-ho a l'administrador de la xarxa.\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:225
+#: ../../help.pm_.c:437
+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:441
+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:445
 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."
@@ -1737,7 +2580,7 @@ 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:229
+#: ../../help.pm_.c:449
 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."
@@ -1746,128 +2589,328 @@ msgstr ""
 "n'utilitzareu, consulteu-ho a l'administrador de la xarxa o al vostre\n"
 "prove�dor."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
 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 un mirror des del qual\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"
-"Tingueu en compte que heu de seleccionar el mirror i la criptografia\n"
-"segons la vostra legislaci�."
+"\n"
+"Tingueu en compte que heu de seleccionar la r�plica i els paquets\n"
+"criptogr�fics segons la vostra legislaci�."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+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:465
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
-"Ara podeu seleccionar la zona hor�ria segons el vostre lloc de resid�ncia.\n"
-"El Linux gestiona l'hora en GMT o \"Hora de Greenwich\" i la\n"
-"tradueix a l'hora local segons la zona hor�ria seleccionada."
+"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:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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. Quan\n"
-"el ratol� passi sobre un element apareixer� un petit globus d'ajuda que\n"
+"Ara podeu triar quins serveis voleu que s'inici�n durant l'arrencada.\n"
+"\n"
+"\n"
+"Quan el ratol� passi sobre un element apareixer� un petit globus d'ajuda "
+"que\n"
 "explica la finalitat del servei.\n"
-"|nAneu especialment amb cura en aquest pas si penseu utilitzar l'ordinador\n"
-"com a servidor: segurament no us interessar� iniciar serveis que no voleu."
+"\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:257
+#: ../../help.pm_.c:486
+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:490
+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 ""
+"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:505
+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\"."
+
+#: ../../help.pm_.c:521
 msgid ""
-"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"
+"Please turn on your printer before continuing to let DrakX detect it.\n"
+"\n"
+"You have to enter some informations here.\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"
+"   * 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"
-"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"
+"   * 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"
-"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."
+"   * 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 ""
-"El Linux pot treballar amb molts tipus d'impressores. Per a cada\n"
-"un d'aquests tipus, per�, cal una configuraci� diferent. Tingueu\n"
-"en compte, per�, que l'spooler utilitza 'lp' com a nom d'impressora\n"
-"per defecte, de manera que heu de tenir una impressora amb aquest nom.\n"
-"No obstant aix�, podeu donar diferents noms a una impressora, separant-\n"
-"los amb el car�cter '|'. D'aquesta manera, si voleu donar-li un nom m�s\n"
-"aclaridor nom�s us caldr� indicar-lo en primer lloc, p.ex. \"La meva\n"
-"impressora|lp\".\n"
-"La impressora que contingui \"lp\" al(s) nom(s) ser� la impressora per\n"
-"defecte\n"
+"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"
-"Si la vostra impressora est� connectada directament a l'ordinador,\n"
-"seleccioneu \"Impressora local\". Haureu d'indicar a quin port\n"
-"est� connectada i seleccionar-ne el filtre corresponent.\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"
-"Si voleu accedir a una impressora que es troba a un ordinador Unix\n"
-"remot, seleccioneu \"lpd remot\". Per poder-la fer funcionar no\n"
-"cal cap nom d'usuari ni contrasenya, per� us caldr� saber el nom\n"
-"de la cua d'impressi� del servidor remot.\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"
-"Si voleu accedir a una impressora SMB (�s a dir, una impressora\n"
-"que es troba a un ordinador remot amb Windows 9x/NT), per poder-ho\n"
-"fer haureu d'indicar el seu nom SMB (que no �s el seu nom TCP/IP)\n"
-"i possiblement la seva adre�a IP, nom d'usuari, grup de treball,\n"
-"contrasenya, i, evidentment, el nom de la impressora. El mateix\n"
-"per a una impressora NetWare, per� en aquest cas no us caldr� la\n"
-"informaci� del grup de treball."
+"\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"
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:542
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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:567
+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."
+
+#: ../../help.pm_.c:575
+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:578
+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."
+
+#: ../../help.pm_.c:585
+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 ""
 "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"
@@ -1876,16 +2919,20 @@ msgstr ""
 "\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"
+"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. La contrasenya ha d'estar composada de car�cters\n"
-"alfanum�rics, ha de tenir una llargada m�nima de 8 car�cters, i\n"
-"MAI no s'ha d'anotar enlloc. No obstant aix�, no creeu una\n"
-"contrasenya excessivament llarga o complicada: heu de poder\n"
-"recordar-la sense problemes."
+"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."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1893,7 +2940,7 @@ msgstr ""
 "Per habilitar un sistema m�s segur, seleccioneu \"Utilitza el\n"
 "fitxer d'ombra\" i \"Utilitza les contrasenyes MD5\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1901,7 +2948,7 @@ 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:310
+#: ../../help.pm_.c:611
 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"
@@ -1944,35 +2991,33 @@ msgstr ""
 "creat, i entreu-hi com a 'root' nom�s per a tasques d'administraci�\n"
 "i manteniment."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 que respongueu \"S�\" aqu�. Si m�s endavant\n"
-"instal�leu el Windows, sobreescriur� el sector d'arrencada.\n"
-"Tret que hagueu fet el disc d'arrencada com es\n"
-"recomana, ja no podreu tornar a arrencar en Linux."
+"�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:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
 "Heu d'indicar on voleu situar la informaci� necess�ria per\n"
-"arrencar en Linux.\n"
+"arrencar el GNU/Linux.\n"
 "\n"
 "\n"
 "Tret que sabeu exactament qu� esteu fent, escolliu \"Primer sector\n"
 "de la unitat (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1981,10 +3026,10 @@ msgstr ""
 "habitual �s \"/dev/hda\" (el disc IDE mestre primari) o b� \"/dev/sda\"\n"
 "(el primer disc SCSI)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1995,7 +3040,7 @@ msgid ""
 "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 Linux o qualsevol altre sistema operatiu\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"
@@ -2006,7 +3051,7 @@ msgstr ""
 "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:359
+#: ../../help.pm_.c:659
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -2023,7 +3068,9 @@ msgid ""
 "\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."
 msgstr ""
 "Les opcions principals del LILO i del Grub s�n:\n"
@@ -2047,10 +3094,62 @@ msgstr ""
 "    * normal: selecciona el mode de text 80x25 normal.\n"
 "    * <n�mero>: utilitza el mode de text corresponent."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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!"
+
+#: ../../help.pm_.c:692
+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."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2062,7 +3161,7 @@ msgid ""
 "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 Linux. Per a aix�, heu de\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"
@@ -2074,7 +3173,7 @@ msgstr ""
 "convenen. Si no, podreu tornar enrere i canviar-los tantes vegades\n"
 "com calgui."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2082,7 +3181,7 @@ msgstr ""
 "Si hi ha algun problema a la configuraci� X, utilitzeu aquestes opcions\n"
 "per configurar correctament l'X Window System."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2090,81 +3189,85 @@ msgstr ""
 "Si preferiu utilitzar una entrada gr�fica, seleccioneu \"S�\". En cas\n"
 "contrari, seleccioneu \"No\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\n"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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"
+"\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"
+"\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."
 msgstr ""
 "Ara podeu seleccionar diverses opcions per al vostre sistema.\n"
 "\n"
-"  - Utilitzaci� de l'optimitzaci� del disc dur: Aquesta opci� pot\n"
-"millorar el funcionament del disc dur, per� �s nom�s per a usuaris\n"
-"avan�ats, ja que en podeu perdre les dades si s'utilitza\n"
-"incorrectament. Tingueu en compte que el nucli inclou una \"llista negra\"\n"
-"d'unitats i jocs de xips, per�, si voleu evitar-vos sorpreses "
-"desagradables,\n"
-"no activeu aquesta opci�.\n"
+"* Utilitzaci� de l'optimitzaci� del disc dur: Aquesta opci� pot millorar el\n"
+"rendiment del disc dur, per� �s nom�s per a usuaris avan�ats. Alguns xips\n"
+"amb errors poden fer malb� les vostres dades, aix� que aneu amb compte. El\n"
+"nucli inclou una \"llista negra\" d'unitats i jocs de xips, per�, si voleu\n"
+"evitar-vos sorpreses desagradables, no activeu aquesta opci�.\n"
+"\n"
 "\n"
-"  - Selecci� d'un nivell de seguretat: Podeu escollir un nivell de\n"
+"* Selecci� d'un nivell de seguretat: Podeu escollir un nivell de\n"
 "seguretat per al sistema. Si us plau, consulteu el manual per a m�s\n"
-"informaci�. B�sicament, si no n'esteu segur, trieu \"Mitjana\"; si voleu\n"
-"un ordinador realment segur, trieu \"Paranoica\", per� compte!: EN AQUEST\n"
-"NIVELL, L'USUARI ROOT NO POT ACCEDIR DES DE LA CONSOLA! Si voleu ser root,\n"
-"haureu d'entrar com a usuari i utilitzar \"su\" despr�s. En altres "
-"paraules,\n"
-"no espereu utilitzar l'ordinador si no �s com a servidor. Esteu avisat.\n"
-"\n"
-"  - Si cal, indicaci� de la mida exacta de la RAM: Malauradament, en el m�n "
-"de PC\n"
-"d'avui, no hi cap m�tode est�ndard per preguntar al BIOS la quantitat de "
-"RAM\n"
-"que hi ha a l'ordinador. Per tant, el Linux pot no poder detectar "
-"correctament\n"
-"la quantitat de RAM instal�lada. Si �s aquest el cas, en podeu indicar aqu�\n"
-"la quantitat correcta, per� penseu que una difer�ncia de 2 o 4 MB �s "
-"normal.\n"
-"\n"
-"  - Muntatge autom�tic de suports extra�bles: Si preferiu no haver\n"
+"informaci�. B�sicament, si no n'esteu segur, trieu l'opci� predeterminada.\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 hi ha 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.\n"
+"\n"
+"\n"
+"* Muntatge autom�tic de suports extra�bles: Si preferiu no haver\n"
 "de muntar manualment les unitats extra�bles (CD-ROM, disquet, Zip)\n"
 "escrivint \"mount\" i \"umount\", seleccioneu aquesta opci�.\n"
 "\n"
-"  - Habilitaci� de BlocNum a l'inici: Si voleu que BlocNum\n"
-"s'habiliti despr�s de l'arrencada, seleccioneu aquesta opci�\n"
-"(Nota: BlocNum pot funcionar o no sota X)."
+"\n"
+"* Neteja de \"/tmp\" en cada arrencada: si voleu suprimir tots els fitxers\n"
+"i directoris que hi ha emmagatzemats a \"/tmp\" quan arranqueu el sistema,\n"
+"seleccioneu aquesta opci�.\n"
+"\n"
+"\n"
+"* Habilitaci� de BlocNum a l'inici: Si voleu que BlocNum s'habiliti despr�s\n"
+"de l'arrencada, seleccioneu aquesta opci�. Tingueu en compte que no heu\n"
+"d'habilitar aquesta opci� en port�tils i que BlocNum pot funcionar o pot no\n"
+"funcionar sota X."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2178,96 +3281,117 @@ msgstr ""
 "autom�ticament. Si voleu arrencar un altre sistema operatiu existent,\n"
 "llegiu les instruccions addicionals."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Escolliu el vostre idioma"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Tipus d'instal�laci�"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Detecci� del disc dur"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Configura el ratol�"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Escolliu el vostre teclat"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Miscel�l�nia"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Sistemes de fitxers"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Formata les particions"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Paquets a instal�lar"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Instal�la el sistema"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Configura la xarxa"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Criptogr�fic"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Zona hor�ria"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Configura els serveis"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Configura la impressora"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Contrasenya de 'root'"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Afegeix un usuari"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Crea un disc d'arrencada"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Instal�la el LILO"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Configura l'X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Disquet d'instal�laci� autom�tica"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Surt de la instal�laci�"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "S'ha produ�t un error en llegir el fitxer $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "Si us plau, comproveu el ratol�."
+
+#: ../../install_gtk.pm_.c:427
+msgid "To activate the mouse,"
+msgstr "Per activar el ratol�,"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr "MOVEU LA BOLA!"
+
+#: ../../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 ""
+"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
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2277,49 +3401,193 @@ 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_any.pm_.c:334 ../../standalone/diskdrake_.c:61
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "Heu de tenir una partici� d'intercanvi"
+
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"I can't read your partition table, it's too corrupted for me :(\n"
-"I'll try to go on blanking bad partitions"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"No puc llegir la vostra taula de particions, est� massa malmesa per a mi :(\n"
-"Intentar� seguir buidant les particions incorrectes"
+"No teniu cap partici� d'intercanvi\n"
+"\n"
+"Voleu continuar igualment?"
+
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Utilitza l'espai lliure"
+
+#: ../../install_interactive.pm_.c:70
+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
+msgid "Use existing partition"
+msgstr "Utilitza la partici� existent"
+
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "No existeix cap partici� per utilitzar"
+
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Utilitza la particio Windows per al loopback"
+
+#: ../../install_interactive.pm_.c:90
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Quina partici� voleu utilitzar per al Linux4Win?"
+
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Escolliu les mides"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Mida de la partici� arrel en MB: "
+
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Mida de la partici� d'intercanvi en MB: "
+
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "Utilitza l'espai lliure de la partici� de Windows"
+
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "A quina partici� voleu canviar la mida?"
+
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "S'estan calculant els l�mits del sistema de fitxers de Windows"
+
+#: ../../install_interactive.pm_.c:109
+#, c-format
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
 msgstr ""
-"El DiskDrake no ha pogut llegir correctament la taula de particions.\n"
-"Si continueu, �s sota la vostra responsabilitat!"
+"El redimensionador de la FAT no pot gestionar la vostra partici�, \n"
+"s'ha produ�t l'error seg�ent: %s"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "S'est� cercant la partici� arrel."
+#: ../../install_interactive.pm_.c:112
+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_any.pm_.c:402
-msgid "Information"
-msgstr "Informaci�"
+#: ../../install_interactive.pm_.c:113
+msgid ""
+"WARNING!\n"
+"\n"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
+msgstr ""
+"ATENCI�!\n"
+"\n"
+"Ara, el DrakX canviar� la mida de la vostra partici� de Windows. Aneu amb\n"
+"compte: aquesta operaci� �s perillosa. Si encara no ho heu fet, sortiu de "
+"la\n"
+"instal�laci�, executeu l'Scandisk sota Windows (i potser tamb� el Defrag), "
+"i\n"
+"torneu a comen�ar la instal�laci�. Feu tamb� una c�pia de seguretat de les\n"
+"vostres dades.\n"
+"Quan estigueu segur, premeu D'acord."
+
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "Quina mida voleu deixar per a la partici� de Windows?"
 
-#: ../../install_any.pm_.c:403
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "%s: This is not a root partition, please select another one."
+msgid "partition %s"
+msgstr "partici� %s"
+
+#: ../../install_interactive.pm_.c:129
+#, c-format
+msgid "FAT resizing failed: %s"
+msgstr "Ha fallat la redimensi� de la FAT: %s"
+
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
 msgstr ""
-"%s: Aquesta partici� no �s arrel; si us plau, seleccioneu-ne una altra."
+"No hi ha particions FAT a qu� canviar la mida o per utilitzar-les com a "
+"loopback (o no queda prou espai)"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "No s'ha trobat cap partici� arrel"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "Esborra el disc complet"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "No es pot utilitzar l'emissi� sense un domini NIS"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Elimina el Windows(TM)"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "S'ha produ�t un error en llegir el fitxer $f"
+#: ../../install_interactive.pm_.c:153
+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_steps.pm_.c:75
+#: ../../install_interactive.pm_.c:156
+#, 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:164
+msgid "Expert mode"
+msgstr "Mode expert"
+
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "Utilitza el diskdrake"
+
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "Utilitza l'fdisk"
+
+#: ../../install_interactive.pm_.c:171
+#, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Ara podeu fer les particions a %s.\n"
+"Quan acabeu, no oblideu desar-les utiltzant `w'"
+
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Utilitza l'espai lliure de la partici� de Windows"
+
+#: ../../install_interactive.pm_.c:210
+msgid "I can't find any room for installing"
+msgstr "No puc trobar espai per a la instal�laci�"
+
+#: ../../install_interactive.pm_.c:213
+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:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Ha fallat el particionament: %s"
+
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "S'est� activant la xarxa"
+
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "S'est� desactivant la xarxa"
+
+#: ../../install_steps.pm_.c:74
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
@@ -2327,12 +3595,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:176
+#: ../../install_steps.pm_.c:196
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Duplica el punt de muntatge %s"
 
-#: ../../install_steps.pm_.c:323
+#: ../../install_steps.pm_.c:375
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -2344,169 +3612,46 @@ msgstr ""
 "Comproveu el CD-ROM en un ordinador instal�lat mitjan�ant \"rpm -qpl "
 "Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:390
+#: ../../install_steps.pm_.c:450
 #, c-format
 msgid "Welcome to %s"
 msgstr "Benvingut a %s"
 
-#: ../../install_steps.pm_.c:742
+#: ../../install_steps.pm_.c:662
 msgid "No floppy drive available"
 msgstr "No hi ha cap unitat de disquet disponible"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
 msgstr "S'est� introduint el pas `%s'\n"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "Heu de tenir una partici� d'intercanvi"
-
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_steps_gtk.pm_.c:136
 msgid ""
-"You don't have a swap partition\n"
-"\n"
-"Continue anyway?"
+"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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"No teniu cap partici� d'intercanvi\n"
-"\n"
-"Voleu continuar igualment?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Escolliu la mida que voleu instal�lar"
-
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Mida total: "
-
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Versi�: %s\n"
-
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "Mida: %d kB\n"
-
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-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:367
-msgid "Info"
-msgstr "Informaci�"
-
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Instal�la"
-
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "S'est� instal�lant"
-
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Si us plau, espereu, "
-
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Temps restant "
-
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Temps total "
-
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "S'est� preparant la instal�laci�"
-
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
-#, 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:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Voleu seguir igualment?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "S'ha produ�t un error en ordenar els paquets"
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Voleu utilitzar la configuraci� existent per a X11?"
+"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 "
+"en\n"
+"mode text. Per fer-ho, premeu `F1' en arrencar des del CD-ROM i escriviu "
+"`text'"
 
-#: ../../install_steps_gtk.pm_.c:158
+#: ../../install_steps_gtk.pm_.c:150
 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:199
-msgid "You don't have any windows partitions!"
-msgstr "No teniu cap partici� de Windows!"
-
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "No teniu prou espai per al Lnx4win"
-
-#: ../../install_steps_gtk.pm_.c:217
-msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
-msgstr ""
-"ATENCI�!\n"
-"\n"
-"Ara, el DrakX necessita canviar la mida de la vostra partici� de Windows.\n"
-"Aneu amb compte: aquesta operaci� �s perillosa. Si encara no ho heu fet,\n"
-"executeu primer l'Scandisk (i potser tamb� el Defrag) sobre aquesta "
-"partici�\n"
-"i fer una c�pia de seguretat de les vostres dades.\n"
-"Quan estigueu segur, premeu D'acord."
-
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Ha fallat la redimensi� autom�tica"
-
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Quina partici� voleu utilitzar per al Linux4win?"
-
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Escolliu les mides"
-
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Mida de la partici� arrel en MB: "
-
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Mida de la partici� d'intercanvi en MB: "
-
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2520,7 +3665,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:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2536,58 +3681,100 @@ 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:333
+#: ../../install_steps_gtk.pm_.c:228
 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:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Percentatge de paquets per instal�lar"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Escolliu els paquets que voleu instal�lar"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Informaci�"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Instal�la"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Depend�ncies autom�tiques"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Expandeix l'arbre"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Redueix l'arbre"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Commuta entre pla i ordenat per grups"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Paquet incorrecte"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nom: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versi�: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Mida: %d kB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Import�ncia: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Mida total: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+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:386
+msgid "The following packages are going to be installed"
+msgstr "Ara s'instal�laran els paquets seg�ents"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "Ara s'eliminaran els paquets seg�ents"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "No podeu seleccionar/desseleccionar aquest paquet"
+
+#: ../../install_steps_gtk.pm_.c:416
 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:473
+#: ../../install_steps_gtk.pm_.c:418
 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:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2595,46 +3782,88 @@ msgstr ""
 "Aquest paquet s'ha d'actualitzar\n"
 "Esteu segur que voleu desseleccionar-lo?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 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:493
-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:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Ara s'instal�laran/eliminaran els paquets seg�ents"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "No podeu seleccionar/desseleccionar aquest paquet"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "S'est� instal�lant"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "S'est� estimant"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Si us plau, espereu, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Temps restant "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Temps total "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Cancel�la"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "S'est� preparant la instal�laci�"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d paquets"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "S'est� instal�lant el paquet %s"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "Accepta"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2650,188 +3879,391 @@ msgstr ""
 "Si no el teniu, premeu Cancel�la per no fer la instal�laci� des d'aquest "
 "CD-ROM."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "Rebutja"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Voleu seguir igualment?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "S'ha produ�t un error en ordenar els paquets"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "S'ha produ�t un error en instal�lar els paquets"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "S'ha produ�t un error"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Si us plau, trieu un idioma per utilitzar."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Teclat"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Si us plau, selecioneu la disposici� del vostre teclat."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 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:91
-msgid "Root Partition"
-msgstr "Partici� arrel"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "Tots"
 
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Quina �s la partici� arrel (/) del vostre sistema?"
-
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Tipus d'instal�laci�"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Quin tipus d'instal�laci� voleu?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Install/Update"
 msgstr "Instal�la/Actualitza"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Is this an install or an update?"
 msgstr "Es tracta d'una instal�laci� o d'una actualitzaci�?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Autom�tica"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Recomanada"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Personalitzada"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Expert"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "Esteu segur que sou un expert? \n"
-"Aqu� podreu fer coses molt potents, per� tamb� perilloses."
+"Aqu� podreu fer coses molt potents, per� tamb� perilloses.\n"
+"\n"
+"Us preguntaran coses com: ``Voleu utilitzar un fitxer d'ombres per a les "
+"contrasenyes?'',\n"
+"Sou capa� de respondre aquest tipus de preguntes?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+msgid "Update"
 msgstr "Actualitza"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Normal"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "Estaci� de treball"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Desenvolupament"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Servidor"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
-msgstr "Amb quina finalitat utilitzeu el sistema? "
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
+msgstr "Amb quina finalitat utilitzeu el sistema?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Si us plau, seleccioneu el vostre tipus de ratol�."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Port del ratol�"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 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:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "S'estan configurant les targetes PCMCIA..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "S'est� configurant l'IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "no hi ha particions disponibles"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Si us plau, seleccioneu una partici� per utilitzar-la com a arrel."
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr "S'estan explorant les particions per trobar els punts de muntatge"
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Escolliu els punts de muntatge"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"No puc llegir la vostra taula de particions, est� massa malmesa per a mi :(\n"
+"Intentar� seguir, buidant les particions incorrectes (es perdran TOTES LES "
+"DADES!).\n"
+"L'altra soluci� �s impedir al DrakX que modifiqui la taula de particions.\n"
+"(l'error �s %s)\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+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:337
+msgid "Root Partition"
+msgstr "Partici� arrel"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Quina �s la partici� arrel (/) del vostre sistema?"
+
+#: ../../install_steps_interactive.pm_.c:352
 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:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Escolliu les particions que voleu formatar"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Voleu comprovar els blocs incorrectes?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "S'estan formatant les particions"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "S'est� creant i formatant el fitxer %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 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:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "S'estan cercant els paquets disponibles"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "S'estan cercant els paquets a actualitzar"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
-"Al sistema no li queda prou espai per a la instal�laci� o actualitzaci�"
+"Al vostre sistema no li queda prou espai per a la instal�laci� o "
+"actualitzaci� (%d > %d)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "Completa (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "M�nima (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Recomanada (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "Personalitzada"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "Seleccioneu la mida que voleu instal�lar"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Selecci� del grup de paquets"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Selecci� individual de paquets"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2841,12 +4273,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:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROM etiquetat com \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2854,175 +4286,11 @@ msgstr ""
 "S'est� instal�lant el paquet %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Publica la configuraci� de la instal�laci� "
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Conserva la configuraci� IP actual"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Torna a configurar la xarxa ara"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "No configuris la xarxa"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Configuraci� de xarxa"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "La xarxa local ja s'ha configurat. Voleu:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Voleu configurar la xarxa local per al vostre sistema?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "no s'ha trobat cap targeta de xarxa"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Configuraci� del m�dem"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr ""
-"Voleu configurar el marcatge amb xarxa per m�dem per al vostre sistema?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "S'est� configurant el dispositiu de xarxa %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Si us plau, introdu�u la configuraci� IP d'aquest ordinador.\n"
-"S'ha d'introduir cada element com a una adre�a IP amb notaci� decimal amb\n"
-"punts (per exemple, 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "IP autom�tic"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "Adre�a IP:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Subm�scara de la xarxa:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-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"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "S'est� configurant la xarxa"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Si us plau, introdu�u el nom del vostre ordinador central.\n"
-"Aquest nom ha de ser complet, com ara\n"
-"``mybox.mylab.myco.com''.\n"
-"Tamb� podeu introduir l'adre�a IP de la passarel�la, si en teniu una"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "servidor DNS:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Dispositiu de la passarel�la:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Passarel�la:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Nom de l'ordinador central:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Voleu que intenti trobar un m�dem?"
-
-#: ../../install_steps_interactive.pm_.c:521
-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."
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Opcions de marcatge"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Nom de la connexi�"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "N�mero de tel�fon"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "ID d'entrada"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Autenticaci�"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Basat en script"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Basat en terminal"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Nom de domini"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Servidor DNS primari"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Servidor DNS secundari"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3089,91 +4357,95 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Escolliu un mirror al qual aconseguir els paquets"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 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:592
+#: ../../install_steps_interactive.pm_.c:679
 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:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
-msgstr "Quina �s la vostra zona hor�ria?"
+msgstr "En quina zona hor�ria us trobeu?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "El rellotge del vostre ordinador est� regulat a GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "Quin sistema d'impressi� voleu utilitzar?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Sense contrasenya"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Utilitza el fitxer d'ombra"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "ombra"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Utilitza les contrasenyes MD5"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Utilitza el NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "p�gines grogues"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, 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:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "NIS d'autenticaci�"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "Domini del NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "Servidor NIS"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Accepta l'usuari"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Afegeix un usuari"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(ja s'ha afegit %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3183,61 +4455,91 @@ msgstr ""
 "Introdu�u un usuari\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Nom real"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Nom d'usuari"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Icona"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Aquesta contrasenya �s massa senzilla"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Si us plau, introdu�u un nom d'usuari"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 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 `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Aquest nom d'usuari ja s'ha afegit"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Un disc d'arrencada personalitzat proporciona una manera d'arrencar el "
+"vostre\n"
+"sistema Linux sense dependre del carregador d'arrencada normal. Aix� �s "
+"�til\n"
+"si no voleu instal�lar el SILO al sistema, o si un altre sistema operatiu\n"
+"elimina el SILO, o si el SILO no funciona amb la vostra configuraci� de\n"
+"maquinari. Un disc d'arrencada personalitzat tamb� es pot utilitzar amb la\n"
+"imatge de rescat del Mandrake, facilitant molt la recuperaci� de fallides\n"
+"serioses del sistema.\n"
+"\n"
+"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:869
 msgid "First floppy drive"
 msgstr "Primera unitat de disquet"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Segona unitat de disquet"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Omet"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3261,66 +4563,34 @@ 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:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "No hi ha cap unitat de disquet disponible"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 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:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Inseriu un disquet a la unitat %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "S'est� creant el disc d'arrencada"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-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:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Voleu utilitzar el SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "Opcions principals del SILO"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Aquestes s�n les entrades seg�ents del SILO.\n"
-"Podeu afegir-ne algunes m�s o canviar-ne les existents."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Partici�"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Aquesta etiqueta ja est� en �s"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "Ha fallat la instal�laci� del SILO. S'ha produ�t l'error seg�ent:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "S'est� preparant el carregador d'arrencada"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
-msgstr "Voleu utilitzar aboot?"
+msgstr "Voleu utilitzar l'aboot?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3329,128 +4599,124 @@ msgstr ""
 "voleu intentar igualment la instal�laci� encara que aix� destrueixi la "
 "primera partici�?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Configuraci� dels proxys"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "Proxy HTTP"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "Proxy FTP"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "El proxy ha de ser http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "El proxy ha de ser ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+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:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Benvinguts, crackers"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Pobre"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Baix"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Mitj�"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Alt"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoic"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Preguntes diverses"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(pot malmetre les dades)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Voleu utilitzar l'optimitzaci� del disc dur?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Escolliu el nivell de seguretat"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Mida exacta de la RAM, si cal (s'han trobat %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Muntatge autom�tic del suport extra�ble"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Buida /tmp en cada arrencada"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Habilita perfils m�ltiples"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Habilita la tecla Bloc Num en iniciar"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Introdu�u la mida de la RAM en Mb"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "No es pot utilitzar supermount en un nivell d'alta seguretat"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"El DrakX generar� els fitxers de configuraci� tant per a l'XFree 3.3 com per "
-"a l'Xfree 4.0.\n"
-"Per defecte, s'utilitza el servidor 3.3 perqu� funciona en m�s targetes "
-"gr�fiques.\n"
-"\n"
-"Voleu provar l'Xfree 4.0?"
+"Atenci�: EN AQUEST NIVELL DE SEGURETAT NO ES POT ENTRAR COM A ROOT A LA "
+"CONSOLA!\n"
+"Si voleu ser root, heu d'entrar com a usuari i aleshores utilitzar \"su\".\n"
+"En general, no espereu utilitzar l'ordinador per a altre cosa que com a "
+"servidor.\n"
+"Esteu avisat."
+
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"Aneu amb compte; si teniu BlocN�m habilitat, moltes tecles donaran\n"
+"n�meros en comptes de lletres (p.ex., si premeu la `p' obtindreu un `6')"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Voleu que intenti trobar dispositius PCI?"
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Voleu utilitzar la configuraci� existent per a X11?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 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:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, 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:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "S'est� creant el diquet d'instal�laci� autom�tica"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3460,7 +4726,7 @@ msgstr ""
 "\n"
 "Segur que voleu sortir ara?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3483,153 +4749,18 @@ msgstr ""
 "l'�ltim cap�tol d'instal�laci� de la Guia Oficial de l'Usuari del\n"
 "Linux-Mandrake."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "S'est� tancant l'ordinador"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "S'est� instal�lant el programa de control per a la targeta %s %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(m�dul %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Quin programa de control %s he de provar?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"En alguns casos, el programa de control %s necessita informaci� addicional\n"
-"per funcionar correctament, tot i que normalment funciona b� sense ella.\n"
-"Voleu especificar opcions addicionals o deixar que el programa de control\n"
-"cerqui al vostre ordinador la informaci� que necessita? Aquesta recerca\n"
-"podria blocar l'ordinador, per� aix� no causaria cap dany."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Exploraci� autom�tica"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Especifica les opcions"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Ara podeu proporcionar les seves opcions per al m�dul %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Ara podeu proporcionar les seves opcions per al m�dul %s.\n"
-"Les opcions estan amb el format ``nom=valor nom2=valor2 ...''.\n"
-"Per exemple, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Opcions del m�dul:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Ha fallat la c�rrega del m�dul %s.\n"
-"Voleu tornar-ho a intentar amb altres par�metres?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Voleu que intenti trobar targetes PCMCIA?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "S'estan configurant les targetes PCMCIA..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Voleu que intenti trobar els dispositius %s?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "S'han trobat %s interf�cies %s"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "En teniu una altra?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Teniu alguna interf�cie %s?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "No"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "S�"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Mira la informaci� del maquinari"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "S'est� activant la xarxa"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "S'est� desactivant la xarxa"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Instal�laci� del Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> entre elements  | <Espai> selecciona | <F12> pant. seg�ent"
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"Ara podeu fer les particions al disc dur %s\n"
-"Quan acabeu, no oblideu desar-les utiltzant `w'"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Si us plau, espereu"
 
@@ -3639,7 +4770,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Ambig�itat (%s), sigueu m�s prec�s\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Elecci� incorrecta, torneu-ho a intentar\n"
 
@@ -3653,448 +4784,955 @@ msgstr " ? (predeterminat %s) "
 msgid "Your choice? (default %s) "
 msgstr "La vostra elecci�? (predeterminat %s)"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "La vostra elecci�? (predeterminat %s  introdu�u `cap' per a cap) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "Txec"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Alemany"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Espanyol"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Fin�s"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Franc�s"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Noruec"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Polon�s"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Rus"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Teclat RU"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "Teclat EU"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armeni (antic)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armeni (m�quina d'escriure)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armeni (fon�tic)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "Azerbaidjan�s (llat�)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "Azerbaidjan�s (cir�l�lic)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "B�lgar"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasiler (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "Bielor�s"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Su�s (disposici� alemanya)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Su�s (disposici� francesa)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Alemany (sense tecles inoperatives)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Dan�s"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak (EU)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (Noruec)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Estoni�"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgi� (disposici� \"russa\")"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgi� (disposici� \"llatina\")"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Grec"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Hongar�s"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Israeli�"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Israeli� (fon�tic)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Irani�"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Island�s"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Itali�"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "Japon�s de 106 tecles"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Espanyol sud-americ�"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Holand�s"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litu� AZERTY (antic)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litu� AZERTY (nou)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litu� \"fila de n�meros\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litu� \"fon�tic\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Polon�s (disposici� qwerty)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Polon�s (disposici� qwertz)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugu�s"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Canadenc (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Rus (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Suec"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Eslov�"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Eslovac"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Teclat thai"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turc (tradicional, model \"F\")"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turc (modern, model \"Q\")"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ucra�n�s"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "Teclat EU (internacional)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vietnamita \"fila de n�meros\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Iugoslau (disposici� llatina)"
 
-# 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
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - Mouse"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "Est�ndard"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "General"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "De bola"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "s�rie"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Generic 2 Button Mouse"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Generic 3 Button Mouse"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (s�rie, tipus C7 antic)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Cap ratol�"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2 botons"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3 botons"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "cap"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Cap ratol�"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "Seg�ent ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Aix� �s correcte?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Configuraci� d'Internet"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Voleu intentar connectar-vos a Internet ara?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Configura la connexi� a Internet"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "No et connectis a Internet"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Connecta't a Internet / Configura la xarxa local"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "Configuraci� de l'XDSI"
+
+#: ../../netconnect.pm_.c:141
+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:158
+msgid "Connection Configuration"
+msgstr "Configuraci� de la connexi�"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "Si us plau, ompliu o marqueu el camp inferior"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "Targeta IRQ"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "Targeta de mem�ria (DMA)"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "Targeta d'E/S"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "Targeta d'E/S_0"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "Targeta d'E/S_1"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "El vostre tel�fon particular"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "Nom del prove�dor (p.ex. proveidor.net)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "N�mero de tel�fon del prove�dor"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "DNS 1 del prove�dor"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "DNS 2 del prove�dor"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "Mode de marcatge"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "Entrada del compte (nom d'usuari)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Contrasenya del compte"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Confirmeu la contrasenya"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "Europa"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Europa (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "Resta del m�n"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "Resta del m�n - cap canal D (l�nies llogades)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "Quin protocol voleu utilitzar?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "No s�"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "Quin tipus de targeta teniu?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "Continua"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "Interromp"
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
 "\n"
+"Si teniu una targeta ISA, els valors de la pantalla seg�ent han de ser "
+"correctes.\n"
+"\n"
+"Si teniu una targeta PCMCIA, us en cal saber l'irq i l'io.\n"
+
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "Quina targeta XDSI teniu ?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "He trobat una targeta XDSI:\n"
+
+#: ../../netconnect.pm_.c:287
+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 ""
+"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:299
+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:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"Benvingut al LILO, la utilitat que us permet triar el sistema operatiu!\n"
+"No s'ha detectat cap adaptador de xarxa ethernet al sistema.\n"
+"No puc configurar aquest tipus de connexi�."
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Escolliu la interf�cie de xarxa"
+
+#: ../../netconnect.pm_.c:336
+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:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "Interf�cie de la xarxa"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
-"Per obtenir una llista de les eleccions possibles, premeu <TAB>.\n"
+"Do you agree?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Ara reiniciar� el dispositiu de xarxa $device. Hi esteu d'acord?"
+
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "Configuraci� de l'ADSL"
+
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "Voleu iniciar la connexi� en arrencar?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Voleu que intenti trobar un m�dem?"
+
+#: ../../netconnect.pm_.c:539
+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:544
+msgid "Dialup options"
+msgstr "Opcions de marcatge"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Nom de la connexi�"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "N�mero de tel�fon"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "ID d'entrada"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Autenticaci�"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Basat en script"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Basat en terminal"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Nom de domini"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Servidor DNS primari"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Servidor DNS secundari"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
 "\n"
-"Per carregar-ne una, escriviu-ne el nom i premeu <INTRO> o espereu %d "
-"segons\n"
-"fins a l'arrencada predeterminada.\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Connecta't a Internet / Configura la xarxa local"
 
-# 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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Benvingut al GRUB, el selector de sistema operatiu!"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "Configura la connexi� a Internet"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "No et connectis a Internet"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
 msgstr ""
-"Utilitzeu les tecles %c i %c per seleccionar quina posici� est� ressaltada."
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Premeu Intro per arrencar el SO seleccionat, 'e' per editar les"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "No et connectis a Internet"
 
-#: ../../lilo.pm_.c:434
-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."
+#: ../../netconnect.pm_.c:590
+msgid "Connect to Internet"
+msgstr "Connecta't a Internet"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "La posici� ressaltada arrencar� autom�ticament dintre de %d segons."
+#: ../../netconnect.pm_.c:592
+msgid "Disconnect from Internet"
+msgstr "Desconnecta't d'Internet"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "no hi ha prou espai a /boot"
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Configura la connexi� a Internet"
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Escriptori"
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "Connexi� i configuraci� d'Internet"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Men� Inici"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+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?"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - Mouse"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Configura la connexi� a Internet"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB Mouse"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Configura la connexi� a Internet"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB Mouse (2 botons)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Targeta XDSI interna"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB Mouse (3 o m�s botons)"
+#: ../../netconnect.pm_.c:668
+msgid "External ISDN modem"
+msgstr "M�dem XDSI extern"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB Mouse"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "Connecta't a internet"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB Mouse (2 botons)"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "Quin tipus de connexi� XDSI teniu?"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB Mouse (3 o m�s botons)"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Configura la connexi� a Internet"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Generic Mouse (PS/2)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "Fran�a"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "Altres pa�sos"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Generic 3 Button Mouse (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "A quin pa�s us trobeu?"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "M�dem Alcatel"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "M�dem ECI"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
+"Si el vostre m�dem adsl �s un m�dem Alcatel, seleccioneu Alcatel. Si no, ECI."
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "utilitza pppoe"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "no utilitzis pppoe"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"La manera m�s habitual de connectar amb adsl �s dhcp + pppoe.\n"
+"No obstant aix�, hi ha connexions que utilitzen nom�s dhcp.\n"
+"Si no ho sabeu, escolliu 'utilitza pppoe'"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Configura la connexi� a Internet"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"Quin client dhcp voleu utilitzar?\n"
+"El predeterminat �s dhcpd"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus Mouse"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Configura la connexi� a Internet"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus Mouse"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "Configura la xarxa local"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus Mouse"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Configuraci� de xarxa"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB Mouse"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Voleu comprovar la configuraci�?"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB Mouse (3 o m�s botons)"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "Inhabilita el sistema de xarxa"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Cap ratol�"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Connecta't a Internet / Configura la xarxa local"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A o superior (s�rie)"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"La xarxa local ja s'ha configurat.\n"
+"Voleu:"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (s�rie)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "Com us voleu connectar a Internet?"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (s�rie)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Configuraci� de xarxa"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (s�rie)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
+"Ara que ja teniu configurada la connexi� a Internet,\n"
+"podeu configurar l'ordinador per tal que la comparteixi.\n"
+"Nota: per configurar una xarxa d'�rea local (LAN), us cal un adaptador de "
+"xarxa dedicat.\n"
+"\n"
+"Voleu configurar la compartici� de la connexi� a Internet?\n"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (s�rie)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "no s'ha trobat cap targeta de xarxa"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (s�rie)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "S'est� configurant la xarxa"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (s�rie)"
+#: ../../network.pm_.c:274
+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''."
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (s�rie)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "Nom de l'ordinador central"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (s�rie, tipus C7 antic)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+"ATENCI�: Aquest dispositiu ja es va configurar per connectar-se a Internet.\n"
+"Nom�s cal que premeu D'acord per conservar-lo configurat.\n"
+"Si modifiqueu els camps inferiors, sobreescriureu aquesta configuraci�."
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (s�rie)"
+#: ../../network.pm_.c:302
+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 ""
+"Si us plau, introdu�u la configuraci� IP d'aquest ordinador.\n"
+"S'ha d'introduir cada element com a una adre�a IP amb notaci� decimal amb\n"
+"punts (per exemple, 1.2.3.4)."
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Generic Mouse (s�rie)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "S'est� configurant el dispositiu de xarxa %s"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Compatible Microsoft (s�rie)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "IP autom�tic"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Ratol� Generic de 3 botons (s�rie)"
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "Adre�a IP"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (s�rie)"
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "Subm�scara de la xarxa"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Aix� �s correcte?"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+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:341
+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 ""
+"Si us plau, introdu�u el nom del vostre ordinador central.\n"
+"Aquest nom ha de ser complet, com ara\n"
+"``mybox.mylab.myco.com''.\n"
+"Tamb� podeu introduir l'adre�a IP de la passarel�la, si en teniu una"
+
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "servidor DNS"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "Passarel�la"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "Dispositiu de la passarel�la"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "Configuraci� dels proxys"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "Proxy HTTP"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "Proxy FTP"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "El proxy ha de ser http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "El proxy ha de ser ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr "Aquesta plataforma no suporta particions esteses"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4104,21 +5742,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:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "S'ha produ�t un error en llegir el fitxer %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Ha fallat la restauraci� del fitxer %s: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Fitxer de c�pia de seguretat incorrecte"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "S'ha produ�t un error en escriure al fitxer %s"
@@ -4152,42 +5790,51 @@ msgstr "interessant"
 msgid "maybe"
 msgstr "potser"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (important)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (molt bonic)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (bonic)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Mostra'n menys"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Mostra'n m�s"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Impressora local"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "lpd remot"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "Impressora remota"
+
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "Servidor CUPS remot"
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "Servidor lpd remot"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "Impressora de xarxa (s�col)"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "Dispositiu URI d'impressora"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "S'estan detectant els dispositius..."
@@ -4201,11 +5848,11 @@ msgstr "Ports de comprovaci�"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "S'ha detectat una impressora, model \"%s\", a"
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Dispositiu de la impressora local"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4213,15 +5860,15 @@ msgstr ""
 "A quin dispositiu est� connectada la vostra impressora?\n"
 "(tingueu en compte que /dev/lp0 equival a LPT1:)\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Dispositiu d'impressora"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Opcions de la impressora lpd remota"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4231,19 +5878,19 @@ msgstr ""
 "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:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Nom de l'ordinador central remot"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Cua remota"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opcions de la impressora SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4258,27 +5905,27 @@ 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:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "Ordinador central del servidor SMB"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP del servidor SMB"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Nom de compartici�"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Grup de treball"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "Opcions de la impressora NetWare"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4292,130 +5939,154 @@ msgstr ""
 "la impressora a qu� voleu accedir i el nom d'usuari i contrasenya si s�n\n"
 "necessaris."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Servidor de la impressora"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Nom de la cua d'impressi�"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "Opcions de la impressora de s�col"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+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:141
+msgid "Printer Hostname"
+msgstr "Nom de l'ordinador central de la impressora"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:155
+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:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Quin tipus d'impressora teniu?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Voleu comprovar la impressi�?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "S'esta(n) imprimint la(es) p�gina(es) de prova... "
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\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"
+"Estat de la impressi�:\n"
+"%s\n"
+"\n"
+"Funciona correctament?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+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:230
 msgid "Yes, print ASCII test page"
 msgstr "S�, imprimeix una p�gina ASCII de prova"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "S�, imprimeix una p�gina PostScript de prova"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "S�, imprimeix ambdues p�gines de prova"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Configura la impressora"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Quin tipus d'impressora teniu?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Opcions de la impressora"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Mida del paper"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Voleu expulsar la p�gina despr�s de la tasca?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Opcions del programa de control Uniprint"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Opcions de profunditat del color"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Voleu imprimir el text com a PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Inverteix l'ordre de les p�gines"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Voleu ajustar el text 'stair-stepping'?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Nombre de p�gines per p�gines de sortida"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Marges dret/esquerra en punts (1/72 de polzada)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Marges superior/inferior en punts (1/72 de polzada)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "opcions addicionals del GhostScript"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Opcions addicionals per al text"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Voleu comprovar la impressi�?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "S'esta(n) imprimint la(es) p�gina(es) de prova... "
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\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"
-"Estat de la impressi�:\n"
-"%s\n"
-"\n"
-"Funciona correctament?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-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:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Impressora"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Voleu configurar una impressora?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4423,19 +6094,66 @@ 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:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "S'est� iniciant el CUPS"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr "S'est� llegint la base de dades de controladors CUPS..."
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Seleccioneu la connexi� de la impressora"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Com est� connectada la impressora?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "Seleccioneu la connexi� de la impressora remota"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+"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:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Elimina la cua"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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?"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "Nom de la impressora"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "Descripci�"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "Ubicaci�"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4447,45 +6165,45 @@ msgstr ""
 "directori cal utilitzar per a aquesta cua, i com est� connectada la "
 "impressora?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Nom de la cua"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Directori d'spool"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Connexi� de la impressora"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, 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:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "No es pot escriure al fitxer $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "l'mkraid ha fallit"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "l'mkraid ha fallit (potser manquen eines del RAID?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, 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:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, un programador d'ordres peri�diques."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4494,7 +6212,7 @@ msgstr ""
 "mitjan�ant el registre del sistema.\n"
 "Tamb� es pot utilitzar per apagar l'ordinador quan queda poca bateria."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4503,7 +6221,7 @@ msgstr ""
 "especificar en executar 'at', i executa les ordres 'batch' quan la\n"
 "mitjana de c�rrega �s prou baixa."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4515,7 +6233,7 @@ msgstr ""
 "caracter�stiques al cron b�sic, incloent seguretat millorada i opcions\n"
 "de configuraci� m�s potents."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4526,7 +6244,7 @@ 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:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4534,7 +6252,7 @@ msgstr ""
 "L'Apache �s un servidor de World Wide Web. S'utilitza per servir fitxers\n"
 "HTML i CGI."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4549,7 +6267,7 @@ 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:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4560,7 +6278,7 @@ msgstr ""
 "kbdconfig.\n"
 "Per a la majoria d'ordinadors, s'ha de deixar habilitat."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4569,7 +6287,7 @@ msgstr ""
 "correctament. B�sicament, es tracta d'un servidor que assigna les\n"
 "tasques d'impressi� a la(es) impressora(es)."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4577,7 +6295,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:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4585,7 +6303,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:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4593,7 +6311,7 @@ msgstr ""
 "Activa/Desactiva totes les interf�cies de xarxa configurades per\n"
 "iniciar-se durant l'arrencada."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4603,7 +6321,7 @@ msgstr ""
 "Aquest servei proporciona la funcionalitat del servidor NFS, que es\n"
 "configura mitjan�ant el fitxer /etc/exports."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4611,7 +6329,7 @@ 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:47
+#: ../../services.pm_.c:48
 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 "
@@ -4622,7 +6340,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:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4634,7 +6352,7 @@ msgstr ""
 "executant en ordinadors que actuen com a servidors per a protocols que\n"
 "utilitzen el mecanisme RPC."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4642,7 +6360,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:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4650,7 +6368,7 @@ 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:57
+#: ../../services.pm_.c:58
 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"
@@ -4661,7 +6379,7 @@ msgstr ""
 "�mpliament en xarxes petites, les xarxes complexes necessiten protocols\n"
 "d'encaminament m�s complexs."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4669,7 +6387,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:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4677,7 +6395,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:64
+#: ../../services.pm_.c:65
 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)."
@@ -4686,7 +6404,7 @@ 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:66
+#: ../../services.pm_.c:67
 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."
@@ -4695,63 +6413,236 @@ msgstr ""
 "missatges en diversos fitxers de registre del sistema. �s aconsellable\n"
 "executar-lo sempre."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 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."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "Inicia i atura l'X Font Server en arrencar i apagar l'ordinador."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 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"
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Benvingut al SILO, la utilitat que us permet triar el sistema operatiu!\n"
-"\n"
-"Per obtenir una llista de les eleccions possibles, premeu <TAB>.\n"
-"\n"
-"Per carregar-ne una, escriviu-ne el nom i premeu <INTRO> o espereu %d "
-"segons\n"
-"fins a l'arrencada predeterminada.\n"
+"No puc llegir la vostra taula de particions, est� massa malmesa per a mi :(\n"
+"Intentar� seguir buidant les particions incorrectes"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Configura el LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Crea un disquet d'arrencada"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Formata el disquet"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Elecci�"
 
+#: ../../standalone/drakboot_.c:59
+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:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "La compartici� de connexi� a Internet est� habilitada"
+
+#: ../../standalone/drakgw_.c:104
+#, fuzzy
+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 "La compartici� de la connexi� a Internet ja ha estat configurada.\n"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Taula"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Configura l'X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "La compartici� de connexi� a Internet est� inhabilitada"
+
+#: ../../standalone/drakgw_.c:123
+#, fuzzy
+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 "La compartici� de la connexi� a Internet ja ha estat configurada.\n"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Taula"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "No s'ha pogut interpretar el contingut del fitxer de configuraci�."
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "Compartici� de la connexi� a Internet"
+
+#: ../../standalone/drakgw_.c:152
+#, fuzzy
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+"Ara que ja teniu configurada la connexi� a Internet,\n"
+"podeu configurar l'ordinador per tal que la comparteixi.\n"
+"Nota: per configurar una xarxa d'�rea local (LAN), us cal un adaptador de "
+"xarxa dedicat.\n"
+"\n"
+"Voleu configurar la compartici� de la connexi� a Internet?\n"
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Mode de marcatge"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "No teniu cap adaptador de xarxa al sistema!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"No s'ha detectat cap adaptador de xarxa ethernet al sistema. Si us plau, "
+"executeu l'eina de configuraci� de maquinari."
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"Nom�s teniu un adaptador de xarxa configurat al sistema:\n"
+"\n"
+"$interface\n"
+"\n"
+"Voleu configurar la vostra xarxa d'�rea local amb aquest adaptador?"
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"Si us plau, escolliu l'adaptador de xarxa que es connectar�\n"
+"a la vostra xarxa d'�rea local."
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"Compte, l'adaptador de xarxa ja est� configurat.\n"
+"El voleu tornar a configurar?"
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+"S'ha trobat un conflicte potencial d'adre�a LAN en la configuraci� actual de "
+"$_!\n"
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "S'ha detectat la configuraci� del sistema de tallafocs!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+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�. "
+"Voleu continuar?"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+"S'estan configurant les seq��ncies, instal�lant el programari, iniciant els "
+"servidors..."
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "S'est� configurant l'IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "No s'ha pogut instal�lar el RPM d'ipchains amb l'urpmi."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "No s'ha pogut instal�lar el RPM de dhcp amb l'urpmi."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "No s'ha pogut instal�lar el RPM de linuxconf amb l'urpmi."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "No s'ha pogut instal�lar el RPM de bind amb l'urpmi."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "No s'ha pogut instal�lar el RPM de caching-nameserver amb l'urpmi"
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Felicitats!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
 "but very sensitive: it must not be used for a machine connected to others\n"
 "or to the Internet. There is no password access."
 msgstr ""
-"Aquest nivell s'ha d'utilitzar amb cura. Fa el vostre sistema molt m�s\n"
-"f�cil d'utilitzar, per� tamb� molt sensible: no s'ha d'utilitzar en un\n"
-"ordinador connectat a d'altres o a Internet. No hi ha contrasenya d'acc�s."
+"Aquest nivell s'ha d'utilitzar amb cura. Fa el vostre sistema molt m�s "
+"f�cil\n"
+"d'utilitzar, per� tamb� molt sensible: no s'ha d'utilitzar en un ordinador\n"
+"connectat a d'altres o a Internet. No s'hi accedeix mitjan�ant contrasenya."
 
 #: ../../standalone/draksec_.c:31
 msgid ""
@@ -4807,23 +6698,37 @@ msgstr "S'est� establint el nivell de seguretat"
 msgid "Choose the tool you want to use"
 msgstr "Escolliu l'eina que voleu utilitzar "
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Quina �s la disposici� del vostre teclat?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Canvia la resoluci�"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "De quin tipus �s el vostre ratol�?"
+#: ../../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 ""
+"Canvieu el vostre CD-ROM!\n"
+"\n"
+"Si us plau, inseriu el CD-ROM etiquetat com \"%s\" a la unitat i despr�s\n"
+"premeu D'acord.\n"
+"Si no el teniu, premeu Cancel�la per no fer la instal�laci� des d'aquest "
+"CD-ROM."
+
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "no s'ha trobat cap serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Voleu emular el tercer bot�?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "A quin port s�rie est� connectat el vostre ratol�?"
 
@@ -5036,6 +6941,1260 @@ msgstr "S'estan cercant les fulles"
 msgid "Finding leaves takes some time"
 msgstr "Cal una mica de temps per cercar les fulles"
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Configuraci� d'Internet"
+
+#, fuzzy
+msgid "Internet"
+msgstr "interessant"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+#, fuzzy
+msgid "Office"
+msgstr "bonic"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multim�dia"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multim�dia"
+
+#, fuzzy
+msgid "Gnome"
+msgstr "cap"
+
+msgid "Documentation"
+msgstr "Documentaci�"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Escolliu la mida que voleu instal�lar"
+
+#~ msgid "Total size: "
+#~ msgstr "Mida total: "
+
+#~ msgid "Reconfigure local network"
+#~ msgstr "Torna a configurar la xarxa local"
+
+#~ msgid ""
+#~ " Introduction\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"
+#~ "\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., 43, rue d'Aboukir, 75002 Paris - France, 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. 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"
+#~ "Some versions of the Software Products may contain components which are not "
+#~ "governed by the GPL \n"
+#~ "License or similar agreements. Each such component is then governed by the "
+#~ "terms and conditions \n"
+#~ "of its own specific license. Please read carefully and comply with such "
+#~ "specific licenses before \n"
+#~ "you install, use or redistribute the said components. Such licenses will in "
+#~ "general prevent the \n"
+#~ "transfer,  duplication (except for backup purposes), redistribution, reverse "
+#~ "engineering, \n"
+#~ "de-assembly, \n"
+#~ "de-compilation or modification of the component. Any breach of agreement "
+#~ "will immediately terminate \n"
+#~ "your rights under the specific license. Unless the specific license terms "
+#~ "grant you such rights, \n"
+#~ "you usually cannot install the programs on more than one system, or adapt it "
+#~ "to be used on a \n"
+#~ "network. \n"
+#~ "In doubt, please contact directly the distributor or editor of the "
+#~ "component. Transfer to third \n"
+#~ "parties or copying of such components including the documentation is usually "
+#~ "forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "3. 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,\n"
+#~ "by all means and for all purposes.\n"
+#~ "\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "
+#~ "MandrakeSoft S.A.  All rights \n"
+#~ "are \n"
+#~ "reserved. The duplication is forbidden without prior written consent by "
+#~ "MandrakeSoft S.A.\n"
+#~ "\n"
+#~ "\n"
+#~ "4. Limited Warranty\n"
+#~ "\n"
+#~ "The Software Products and attached documentation are provided \"as is\", "
+#~ "with no warranty, to the \n"
+#~ "extent permitted by law. Should the Software Products be defective, "
+#~ "MandrakeSoft S.A. will at its \n"
+#~ "own will either replace the Software Products, or reimburse the paid fee.\n"
+#~ "This limited warranty is void if you fail to comply to the recommendations, "
+#~ "instructions and \n"
+#~ "conditions \n"
+#~ "of use listed in the documentation or license agreements of the Software "
+#~ "Products.\n"
+#~ "To the extent permitted by law, MandrakeSoft S.A. will in no circumstances "
+#~ "be liable for any \n"
+#~ "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"
+#~ "judgement, or any other consequential loss) arising out of  the use or "
+#~ "inability to use the \n"
+#~ "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 \n"
+#~ "damages for loss of business, interruption of business, financial loss, "
+#~ "legal fees and penalties \n"
+#~ "resulting from a court judgement, or any other consequential loss) arising "
+#~ "out of the possession \n"
+#~ "and \n"
+#~ "use of software components or arising out of  downloading software "
+#~ "components from one of \n"
+#~ "Linux-Mandrake \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 "
+#~ "included in the Software \n"
+#~ "Products.\n"
+#~ "\n"
+#~ "\n"
+#~ "5. Governing Laws \n"
+#~ "\n"
+#~ "If any portion of this agreement is held void, illegal or inapplicable by a "
+#~ "court judgement, 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, \n"
+#~ "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"
+#~ "43, rue d'Aboukir, 75002 Paris - France\n"
+#~ msgstr ""
+#~ " Introducci�\n"
+#~ "\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\".\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"
+#~ "\n"
+#~ "\n"
+#~ "1. Acord de Llic�ncia\n"
+#~ "\n"
+#~ "Si us plau, llegiu aquest document atentament. Aquest document �s un acord\n"
+#~ "de llic�ncia entre v�s i MandrakeSoft S.A., 43, rue d'Aboukir, 75002 Par�s,\n"
+#~ "Fran�a, que s'aplica als Productes de programari.\n"
+#~ "Pel fet d'instal�lar, duplicar o utilitzar els Productes de programari, en \n"
+#~ "qualsevol manera, accepteu i esteu totalment d'acord, de manera expl�cita, "
+#~ "en\n"
+#~ "sometre-us als termes i condicions d'aquesta Llic�ncia. Si no esteu d'acord "
+#~ "amb\n"
+#~ "qualsevol part d'aquesta Llic�ncia, no esteu autoritzat a instal�lar, "
+#~ "duplicar\n"
+#~ "ni utilitzar els Productes de programari. Qualsevol intent d'instal�lar,\n"
+#~ "duplicar o utilitzar els Productes de programari d'una manera no conforme "
+#~ "als\n"
+#~ "termes i condicions d'aquesta Llic�ncia �s inv�lid i conclour� els vostres\n"
+#~ "drets sota aquesta Llic�ncia. En concloure la Llic�ncia, heu de destruir\n"
+#~ "immediatament totes les c�pies dels Productes de programari.\n"
+#~ "\n"
+#~ "\n"
+#~ "2. la Llic�ncia GPL i Llic�ncies relacionades\n"
+#~ "\n"
+#~ "Els Productes de programari s�n components creats per diferents persones o\n"
+#~ "entitats. La majoria d'aquests components estan coberts pels termes i\n"
+#~ "condicions de la Llic�ncia General P�blica de GNU (d'ara endavant \"GPL\"), "
+#~ "o\n"
+#~ "de llic�ncies similars. La majoria d'aquestes llic�ncies us permeten "
+#~ "utilitzar,\n"
+#~ "duplicar, adaptar o redistribuir els components que cobreixen. Si us plau,\n"
+#~ "llegiu atentament els termes i condicions de l'acord de llic�ncia de cada\n"
+#~ "component abans d'utilitzar-lo. Qualsevol pregunta sobre un component s'ha\n"
+#~ "d'adre�ar al seu autor i no a MandrakeSoft. Els programes desenvolupats per\n"
+#~ "MandrakeSoft S.A. estan coberts per la Llic�ncia GPL. La documentaci� "
+#~ "escrita\n"
+#~ "per MandrakeSoft S.A. est� coberta per una llic�ncia espec�fica. Si us "
+#~ "plau,\n"
+#~ "consulteu la documentaci� per a m�s informaci�. Algunes versions dels "
+#~ "Productes\n"
+#~ "de programari poden incloure components que no estiguin coberts per la\n"
+#~ "Llic�ncia GPL o llic�ncies similars; en aquest cas, cada un d'aquests\n"
+#~ "components estar� cobert pels termes i condicions de la seva pr�pia "
+#~ "llic�ncia\n"
+#~ "espec�fica. Si us plau, llegiu atentament i respecteu aquestes llic�ncies\n"
+#~ "espec�fiques abans d'instal�lar, utilitzar o redistribuir els components\n"
+#~ "esmentats. En general, aquestes llic�ncies impediran la transfer�ncia,\n"
+#~ "duplicaci� (excepte amb la finalitat de fer c�pies de seguretat),\n"
+#~ "redistribuci�, enginyeria inversa, desensamblatge, decompilaci� o "
+#~ "modificaci�\n"
+#~ "del component. Qualsevol ruptura de l'acord conclour� immediatament els "
+#~ "vostres\n"
+#~ "drets sota la llic�ncia espec�fica. Tret que els termes de la llic�ncia\n"
+#~ "espec�fica us ho autoritzin, normalment no podreu instal�lar els programes "
+#~ "en\n"
+#~ "m�s d'un sistema ni adaptar-lo per al seu �s en xarxa. Si hi teniu dubtes,\n"
+#~ "poseu-vos en contacte directament amb el distribu�dor o editor del "
+#~ "component.\n"
+#~ "Normalment, est� prohibida la transfer�ncia a terceres parts i la c�pia\n"
+#~ "d'aquests components, incloent la documentaci�.\n"
+#~ "\n"
+#~ "\n"
+#~ "3. Drets de propietat intel�lectual\n"
+#~ "\n"
+#~ "Tots els drets dels components dels Productes de programari pertanyen als "
+#~ "seus\n"
+#~ "autors respectius i estan protegits per la propietat intel�lectual i les "
+#~ "lleis\n"
+#~ "de copyright aplicables al programari. MandrakeSoft S.A. es reserva els "
+#~ "drets\n"
+#~ "de modificar o adaptar els Productes de programari, ja sigui parcialment 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"
+#~ "MandrakeSoft S.A.  Tots els drets reservats. Es prohibeix la duplicaci� "
+#~ "sense\n"
+#~ "consentiment previ per escrit de MandrakeSoft S.A.\n"
+#~ "\n"
+#~ "\n"
+#~ "4. Garantia limitada\n"
+#~ "\n"
+#~ "Els Productes de programari i la documentaci� que s'hi adjunta es "
+#~ "subministren\n"
+#~ "\"tal com s�n\", sense cap garantia, fins al punt perm�s per la llei. En "
+#~ "cas\n"
+#~ "que els Productes de programari siguin defectuosos, MandrakeSoft S.A., a\n"
+#~ "criteri seu, decidir� si reempla�a els Productes de programari o si en\n"
+#~ "reemborsa el preu pagat. Aquesta garantia limitada �s nul�la si no compliu "
+#~ "les\n"
+#~ "recomanacions, instruccions i condicions d'�s que s'indiquen a la "
+#~ "documentaci�\n"
+#~ "o als acords de llic�ncia dels Productes de programari. Fins al punt perm�s "
+#~ "per\n"
+#~ "la llei, MandrakeSoft S.A. no ser�, en cap circumst�ncia, responsable de "
+#~ "cap\n"
+#~ "dany especial, incidental, directe o indirecte (incloent, per� sense "
+#~ "limitar-se\n"
+#~ "a, danys per p�rdua de negocis, interrupci� de negocis, p�rdues financeres,\n"
+#~ "honoraris i multes legals que resultin per un judici i qualsevol altre "
+#~ "p�rdua\n"
+#~ "important) que resulti de l'�s o impossibilitat d'utilitzar els Productes "
+#~ "de\n"
+#~ "programari, fins i tot si s'ha notificat a MandrakeSoft S.A. la possibilitat "
+#~ "de\n"
+#~ "que es produeixin aquests danys.\n"
+#~ "\n"
+#~ "RESPONSABILITAT LIMITADA LLIGADA A LA POSESSI� O UTILITZACI� DE PROGRAMARI "
+#~ "PROHIBIT EN ALGUNES PA�SOS\n"
+#~ "\n"
+#~ "Fins al put perm�s per la llei, MandrakeSoft S.A. i els seus distribu�dors "
+#~ "no\n"
+#~ "seran, sota cap circumst�ncia, responsables de cap dany especial, "
+#~ "incidental,\n"
+#~ "directe o indirecte (incloent, per� sense limitar-se a, danys per p�rdua de\n"
+#~ "negocis, interrupci� de negocis, p�rdues financeres, honoraris i multes "
+#~ "legals\n"
+#~ "que resultin per un judici i qualsevol altre p�rdua important) que 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 "
+#~ "prohibits o\n"
+#~ "restringits en alguns pa�sos per lleis locals. Aquesta responsabilitat "
+#~ "limitada\n"
+#~ "s'aplica, per� no est� restringida a, els potents components de "
+#~ "criptografia\n"
+#~ "inclosos en els Productes de programari.\n"
+#~ "\n"
+#~ "\n"
+#~ "5. Lleis aplicables \n"
+#~ "\n"
+#~ "Si qualsevol part d'aquest acord �s declarat nul, il�legal o inaplicable en "
+#~ "un\n"
+#~ "judici, aquesta part s'exclou del contracte, per� seguiu obligat per les "
+#~ "altres\n"
+#~ "seccions aplicables de l'acord. Els termes i condicions d'aquesta Llic�ncia\n"
+#~ "estan coberts per les lleis de Fran�a. Preferiblement, tots els desacords "
+#~ "sobre\n"
+#~ "els termes d'aquesta Llic�ncia es resoldran fora dels tribunals. Com a "
+#~ "�ltim\n"
+#~ "recurs, el plet es dirimir� en els tribunals de Par�s, Fran�a.\n"
+#~ "Per a qualsevol pregunta sobre aquest document, poseu-vos en contacte amb\n"
+#~ "MandrakeSoft S.A., 43, rue d'Aboukir, 75002 Par�s, Fran�a.\n"
+
+#~ msgid ""
+#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Es pot configurar el vostre ordinador per tal que comparteixi la connexi� a "
+#~ "Internet.\n"
+#~ "\n"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "S'ha configurat tot.\n"
+
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Connecta't a Internet amb un m�dem normal"
+
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Connecta't a Internet mitjan�ant XDSI"
+
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Connecta't a Internet mitjan�ant DSL (o ADSL)"
+
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Connecta't a Internet mitjan�ant cable"
+
+#~ msgid ""
+#~ "Time (secs) of inactivity after which\n"
+#~ "it hangs up. (leave blank to disable it)"
+#~ msgstr ""
+#~ "Temps (en segons) d'inactivitat despr�s del qual\n"
+#~ "penjar� (deixeu-ho en blanc per inhabilitar-ho)."
+
+#~ msgid "Germany"
+#~ msgstr "Alemany"
+
+#~ msgid "Germany (1TR6)"
+#~ msgstr "Alemanya (1TR6)"
+
+#~ msgid "What do you wish to do?"
+#~ msgstr "Qu� voleu fer?"
+
+#~ msgid "Install/Rescue"
+#~ msgstr "Instal�la/Rescata"
+
+#~ msgid "Rescue"
+#~ msgstr "Rescata"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Quin tipus de partici� voleu?"
+
+#~ 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Escolliu \"Instal�laci�\" si no hi ha instal�lada cap versi� anterior de "
+#~ "GNU/Linux,\n"
+#~ "o si voleu utilitzar diverses distribucions o versions.\n"
+#~ "\n"
+#~ "Escolliu \"Rescat\" si voleu rescatar una versi� anterior de\n"
+#~ "Mandrake Linux ja instal�lada.\n"
+#~ "\n"
+#~ "\n"
+#~ "Seleccioneu:\n"
+#~ "\n"
+#~ "  - Recomanada: Si mai no heu instal�lat el GNU/Linux,\n"
+#~ "    escolliu aquesta opci�.\n"
+#~ "  - Personalitzada: Si esteu prou familiaritzat amb el GNU/Linux, podeu\n"
+#~ "    triar l'�s principal del vostre ordinador. Consulteu-ne els detalls\n"
+#~ "    m�s avall.\n"
+#~ "\n"
+#~ "  - Per a experts: S'assumeix que domineu el GNU/Linux i voleu realitzar "
+#~ "una\n"
+#~ "    instal�laci� altament personalitzada. Com en el cas del tipus\n"
+#~ "    d'instal�laci� \"Personalitzada\", podreu seleccionar l'�s del vostre\n"
+#~ "    sistema.\n"
+#~ "    Per�, si us plau, sobretot NO TRIEU AQUESTA OPCI� TRET QUE SAPIGUEU QU� "
+#~ "ESTEU FENT!\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ 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"
+#~ "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"
+#~ "disc dur de l'ordinador en �rees l�giques separades.\n"
+#~ "\n"
+#~ "\n"
+#~ "Si heu de crear noves particions, utilitzeu \"Assignaci�\n"
+#~ "autom�tica\" per crear particions per al GNU/Linux de manera autom�tica.\n"
+#~ "Podeu triar el disc on s'hi han de fer les particions fent clic a\n"
+#~ "\"hda\" per a la primera unitat IDE, \"hdb\" per a la segona, o\n"
+#~ "\"sda\" per a la primera unitat SCSI, i aix� successivament.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dues particions habituals s�n: la partici� root (/), que �s el punt\n"
+#~ "d'inici de la jerarquia de directoris del sistema de fitxers, i\n"
+#~ "/boot, que cont� tots els fitxers necessaris per iniciar el sistema\n"
+#~ "operatiu quan s'arrenca l'ordinador per primer cop.\n"
+#~ "\n"
+#~ "\n"
+#~ "Donat que aquest proc�s sol ser irreversible, la partici� d'un disc\n"
+#~ "�s sovint un proc�s que espanta als usuaris sense experi�ncia, per�\n"
+#~ "el DiskDrake simplifica molt aquest proc�s. Consulteu la documentaci�\n"
+#~ "i preneu-vos tant temps com sigui necessari abans de realitzar la\n"
+#~ "partici�.\n"
+#~ "\n"
+#~ "Podeu accedir a qualsevol opci� mitjan�ant el teclat: desplaceu-vos per les "
+#~ "particions amb el tabulador i les fletxes amunt i avall. Quan se selecciona "
+#~ "una partici�, podeu utilitzar:\n"
+#~ "\n"
+#~ "- Ctrl-c  per crear una nova partici� (quan se selecciona una partici� "
+#~ "buida)\n"
+#~ "\n"
+#~ "- Ctrl-d  per suprimir una partici�\n"
+#~ "\n"
+#~ "- Ctrl-m  per definir el punt de muntatge\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."
+#~ msgstr ""
+#~ "Cal formatar les particions que s'acaben de definir per poder-les\n"
+#~ "utilitzar ('formatar' significa 'crear un sistema de fitxers').\n"
+#~ "En aquest punt podeu, si voleu, tornar a formatar particions\n"
+#~ "existents per eliminar les dades que contenen. Nota: no �s\n"
+#~ "necessari tornar a formatar les particions existents, especialment\n"
+#~ "si contenen fitxers o dades que voleu conservar.\n"
+#~ "Els directoris que es solen conservar s�n /home i /usr/local."
+
+#~ 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."
+#~ msgstr ""
+#~ "Ara s'estan instal�lant els paquets seleccionats. Aquesta operaci�\n"
+#~ "trigar� pocs minuts, tret que hagueu escollit actualitzar un\n"
+#~ "sistema existent; en aquest cas trigar� m�s temps, fins i tot\n"
+#~ "abans que s'inici� la instal�laci�."
+
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Si el DrakX no ha pogut trobar el ratol�, o si voleu comprovar qu�\n"
+#~ "ha fet, a la part superior apareixer� la llista de ratolins.\n"
+#~ "\n"
+#~ "\n"
+#~ "Si esteu d'acord amb els par�metres del DrakX, feu clic a 'D'acord'.\n"
+#~ "Si no, escolliu, al men� superior, el tipus de ratol� que us sembli m�s "
+#~ "semblant al vostre.\n"
+#~ "\n"
+#~ "\n"
+#~ "Si es tracta d'un ratol� s�rie, tamb� us caldr� indicar al DrakX a\n"
+#~ "quin port s�rie est� connectat."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "Aquesta secci� est� dedicada a la configuraci� d'una xarxa local\n"
+#~ "(LAN) o d'un m�dem.\n"
+#~ "\n"
+#~ "Escolliu \"LAN local\" i el DrakX intentar� trobar un adaptador\n"
+#~ "Ethernet al vostre ordinador. El sistema trobar� i inicialitzar�\n"
+#~ "autom�ticament els adaptadors PCI.\n"
+#~ "No obstant aix�, si el vostre perif�ric �s ISA, la detecci�\n"
+#~ "no funcionar�, i us caldr� escollir un programa de control a la\n"
+#~ "llista que apareixer�.\n"
+#~ "\n"
+#~ "\n"
+#~ "Com en el cas dels adaptadors SCSI, podeu deixar que, d'entrada,\n"
+#~ "el programa de control comprovi l'adaptador; si no ho feu aix�, us\n"
+#~ "caldr� especificar les opcions del programa de control que haureu\n"
+#~ "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"
+#~ "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"
+#~ "xarxa privada, com ara a casa, haureu d'escollir les adreces.\n"
+#~ "\n"
+#~ "\n"
+#~ "Escolliu \"Marcatge amb m�dem\" i es configurar� la connexi� a\n"
+#~ "Internet amb un m�dem. El DrakX intentar� trobar el m�dem, per�,\n"
+#~ "si no se'n surt, us caldr� seleccionar el port s�rie al qual est�\n"
+#~ "connectat."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "El GNU/Linux pot treballar amb molts tipus d'impressores. Per a cada\n"
+#~ "un d'aquests tipus, per�, cal una configuraci� diferent. Tingueu\n"
+#~ "en compte, per�, que l'spooler utilitza 'lp' com a nom d'impressora\n"
+#~ "per defecte, de manera que heu de tenir una impressora amb aquest nom.\n"
+#~ "No obstant aix�, podeu donar diferents noms a una impressora, separant-\n"
+#~ "los amb el car�cter '|'. D'aquesta manera, si voleu donar-li un nom m�s\n"
+#~ "aclaridor nom�s us caldr� indicar-lo en primer lloc, p.ex. \"La meva\n"
+#~ "impressora|lp\".\n"
+#~ "La impressora que contingui \"lp\" al(s) nom(s) ser� la impressora per\n"
+#~ "defecte\n"
+#~ "\n"
+#~ "\n"
+#~ "Si la vostra impressora est� connectada directament a l'ordinador,\n"
+#~ "seleccioneu \"Impressora local\". Haureu d'indicar a quin port\n"
+#~ "est� connectada i seleccionar-ne el filtre corresponent.\n"
+#~ "\n"
+#~ "\n"
+#~ "Si voleu accedir a una impressora que es troba a un ordinador Unix\n"
+#~ "remot, seleccioneu \"lpd remot\". Per poder-la fer funcionar no\n"
+#~ "cal cap nom d'usuari ni contrasenya, per� us caldr� saber el nom\n"
+#~ "de la cua d'impressi� del servidor remot.\n"
+#~ "\n"
+#~ "\n"
+#~ "Si voleu accedir a una impressora SMB (�s a dir, una impressora\n"
+#~ "que es troba a un ordinador remot amb Windows 9x/NT), per poder-ho\n"
+#~ "fer haureu d'indicar el seu nom SMB (que no �s el seu nom TCP/IP)\n"
+#~ "i possiblement la seva adre�a IP, nom d'usuari, grup de treball,\n"
+#~ "contrasenya, i, evidentment, el nom de la impressora. El mateix\n"
+#~ "per a una impressora NetWare, per� en aquest cas no us caldr� la\n"
+#~ "informaci� del grup de treball."
+
+#~ 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."
+#~ msgstr ""
+#~ "�s molt recomanable que respongueu \"S�\" aqu�. Si m�s endavant\n"
+#~ "instal�leu Microsoft Windows, sobreescriur� el sector d'arrencada.\n"
+#~ "Tret que hagueu fet el disc d'arrencada com es\n"
+#~ "recomana, ja no podreu tornar a arrencar el GNU/Linux."
+
+#~ msgid "Move your wheel!"
+#~ msgstr "Moveu la bola!"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Voleu descartar els canvis?"
+
+#~ msgid "Cable connection"
+#~ msgstr "Connexi� de cable"
+
+#~ msgid "Host name:"
+#~ msgstr "Nom de l'ordinador central:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "De quin tipus �s el vostre ratol�?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Resolucions autom�tiques"
+
+#~ 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"
+#~ msgstr ""
+#~ "Per saber quines resolucions estan disponibles, en provar� algunes.\n"
+#~ "La pantalla parpellejar�...\n"
+#~ "Ho podeu desactivar si voleu; sentireu un av�s sonor quan estigui llest"
+
+#~ 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?"
+#~ msgstr ""
+#~ "Puc mirar de trobar les resolucions disponibles (p.ex. 800x600).\n"
+#~ "De vegades, per�, aix� pot penjar l'ordinador.\n"
+#~ "Us hi voleu arriscar?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "No s'han trobat modes v�lids\n"
+#~ "Intenteu-ho amb una altra targeta de v�deo o monitor"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Recerca autom�tica de resolucions"
+
+#~ msgid "dhcpd"
+#~ msgstr "dhcpd"
+
+#~ msgid "pump"
+#~ msgstr "pump"
+
+#~ msgid "dhcpxd"
+#~ msgstr "dhcpxd"
+
+#~ msgid "dhcp-client"
+#~ msgstr "dhcp-client"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB Mouse"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB Mouse (2 botons)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB Mouse (3 o m�s botons)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB Mouse"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB Mouse (2 botons)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB Mouse (3 o m�s botons)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Generic Mouse"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus Mouse"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Bus Mouse"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech Bus Mouse"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB Mouse"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB Mouse (3 o m�s botons)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A o superior (s�rie)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (s�rie)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (s�rie)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (s�rie)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Generic Mouse (s�rie)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Compatible Microsoft (s�rie)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Ratol� Generic de 3 botons (s�rie)"
+
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Ratol� Kensington Thinking (s�rie)"
+
+#~ msgid ""
+#~ "I need to configure your network adapter to be able to connect to internet."
+#~ msgstr ""
+#~ "Necessito configurar el vostre adaptador de xarxa por poder connectar a "
+#~ "Internet."
+
+#~ msgid "nfs mount failed"
+#~ msgstr "ha fallat el muntatge de l'nfs"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Socket"
+#~ msgstr "S�col"
+
+#~ 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?"
+#~ msgstr ""
+#~ "El DrakX generar� els fitxers de configuraci� tant per a l'XFree 3.3 com per "
+#~ "a l'Xfree 4.0.\n"
+#~ "Per defecte, s'utilitza el servidor 4.0, tret que no funcioni per a la "
+#~ "vostra targeta.\n"
+#~ "\n"
+#~ "Voleu conservar l'Xfree 3.3?"
+
+#~ msgid "curly"
+#~ msgstr "arrissat"
+
+#~ msgid "default"
+#~ msgstr "predeterminat"
+
+#~ msgid "tie"
+#~ msgstr "lla�"
+
+#~ msgid "brunette"
+#~ msgstr "morena"
+
+#~ msgid "girl"
+#~ msgstr "noia"
+
+#~ msgid "woman-blond"
+#~ msgstr "dona-rossa"
+
+#~ msgid "automagic"
+#~ msgstr "automagic"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Criptogr�fic"
+
+#~ msgid "Take over the hard drive"
+#~ msgstr "Encarrega't del disc dur"
+
+#~ msgid "Do not set up networking"
+#~ msgstr "No configuris la xarxa"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "Voleu configurar la xarxa local per al vostre sistema?"
+
+#~ msgid "Have you been provided with a hostname?"
+#~ msgstr "Us han donat un nom d'ordinador central?"
+
+#~ msgid "using dhcp"
+#~ msgstr "s'est� utilitzant dhcp"
+
+#~ msgid "Show less"
+#~ msgstr "Mostra'n menys"
+
+#~ msgid "Show more"
+#~ msgstr "Mostra'n m�s"
+
+#~ msgid "URI for Local printer"
+#~ msgstr "URI per a la impressora local"
+
+#~ msgid "URI for Network printer"
+#~ msgstr "URI per a la impressora de xarxa"
+
+#~ msgid "Local Printer Device (URI)"
+#~ msgstr "Dispositiu de la impressora local (URI)"
+
+#~ msgid ""
+#~ "What URI device is your printer connected to\n"
+#~ "(note that parallel:/dev/lp0 is equivalent to LPT1:)?"
+#~ msgstr ""
+#~ "A quin dispositiu URI est� connectada la vostra impressora?\n"
+#~ "(tingueu en compte que parallel:/dev/lp0 equival a LPT1:)"
+
+#~ msgid "Network Printer Options (URI)"
+#~ msgstr "Opcions de la impressora de xarxa (URI)"
+
+#~ msgid ""
+#~ "Choose the right Device URI for a network printer or a local file. "
+#~ "Examples:\n"
+#~ "   file:/path/to/filename.prn\n"
+#~ "   http://hostname:631/ipp/port1\n"
+#~ "   ipp://hostname/ipp/port1\n"
+#~ "   lpq://hostname/queue\n"
+#~ "   socket://hostname\n"
+#~ "   socket://hostname:9100"
+#~ msgstr ""
+#~ "Seleccioneu l'URI de dispositiu correcte per a una impressora de xarxa o un "
+#~ "fitxer local. Exemples:\n"
+#~ "   file:/cam�/al/nomdefitxer.prn\n"
+#~ "   http://ordinadorcentral:631/ipp/port1\n"
+#~ "   ipp://ordinadorcentral/ipp/port1\n"
+#~ "   lpq://ordinadorcentral/cua\n"
+#~ "   socket://ordinadorcentral\n"
+#~ "   socket://ordinadorcentral:9100"
+
+#~ msgid "Local Area Network specification"
+#~ msgstr "Especificaci� de la xarxa d'�rea local"
+
+#~ msgid "You may now decide which class C network to use.\n"
+#~ msgstr "Ara podeu decidir quina xarxa de classe C voleu utilitzar.\n"
+
+#~ msgid "Network:"
+#~ msgstr "Xarxa:"
+
+#~ msgid "Internet Connection Sharing - setup of $device"
+#~ msgstr "Compartici� de la connexi� a Internet: configuraci� de $device"
+
+#~ msgid ""
+#~ "The following interface is about to be configured:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Ara es configurar� la interf�cie seg�ent:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+
+#~ msgid "Everything configured!"
+#~ msgstr "S'ha configurat tot!"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Quina �s la disposici� del vostre teclat?"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Voleu que intenti trobar targetes PCMCIA?"
+
+#~ 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 ""
+#~ "Voleu configurar el marcatge amb xarxa per m�dem per al vostre sistema?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "Voleu que intenti trobar dispositius PCI?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "S'est� cercant la partici� arrel."
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ 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 "Can't use broadcast with no NIS domain"
+#~ msgstr "No es pot utilitzar l'emissi� sense un domini NIS"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "Si us plau, seleccioneu una partici� per utilitzar-la com a arrel."
+
+#~ msgid "You don't have any windows partitions!"
+#~ msgstr "No teniu cap partici� de Windows!"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "No teniu prou espai per al Lnx4win"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "Autom�tica"
+
+# 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 ""
+#~ "Benvingut al LILO, la utilitat que us permet triar el sistema operatiu!\n"
+#~ "\n"
+#~ "Per obtenir una llista de les eleccions possibles, premeu <TAB>.\n"
+#~ "\n"
+#~ "Per carregar-ne una, escriviu-ne el nom i premeu <INTRO> o espereu %d "
+#~ "segons\n"
+#~ "fins a l'arrencada predeterminada.\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
+#
+#~ 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 ""
+#~ "Benvingut al SILO, la utilitat que us permet triar el sistema operatiu!\n"
+#~ "\n"
+#~ "Per obtenir una llista de les eleccions possibles, premeu <TAB>.\n"
+#~ "\n"
+#~ "Per carregar-ne una, escriviu-ne el nom i premeu <INTRO> o espereu %d "
+#~ "segons\n"
+#~ "fins a l'arrencada predeterminada.\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "Opcions principals del SILO"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "Aquestes s�n les entrades seg�ents del SILO.\n"
+#~ "Podeu afegir-ne algunes m�s o canviar-ne les existents."
+
+#~ msgid "This label is already in use"
+#~ msgstr "Aquesta etiqueta ja est� en �s"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "Ha fallat la instal�laci� del SILO. S'ha produ�t l'error seg�ent:"
+
+#~ 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."
+#~ msgstr ""
+#~ "En primer lloc, el DrakX intentar� trobar un o m�s adaptadors SCSI\n"
+#~ "PCI. Si en troba, i sap quin(s) programa(es) de control utilitzar,\n"
+#~ "l'inserir� o els inserir� autom�ticament.\n"
+#~ "\n"
+#~ "\n"
+#~ "Si el vostre adaptador SCSI �s una targeta ISA, o si �s PCI per�\n"
+#~ "el DrakX no sap amb quin programa de control ha d'utilitzar-la, o\n"
+#~ "si no teniu cap adaptador SCSI, se us preguntar� si en teniu un o\n"
+#~ "no. Si no en teniu cap, respongueu \"No\". Si en teniu un o m�s,\n"
+#~ "respongueu \"S�\". Apareixer� una llista de programes de control,\n"
+#~ "de la qual n'haureu de triar un.\n"
+#~ "\n"
+#~ "\n"
+#~ "Un cop hagueu triat el programa de control, el DrakX us preguntar�\n"
+#~ "si voleu establir-ne les opcions. Primer, per�, deixeu que el\n"
+#~ "programa de control explori el maquinari: normalment funciona b�.\n"
+#~ "\n"
+#~ "\n"
+#~ "Si no, no oblideu la informaci� sobre el vostre maquinari que\n"
+#~ "pugueu aconseguir a la documentaci� o al Windows (si el teniu al\n"
+#~ "sistema), com aconsella la guia d'instal�laci�. Aquestes s�n les\n"
+#~ "opcions que haureu de proporcionar al programa de control."
+
+#~ msgid "Shutting down"
+#~ msgstr "S'est� tancant l'ordinador"
+
 #~ 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 Linux."
@@ -5051,9 +8210,6 @@ msgstr "Cal una mica de temps per cercar les fulles"
 #~ msgid "garbage"
 #~ msgstr "escombraries"
 
-#~ msgid "Recommended"
-#~ msgstr "Recomanada"
-
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
@@ -5226,9 +8382,6 @@ msgstr "Cal una mica de temps per cercar les fulles"
 #~ msgid "Hurt me plenty"
 #~ msgstr "Fes-me molt de mal"
 
-#~ msgid "Which usage do you want?"
-#~ msgstr "Quin �s voleu?"
-
 #~ msgid "Which packages do you want to install"
 #~ msgstr "Quins paquets voleu instal�lar"
 
@@ -5291,9 +8444,6 @@ msgstr "Cal una mica de temps per cercar les fulles"
 #~ msgid "server"
 #~ msgstr "servidor"
 
-#~ msgid "Local Printer Options"
-#~ msgstr "Opcions de la impressora local"
-
 #~ msgid "Password:"
 #~ msgstr "Contrasenya:"
 
@@ -5335,8 +8485,5 @@ msgstr "Cal una mica de temps per cercar les fulles"
 #~ msgid "Installation CD Nr 1"
 #~ msgstr "CD d'instal�laci� Nr 1"
 
-#~ msgid "Dialup with modem"
-#~ msgstr "Marcatge amb el m�dem"
-
 #~ msgid "Local LAN"
 #~ msgstr "LAN local"
diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po
index d7e73898e..67ebd7f05 100644
--- a/perl-install/share/po/cs.po
+++ b/perl-install/share/po/cs.po
@@ -7,51 +7,105 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
-"PO-Revision-Date: 2000-06-01 15:00+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
+"PO-Revision-Date: 2000-09-18 10:39+0200\n"
 "Last-Translator: Vladim�r Marek <vlmarek@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "Obecn�"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
-msgstr "Videokarta"
+msgstr "Grafick� karta"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
-msgstr "Vyberte videokartu"
+msgstr "Zvolte typ va�� grafick� kary"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
-msgstr "Zvolte si X server"
+msgstr "Zvolte X server"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X server"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Kter� XFree byste cht�li pou��t?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"Va�e karta podporuje 3D akceleraci, ale pouze s XFree %s.\n"
+"Pokud pou�ijete XFree %s, m��ete na druhou stranu dos�hnout lep��ch v�sledk� "
+"ve 2D."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr "S XFree %s m��e va�e karta vyu��t 3D hardwarov� akcelerace."
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s s hardwarovou 3D akcelerac�"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"Va�e karta podporuje 3D akceleraci, ale pouze s XFree %s,\n"
+"ALE TOTO JE POUZE EXPERIMENT�LN� VERZE, A MٮE V�ST K NESTABILIT� SYST�MU.\n"
+"Va�e karta je podporov�na i v XFree %s, kde m��e m�t lep�� podporu pro 2D."
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"S XFree %s m��e va�e karta vyu��t 3D hardwarov� akcelerace.ALE TOTO JE POUZE "
+"EXPERIMENT�LN� VERZE, A MٮE V�ST K NESTABILIT� SYST�MU."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s s EXPERIMENT�LN� 3D hardwarovou akcelerac�"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "Nastaven� XFree"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
-msgstr "Zvolte kolik pam�ti m� Va�e videokarta"
+msgstr "Kolik pam�ti je na va�� grafick� kart� ?"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Zvolte mo�nosti pro dan� X server"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
-msgstr "Zvolte monitor"
+msgstr "Zvolte typ sv�ho monitoru"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -64,52 +118,52 @@ msgid ""
 "monitor.\n"
 " If in doubt, choose a conservative setting."
 msgstr ""
-"Dva rozhoduj�c� parametry jsou: vertik�ln� obnovovac� frekvence, co� je "
+"Dva rozhoduj�c� parametry jsou: vertik�ln� synchroniza�n� frekvence, co� je "
 "frekvence\n"
-"kterou je obnovov�na cel� obrazovka, a horizont�ln� synchroniza�n� "
-"frekvence\n"
-"(horiz. sync rate), co� je frekvence jakou jsou zobrazov�ny jednotliv� "
+"kterou je obnovov�na cel� obrazovka, a frekvence ��dkov� synchronizace\n"
+"(horiz. sync. rate), co� je frekvence jakou jsou zobrazov�ny jednotliv� "
 "mikro��dky (scanline).\n"
 "\n"
 "Je VELMI D�LE�IT� abyste nezvolili typ monitoru se schopnostmi vy���mi ne� "
 "m�\n"
 "V� monitor, proto�e byste si ho t�m mohli po�kodit. Jestli�e si nejste "
 "jist�\n"
-"zvolte typ s ni���mi schopnostmi."
+"zvolte rad�ji typ s ni���mi schopnostmi."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
-msgstr "Horizont�ln� obnovovac� frekvence"
+msgstr "Horizont�ln�(��dkov�) synchronizace"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
-msgstr "Vertik�ln� obnovovac� frekvence"
+msgstr "Vertik�ln�(obrazovkov�) synchronizace"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Monitor nen� nastaven"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
-msgstr "Videokarta je�t� nen� nastavena"
+msgstr "Grafick� karta je�t� nen� nastavena"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Je�t� nejsou zvolena rozli�en�"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
-msgstr "Chcete otestovat nastaven�?"
+msgstr "Chcete si vyzkou�et nastaven�?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+#, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Varov�n�: na t�to grafick� kart� je testov�n� nebezpe�n�"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
-msgstr "Otestovat nastaven�"
+msgstr "Vyzkou�et nastaven�"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -117,412 +171,392 @@ msgstr ""
 "\n"
 "zkuste zm�nit n�kter� parametry"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Vyskytla se tato chyba:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
-msgstr "Zru�� se za %d sekund"
+msgstr "Test skon�� automaticky za %d sekund"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "Je to spr�vn� nastaven�?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Vyskytla se chyba, zkuste zm�nit n�kter� parametry"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Automatick� nastaven� rozli�en�"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Abych na�el dostupn� rozli�en�, budu je muset vyzkou�et.\n"
-"Va�e obrazovka bude blikat ...\n"
-"Jestli chcete, m��ete vypnout monitor. A� bude po v�em, usly��te p�pnut�."
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Rozli�en�"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
-msgstr "Zvolte rozli�en� a barevnou hloubku"
+msgstr "Vyberte si rozli�en� a barevnou hloubku"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
-msgstr "Videokarta: %s"
+msgstr "Grafick� karta: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 server: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Uk�zat v�e"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Rozli�en�"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"M��u se pokusit naj�t dostupn� rozli�en� (nap�. 800x600),\n"
-"nicm�n� m��e se st�t, �e se p�i tom po��ta� zhrout�.\n"
-"Chcete to zkusit?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Nepoda�ilo se mi naj�t ��dn� dostupn� rozli�en�\n"
-"Zkuste nastavit jinou videokartu, nebo monitor"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Rozlo�en� kl�vesnice: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Typ my�i: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "P��pojka my�i: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Horizont�ln� frekvence monitoru: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Vertik�ln� frekvence monitoru: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
-msgstr "Videokarta: %s\n"
+msgstr "Grafick� karta: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
-msgstr "Videopam�: %s kB\n"
+msgstr "Pam� na gr. kart�: %s kB\n"
+
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Mo�nosti Barevn� hloubky"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Rozli�en�"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 server: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 server: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "P�ipravuji nastaven� X-Window"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
-msgstr "Zm��it monitor"
+msgstr "Zm�nit monitor"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
-msgstr "Zm��it videokartu"
+msgstr "Zm�nit grafickou kartu"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
-msgstr "Zm��it parametry X Serveru"
+msgstr "Zm�nit parametry X Serveru"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
-msgstr "Zm�� Rozli�en�"
+msgstr "Zm�nit Rozli�en�"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Automatick� vyhled�v�n� rozli�en�"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Zobraz informace"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
-msgstr "Zkus to znovu"
+msgstr "Znovu vyzkou�ej nastaven� X"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Konec"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Co chcete d�lat?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Zru�it zm�ny?"
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Ponechat st�vaj�c� nastaven� IP"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Pro aktivaci zm�n se pros�m znovu p�ihlaste na %s"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "Pros�m odhlaste se a pak stiskn�te Ctrl-Alt-BackSpace"
+msgstr "Pros�m odhlaste se a pak stiskn�te Ctrl-Alt-Backspace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
-msgstr "spou�t� se X"
+msgstr "Spou�t� se X"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
 msgstr ""
-"M��u nastavit V� po��ta� tak aby automaticky spustil X p�i startu.\n"
+"M��u nastavit V� po��ta� tak, aby automaticky spustil X p�i startu.\n"
 "Chcete aby po��ta� po zapnut� spustil grafick� re�im?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Autologin"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"M��u nastavit V� po��ta� tak, aby se automaticky p�ihla�oval jako\n"
+"u�ivatel. Pokud nechcete pou��t tuto mo�nost, klikn�te na tla��tko Zru�it."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Zvolte standardn�ho u�ivatele :"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Vyberte si kter� spr�vce oken m� b�t spou�t�n:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 barev (8 bit�)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tis�c barev (15 bit�)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tis�c barev (16 bit�)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 mili�n� barev (24 bit�)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 miliardy barev (32 bit�)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB nebo v�ce"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Klasick� VGA, 640x480 p�i 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 p�i 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "Kompatibiln� s 8514, 1024x768 p�i 87 Hz prokl�dan� (ne 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 p�i 87 Hz prokl�dan�, 800x600 p�i 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Lep�� Super VGA, 800x600 p�i 60 Hz, 640x480 p�i 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "Neprokl�dan� SVGA, 1024x768 p�i 60 Hz, 800x600 p�i 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Vysokofrekven�n� SVGA, 1027x768 p�i 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multifrekven�n� kter� um� 1280x1024 p�i 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multifrekven�n� kter� um� 1280x1024 p�i 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multifrekven�n� kter� um� 1280x1024 p�i 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor kter� um� 1600x1200 p�i 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor kter� um� 1600x1200 p�i 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "kudrnat�"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "standardn�"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "s kravatou"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "bruneta"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "d�vka"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "blond�na"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "automagicky"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
-msgstr "Prvn� sektor startovac�ho diskov�ho odd�lu"
+msgstr "Prvn� sektor zav�d�c�ho diskov�ho odd�lu"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Prvn� sektor disku (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "Instalace LILO/grub"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "Instalace SILO"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Kam chcete nainstalovat zav�d�c� program?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "Instalace LILO/Grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "��dn�"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Kter� zav�d�c� programy chcete pou��t?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Instalace zav�d�c�ho programu"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Startovac� za��zen�"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (nefunguje se star�m BIOSem)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Kompaktn�"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "kompaktn�"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Prodleva p�ed automatick�m startem"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Textov� re�im"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Prodleva p�ed automatick�m spu�t�n�m"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Heslo"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Heslo (podruh�)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Omezen� nastaven� z p��kazov� ��dky"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "omezen�"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Z�kladn� nastaven� zav�d�c�ho programu"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Volba ``Omezen� nastaven� z p��kazov� ��dky'' je bezp�edm�tn� bez hesla"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Zkuste to znovu, pros�m"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Hesla nejsou shodn�"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -530,167 +564,355 @@ msgstr ""
 "Tady jsou v�echny z�znamy.\n"
 "M��ete p�idat dal�� nebo zm�nit st�vaj�c�."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "P�idat"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Hotovo"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Jak� typ z�znamu chcete p�idat?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Jin� syst�m (SunOs...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Jin� syst�m (Windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Jak� typ z�znamu chcete p�idat?"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Obraz(image)"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Ko�enov�(root)"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "P�ipojit"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Pro �ten� i z�pis"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Tabulka"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Nejist�"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Zna�ka"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Standardn�"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Odstranit z�znam"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
-msgstr "Nen� mo�n� pr�zdn� zna�ka"
+msgstr "Pr�zdn� zna�ka nen� povolena"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Tato zna�ka se ji� pou��v�"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Na�el jsem rozhran� %s %s"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "M�te je�t� n�jak� jin�?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "M�te n�jak� %s rozhran�?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Ne"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Ano"
+
+#: ../../any.pm_.c:505
+msgid "See hardware info"
+msgstr "Pod�vejte se na informace o hardware"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Instaluji ovlada� pro %s kartu %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(modul %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Kter� %s ovlada� m�m zkusit?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"V n�kter�ch p��padech pot�ebuje ovlada� %s pro svoji spr�vnou funkci dal��\n"
+"informace, p�esto�e norm�ln� funguje i bez nich. Cht�li byste zadat\n"
+"n�jak� dopl�uj�c� mo�nosti, nebo rad�ji nech�te ovlada� samostatn� "
+"prozkoumat\n"
+"hardware va�eho po��ta�e, aby z�skal informace kter� pot�ebuje? Zkoum�n�\n"
+"hardware m��e ve vyj�me�n�ch p��padech zp�sobit zamrznut� po��ta�e, ale "
+"nem�lo\n"
+"by v ��dn�m p��pad� zp�sobit jin� �kody."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Automatick� prozkoum�n�"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Zadejte mo�nosti"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Nyn� m��ete poskytnout modulu %s dal�� parametry."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"Nyn� m��ete poskytnout modulu %s dal�� parametry.\n"
+"Volby se zad�vaj� ve tvaru ``jm�no=hodnota jm�no2=hodnota2 ...''.\n"
+"Nap��klad, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Volby modulu:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Spu�t�n� modulu %s selhalo.\n"
+"Chcete to zkusit s jin�mi parametry?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Vitejte v %s, v programu pro start operacniho systemu!\n"
+"\n"
+"Pro seznam moznych voleb stisknete <TAB>.\n"
+"\n"
+"Napiste jmeno vybraneho systemu a stisknete <ENTER>, nebo pockejte\n"
+"%d sekund do automatickeho startu.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Vitejte v GRUBu, programu pro vyber operacniho systemu"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "Pro vyber polozek pouzijte klavesy %c a %c."
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Stisknete ENTER pro start vybran�ho OS, 'e' pro upravu"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "spoustecich parametru, nebo 'c' pro prikazovou radku."
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "Vybrana polozka bude automaticky spustena za %d sekund."
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr "nen� dost m�sta v /boot"
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Desktop"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Nab�dka Start"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d minut"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 minuta"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekund"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Vytvo�it"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Odpojit"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Smazat"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Form�tovat"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Zm�nit velikost"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
-msgstr "Typ"
+msgstr "Zm�nit typ"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "P��pojn� bod"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Zapsat /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "P�epnout se do m�du 'expert'"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "P�epnout se do m�du 'norm�ln�'"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Obnovit ze souboru"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Ulo�it do souboru"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "Pomocn�k"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Obnovit z diskety"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Ulo�it na disketu"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
-msgstr "Smazat v�e"
+msgstr "V�e smazat"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Naform�tovat v�echny"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
-msgstr "Automaticky vyhradit"
+msgstr "Automaticky rozm�stit"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "V�echny prim�rn� odd�ly (partitions) jsou pou��v�ny"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Nem��u p�idat ��dn� dal�� odd�l"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -699,59 +921,63 @@ msgstr ""
 "m�st�\n"
 "vytvo�it roz���en�(extended) odd�l"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Zachr�nit tabulku odd�l�"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Zp�t"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Zapsat tabulku odd�l�"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Obnovit"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Pr�zdn�"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Jin�"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOs"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Odkl�dac� (swap)"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Pr�zdn�"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Jin�"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
-msgstr "Souborov� syst�my :"
+msgstr "Souborov� syst�my:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Detaily"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -759,22 +985,22 @@ msgid ""
 "(click on it, then click on \"Resize\")"
 msgstr ""
 "M�te jeden velik� odd�l FAT\n"
-"(v�t�inou pou��van� Dos/Windows).\n"
+"(v�t�inou pou��van� Microsoft Dos/Windows).\n"
 "Doporu�uji v�m nejprve zmen�it tento odd�l\n"
 "(klepn�te na n�j a potom na\n"
 "\"Zm�nit velikost\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Z�lohujte si nejd��v sv� data, pros�m"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "�t�te pozorn�!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -783,77 +1009,77 @@ msgstr ""
 "Jestli�e chcete pou��vat aboot, mus�te nechat voln� m�sto na za��tku disku\n"
 "(2048 sektor� sta��)"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Bu�te opatrn�: tato akce je nebezpe�n�."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Chyba"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Adres�� p�ipojen� (mount point): "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Za��zen�: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "P�smeno v DOSu: %s (jenom odhad)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Za��tek: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Velikost: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektor�"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Od cylindru %d do cylindru %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Naform�tovan�\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Nenaform�tovan�\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "P�ipojen�\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Loopback soubor(y): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -861,80 +1087,80 @@ msgstr ""
 "Standardn� startovac� odd�l\n"
 "    (Pro MS-DOS, ne pro LILO)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "�rove� %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Velikost bloku(chunk) %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID disky %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Loopback soubor: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Pros�m klepn�te na odd�l"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Velikost: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometrie: %s cylindr�, %s hlav, %s sektor�\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Typ tabulky odd�l�: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "na sb�rnici %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "P�ipojit"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Aktivn�"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "P�idat do RAIDu"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Odebrat z RAIDu"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Zm�nit RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Pou�it� loopbacku"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Co ud�l�te ?"
 
 # msgstr "Vyberte si �innost"
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -946,7 +1172,7 @@ msgstr ""
 "Bu�to pou�ijete LILO a nebude to fungovat, nebo nepou�ijete LILO a tedy "
 "nepot�ebujete /boot"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -959,205 +1185,211 @@ msgstr ""
 "manager),\n"
 "p�idejte je�t� /boot odd�l"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
-"Zvolij jste softwarovou RAID partition jako ko�enov� odd�l (/).\n"
+"Zvolili jste softwarovou RAID partition jako ko�enov� odd�l (/).\n"
 "S t�m se nen� schopn� vypo��dat ��dn� zav�d�c� program bez pou�it� odd�lu\n"
-"/boot. Jestli chcete pou��t LILO nebo grub mus�te m�t dal�� odd�l /boot."
+"/boot. Ujist�te se pros�m, �e tento odd�l m�te."
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "M�sto toho pou�ijte ``%s''"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Nejprve pou�ijte ``Odpojit''"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
-msgstr "Zm�nou typu odd�lu %s z n�j ztrat�te v�echna data"
+msgstr "T�m �e zm�n�te typ odd�lu %s p�ijdete o v�echna jeho data"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "P�esto chcete pokra�ovat?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Konec bez ulo�en�"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Chcete skon�it bez zaps�n� do tabulky odd�l�?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Zm�nit typ odd�lu"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Kter� typ odd�lu chcete?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "Kter� syst�m chcete pou��t pro tisk?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr ""
+msgstr "Nem��ete pou��t ReiserFS pro odd�l men�� ne� 32MB"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Kam chcete p�ipojit loopback %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Kam chcete p�ipojit za��zen� %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 "Nem��u smazat p��pojn� bod, proto�e tento odd�l je pou��v�n pro loopback.\n"
-"Odstra�te nejd��ve loopback"
+"Odstra�te nejprve loopback"
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "Kdy� naform�tujete odd�l %s, ztrat�te t�m na n�m v�echna data"
+msgstr "Kdy� naform�tujete odd�l %s, ztrat�te t�m v�echna jeho data"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Form�tuji"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Form�tuji soubor loopbacku %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
-msgstr "Form�tuji odd�ly %s"
+msgstr "Form�tuji odd�l %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Po naform�tov�n� v�ech odd�l�,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "na nich budou v�echna data ztracena"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "P�esunout"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
-msgstr "Na kter� disk to chcete p�esunout?"
+msgstr "Na kter� disk chcete odd�l p�esunout?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
-msgstr "Na kter� sektor to chcete p�esunout?"
+msgstr "Na kter� sektor chcete odd�l p�esunout?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "P�esouv�m"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "P�esouv�m odd�l..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Tabulka odd�l� disku %s bude zaps�na na disk!"
+msgstr "Nov� tabulka odd�l� na disku %s bude zaps�na!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Aby se zm�ny uplatnily budete muset restartovat po��ta�"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Po��t�m hranice souborov�ho syst�mu fat"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "M�n�m velikost"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Na kter�m odd�lu chcete m�nit velikost?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "V�echna data z tohoto odd�lu by m�la b�t z�lohov�na"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "Kdy� zm�n�te velikost odd�lu %s, ztrat�te t�m na n�m v�echna data"
+msgstr "Kdy� zm�n�te velikost odd�lu %s, ztrat�te t�m v�echna jeho data"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Zvolte novou velikost"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Vytvo�it nov� odd�l"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Po��te�n� sektor: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Velikost v MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Souborov� syst�m: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Nastaven�: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Tento odd�l nem��e b�t pou�it pro loopback"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "N�zev souboru loopbacku:"
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
-msgstr "Soubor u� je pou��v�n jin�m loopbackem, zkuste jin�"
+msgstr "Soubor u� je pou��v�n jin�m loopbackem, zvolte si jin�"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "Soubor u� existuje. M�m ho pou��t?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Zvolit soubor"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1165,11 +1397,11 @@ msgstr ""
 "Z�lo�n� tabulka odd�l� nem� stejnou velikost\n"
 "Chcete p�esto chcete pokra�ovat?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Varov�n�"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1177,156 +1409,161 @@ msgstr ""
 "Vlo�te disketu do mechaniky\n"
 "V�echna data na t�to disket� budou smaz�na"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Pokou��m se obnovit tabulku odd�l�"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "za��zen�"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "�rove�"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "Velikost bloku(chunk)"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Zvolte existuj�c� RAID pro p�id�n�"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "nov�"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s form�tov�n� %s skon�ilo chybou"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "nev�m jak naform�tovat %s na typ %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "p�ipojov�n� nfs skon�ilo chybou"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "chyba p�ipojov�n�: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "chyba odpojov�n� %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "P��pojn� body (mount points) mus� za��nat '/'"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Odd�l s p��pojn�m bodem %s u� existuje\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Propleten� p��pojn� body %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
-"Pro tento p�ipojovan� bod pot�ebujete opravdov� souborov� syst�m (ext2, "
-"reiserfs)\n"
+"Pro tento p��pojn� bod pot�ebujete opravdov� souborov� syst�m (Ext2, "
+"ReiserFS)\n"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Chyba p�i otev�r�n� %s pro z�pis: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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 ""
 "Stala se chyba - nebylo nalezeno ��dn� za��zen� na kter�m by se daly "
-"vytvo�it nov�\n"
-"souborov� syst�my. Zkontrolujte V� hardware kv�li t�to chyb�, pros�m"
+"vytvo�it nov� souborov� syst�my. Zkontrolujte pros�m hardware"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Nem�te ��dn� odd�ly!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "Zvolte si jazyk pro instalaci a pou��v�n� syst�mu."
 
-#: ../../help.pm_.c:10
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Zvolte si odpov�daj�c� rozlo�en� kl�vesnice"
-
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "Zvolte si odpov�daj�c� rozlo�en� kl�vesnice"
+
+#: ../../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
+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"
-"  - 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"
-msgstr ""
-"Zvolte \"Instalace\" pokud nem�te ��dnou p�edchoz� verzi Linuxu "
-"nainstalovanou,\n"
-"nebo pokud si p�ejete pou��vat v�ce distribuc� nebo verz� najednou.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Zvolte \"Upgrade\" jestli�e si p�ejete p�einstalovat st�vaj�c� verzi\n"
-"Mandrake Linuxu: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus)\n"
-"6.1 (Helios), Gold 2000 nebo 7.0 (Air).\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"
-"Vyberte si:\n"
-"  - Automatick� (doporu�en�): Prav� volba, jestli�e jste nikdy d��ve\n"
-"neinstalovali Linux. Pozn�mka: P�i tomto typu instalace nebudou nastaveny\n"
-"s��ov� slu�by. Pro jejich pozd�j�� nastaven� pou�ijte n�stroj "
-"\"linuxconf\".\n"
+"\t* Recommanded: 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"
-"  - Vlastn�: Jestli�e zn�te Linux, budete si moct vybrat typick� pou�it�\n"
-"nainstalovan�ho syst�mu. Detaily jsou pops�ny n��e.\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
 "\n"
-"  - Expert: Jestli�e jste dob�e obezn�meni s GNU/Linuxem a chcete prov�st\n"
-"precizn� nastaven� instalace, je pr�v� pro V�s tato volba. Budete si moci\n"
-"vybrat typick� pou�it� Va�eho syst�mu stejn� jako v p��pad� \"Vlastn�\"\n"
-"instalace. Pros�m nevolte tuto instalaci JESTLI�E NEV�TE P�ESN� CO D�L�TE!\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1334,12 +1571,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Vyberte si:\n"
 "\n"
@@ -1350,36 +1588,35 @@ msgstr ""
 "\"V�vojov�\", nebo zvolte \"Server\" jestli�e si p�ejete nainstalovat\n"
 "obecn� server (pro po�tu, tisk...).\n"
 "\n"
+"\n"
 "  - Expert: Jestli�e jste dob�e obezn�meni s GNU/Linuxem a chcete prov�st\n"
 "precizn� nastaven� instalace, je pr�v� pro V�s tato volba. Budete si moci\n"
 "vybrat typick� pou�it� Va�eho syst�mu stejn� jako v p��pad� \"Vlastn�\"\n"
-"instalace.\n"
+"instalace."
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "R�zn� mo�nosti pou�it� va�eho po��ta�e (pokud jste zvolili \"Vlastn�\"\n"
 "nebo \"Expert\" t��du instalace) jsou:\n"
@@ -1397,30 +1634,38 @@ msgstr ""
 "    SMB protokol), nebo jako ov��ovac� (NIS), datab�zov�, atd. Neo�ek�vejte\n"
 "    ��dn� KDE nebo GNOME.\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
+#, fuzzy
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 se nejd��ve pokus� naj�t PCI SCSI adapt�ry. Pokud n�jak� najde,\n"
 "a bude v�d�t kter� ovlada� pro n� pou��t, automaticky ho pou�ije.\n"
@@ -1437,256 +1682,481 @@ msgstr ""
 "Pot� co jste si vybrali ovlada� se V�s DrakX zept� jestli pro n�j\n"
 "chcete zadat n�jak� informace. Nechat ovlada� samostatn� prozkoumat "
 "hardware\n"
-"v�t�inou funguje dob�e, proto to zkuste nejd��ve.\n"
+"v�t�inou funguje dob�e, proto to zkuste jako prvn� v�c.\n"
 "\n"
 "\n"
-"Pokud to nebude fungovat, vzpome�te si na informace kter� m�te z\n"
-"dokumentace k hardware, nebo z Windows (pokud je m�te na po��ta�i).\n"
-"Podrobn�j�� informace m��ete naj�t v instala�n� p��ru�ce."
+"Pokud to nebude fungovat budete muset zadat dal�� informace pro ovlada�\n"
+"Pro dal�� n�pov�du se pod�vejte do instala�n� p��ru�ky, kde je pops�no\n"
+"jak z�skat tyto informace z Windows (pokud je m�te na po��ta�i), z\n"
+"dokumentace k hardware, nebo z internetov� str�nky v�robce (pokud m�te\n"
+"p��stup k internetu."
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:108
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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 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"
-"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"
+"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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\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 ""
-"Pokud ji� m�te vytvo�en� diskov� odd�ly (od p�edchoz� instalace Linuxu, "
-"nebo\n"
-"pomoc� jin�ho programu), m��ete si zvolit kter� z nich pou�ijete pro "
-"instalaci\n"
-"Mandrake Linuxu. Pokud tyto odd�ly je�t� nem�te, mus�te je nejprve "
-"vytvo�it.\n"
-"To znamen� logicky rozd�lit kapacitu hardisku na v�ce ��st�.\n"
-"\n"
-"Jestli�e mus�te vytvo�it nov� odd�ly, pou�ijte tla��tko \"Automaticky "
-"vyhradit\"\n"
-"pro automatick� vytvo�en� odd�l� pro Linux. Disk pro rozd�len� si m��ete "
-"vybrat\n"
-"klepnut�m na jeho symbol. \"hda\" znamen� prvn� IDE hardisk, \"hdb\" je "
-"druh�,\n"
-"\"sda\" je prvn� SCSI disk, a tak d�le.\n"
-"\n"
-"\n"
-"Dva odd�ly kter� se obvykle vytv��� jsou: ko�enov� odd�l (/), co� je "
-"za��tek\n"
-"stromov� struktury soubor�, a /boot, kter� obsahuje v�echny soubory "
-"pot�ebn�\n"
-"ke startu syst�mu po zapnut� po��ta�e.\n"
-"\n"
-"\n"
-"Rozd�lov�n� disku m��e b�t pro nezku�en�ho u�ivatele stresuj�c�, proto�e\n"
-"n�sledky jsou obvykle nezvratn�. DiskDrake tento proces zjednodu�uje.\n"
-"Ne� budete pokra�ovat, prostudujte si dokumentaci a nechte si v�e proj�t\n"
-"hlavou.\n"
-"\n"
-"Ve�ker� operace lze prov�d�t i pomoc� kl�vesnice:\n"
-"Po jednotliv�ch odd�lech se m��ete pohybovat pomoc� kl�vesy Tab a �ipek\n"
-"Nahoru/Dolu.\n"
-" - Ctrl-c vytvo�� nov� odd�l (pokud je zvolen� pr�zdn� odd�l)\n"
-" - Ctrl-d sma�e odd�l\n"
-" - Ctrl-m slou�� k p�i�azen� p��pojn�ho bodu vybran�mu odd�lu\n"
-
-#: ../../help.pm_.c:131
-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."
-msgstr ""
-"V�echny diskov� odd�ly kter� byly nov� vytvo�eny mus� b�t naform�tov�ny aby\n"
-"mohly b�t pou��v�ny (form�tov�n� znamen� vytv��en� souborov�ho syst�mu).\n"
-"Tak� si m��ete p��t p�eform�tovat n�kter� u� existuj�c� odd�ly aby z nich\n"
-"byla odstran�na data. Pozn�mka: nen� nutn� p�eform�tov�vat u� existuj�c�\n"
-"diskov� odd�ly, obzvl�t� pokud obsahuj� soubory nebo data kter� si p�ejete\n"
-"zachovat. Typicky zachov�van� jsou /home a /usr/local."
-
-#: ../../help.pm_.c:139
+
+#: ../../help.pm_.c:160
 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\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"
-"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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"\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"
+"\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"
 msgstr ""
-"Nyn� si m��ete vybrat skupiny bal��k� pro instalaci nebo obnoven�.\n"
+
+#: ../../help.pm_.c:218
+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"
-"DrakX potom otestuje, zda m�te dostatek prostoru pro instalaci v�ech\n"
-"zvolen�ch bal��k�. Varuje v�s pokud dostatek prostoru nem�te. Ale i p�esto\n"
-"m��ete pokra�ovat s t�m, �e DrakX nenaistaluje n�kter� bal��ky s ni���\n"
-"prioritou. Na konci seznamu si m��ete zvolit \"V�b�r jednotliv�ch "
-"bal��k�\",\n"
-"co� znamen�, �e budete proch�zet v�ce jak 1000 program�..."
+"\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 ""
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:252
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
-"Pokud m�te v�echna CD vypsan� v��e, klepn�te na Ok.\n"
-"Pokud nem�te ��dn� z nich, klepn�te na Zru�it.\n"
-"Pokud V�m chyb� pouze n�kter� z nich, od-ozna�te je, a zvolte Ok."
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:257
 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."
+"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 ""
-"Vybran� bal��ky se nyn� budou instalovat. Tato operace m��e trvat\n"
-"p�r minut jestli�e jste si nezvolili p�einstalov�n� existuj�c�ho\n"
-"syt�mu. V tomto p��pad� m��e trvat del�� dobu ne� za�ne\n"
-"p�einstalov�v�n�."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:267
 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"
+"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"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\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"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
-msgstr ""
-"Jestli�e DrakX neusp�l p�i detekci my�i, nebo jestli�e si chcete ov��it\n"
-"co detekoval, bude V�m p�elo�en seznam my��.\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"
-"Jestli�e souhlas�te s nastaven�m, p�esu�te se do odd�lu do kter�ho chcete\n"
-"pouh�m klepnut�m na n�j vlevo v menu. Jinak si zvolte typ my�i o kter� si\n"
-"mysl�te, �e je nejbl��e k t� Va��.\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"
-"V p��pad� my�i na s�riov� lince budete tak� muset zadat ke kter�mu\n"
-"s�riov�mu portu je p�ipojena."
+"\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:176
-msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
-"Pros�m zvolte spr�vn� port. Nap��klad COM1 v MS Windows je pojmenov�n\n"
-"v Linuxu ttyS0."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:303
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"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"
-"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"
+"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"
-"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"
+"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"
-"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"
+"Click on \"OK\" when you are ready to format partitions.\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."
+"Click on \"Cancel\" if you want to choose other partitions to install your "
+"new\n"
+"Linux-Mandrake operating system."
 msgstr ""
-"Tento odd�l je v�nov�n nastaven� m�stn� s�t� (LAN) nebo modemu.\n"
+
+#: ../../help.pm_.c:329
+#, 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 ""
+"Nyn� si m��ete vybrat skupiny bal��k� pro instalaci nebo obnoven�.\n"
+"\n"
+"DrakX potom otestuje, zda m�te dostatek prostoru pro instalaci v�ech\n"
+"zvolen�ch bal��k�. Varuje v�s pokud dostatek prostoru nem�te. Ale i p�esto\n"
+"m��ete pokra�ovat s t�m, �e DrakX nenainstaluje n�kter� bal��ky s ni���\n"
+"prioritou. Na konci seznamu si m��ete zvolit \"V�b�r jednotliv�ch "
+"bal��k�\",\n"
+"co� znamen�, �e budete proch�zet v�ce jak 1000 program�..."
+
+#: ../../help.pm_.c:341
+msgid ""
+"You can now choose individually all the packages you\n"
+"wish to install.\n"
+"\n"
 "\n"
-"Zvolte si \"M�stn� LAN\" a DrakX se na Va�em po��ta�i pokus� naj�t\n"
-"ethernet adapt�r. PCI adapt�ry by m�ly b�t nalezeny a inicializov�ny\n"
-"automaticky. Pokud je ale Va�e karta ISA, nebude autodetekce fungovat,\n"
-"a budete si muset zvolit ovlada� ze seznamu kter� se pak objev�.\n"
+"You can expand or collapse the tree by clicking on options in the left "
+"corner of\n"
+"the packages window.\n"
 "\n"
 "\n"
-"Jako u SCSI adapt�r�, m��ete nejprve nechat ovlada� prozkoumat adapt�ry,\n"
-"a p��padn� potom zadat vlastn� nastaven�, kter� z�sk�te z Windowsov�ho\n"
-"ovl�dac�ho panelu.\n"
+"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
+"\"Toggle flat and group sorted\".\n"
 "\n"
 "\n"
-"Jestli�e instalujete Mandrake Linux na po��ta�i kter� je ��st� u�\n"
-"existuj�c� s�t�, jej� spr�vce V�m sd�l� ve�ker� pot�ebn� informace\n"
-"(IP adresu, s��ovou masku - netmask, a hostname). Jestli�e si\n"
-"z�izujete soukromou s��, nap��klad doma, m�li byste si zvolit\n"
-"adresu.\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:358
+#, 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 ""
+"Pokud m�te v�echna CD vypsan� v��e, klepn�te na Ok.\n"
+"Pokud nem�te ��dn� z nich, klepn�te na Zru�it.\n"
+"Pokud V�m chyb� pouze n�kter� z nich, od-ozna�te je, a zvolte Ok."
+
+#: ../../help.pm_.c:363
+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"
-"Zvolte si \"P�ipojen� modemem\" pro spojen� s Internetem pomoc� modemu\n"
-"DrakX se pokus� naj�t V� modem, pokud toto sel�e vyberete si s�riov� port\n"
-"kde je V� modem p�ipojen�."
+"Please be patient."
+msgstr ""
+
+#: ../../help.pm_.c:371
+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:210
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Enter:\n"
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
+msgstr ""
+"Pros�m zvolte s�riov� port. Nap��klad COM1 v MS Windows je pojmenov�n\n"
+"v GNU/Linuxu ttyS0."
+
+#: ../../help.pm_.c:380
+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"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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:393
+msgid ""
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - Automatic IP: If your network uses bootp or dhcp protocol, select \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\n"
+"\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"Nyn� m��ete zadat parametry p�ipojen� k internetu p�es modem. Pokud nev�te\n"
+"co zadat, m��ete z�skat spr�vn� hodnoty od Va�eho internetov�ho "
+"poskytovatele."
+
+#: ../../help.pm_.c:425
+#, 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 ""
 "Zadejte:\n"
 "\n"
@@ -1703,7 +2173,23 @@ msgstr ""
 "Pokud si nejste jist�, zeptejte se Va�eho spr�vce s�t�, nebo internetov�ho\n"
 "poskytovatele.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"Jestli�e Va�e s�� pou��v� NIS, zvolte \"Pou�ij NIS\". Pokud si nejste "
+"jist�,\n"
+"zeptejte se Va�eho spr�vce s�t�."
+
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1712,7 +2198,7 @@ msgstr ""
 "co zadat, m��ete z�skat spr�vn� hodnoty od Va�eho internetov�ho "
 "poskytovatele."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1721,13 +2207,15 @@ msgstr ""
 "jestli proxy pou��vat budete nebo ne, zeptejte se Va�eho spr�vce s�t�, nebo\n"
 "internetov�ho poskytovatele."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1738,110 +2226,201 @@ msgstr ""
 "\n"
 "Pozn�mka: Mirror a bal��ky si mus�te zvolit podle m�stn�ch z�kon�"
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "Nyn� si m��ete vybrat Va�e �asov� p�smo podle toho kde �ijete.\n"
 "\n"
 "\n"
-"Linux pracuje s �asem v GMT (Greenwichsk� �as) a p�epo��t�v� ho na m�stn�,\n"
-"podle �asov�ho p�sma, kter� si vyberete\n"
-"."
+"GNU/Linux pracuje s �asem v GMT (Greenwichsk� �as) a p�epo��t�v� ho na "
+"m�stn�,\n"
+"podle �asov�ho p�sma, kter� si vyberete."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 ""
 "M��ete si zvolit kter� slu�by maj� b�t spu�t�ny p�i startu po��ta�e.\n"
-"Pokud p�ejedete my�� nad n�kterou polo�ku, objev� se mal� n�pov�da s "
-"popisem\n"
-"co dan� slu�ba d�l�."
+"Pokud p�ejedete my�� nad n�kterou polo�ku, objev� se mal� n�pov�da s\n"
+"popisem co dan� slu�ba d�l�."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
+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:490
+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:505
 msgid ""
-"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"
+"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\n"
-"\"Local printer\". You will then have to tell which port your\n"
-"printer is connected to, and select the appropriate filter.\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,\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"
+"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 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."
+"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 ""
-"Linux si rozum� s mnoha typy tisk�ren. Ka�d� tento typ vy�aduje\n"
-"jin� nastaven�. Pozn.: Tiskov� fronta standardn� pou��v� n�zev 'lp'. Pokud\n"
-"byste r�di p�i�adili tisk�rn� dal��, smyslupln�j�� jm�no, m��ete to u�init\n"
-"pomoc� odd�lova�e '|'. Jm�no tisk�rny tedy bude t�eba \"Moje "
-"tisk�rna|lp0|lp\".\n"
-"Prvn� alias (\"Moje tisk�rna\") bude pou�it pro ikonu, sambu, atd. Pro\n"
-"p��kazovou ��dku bude nejsnaz�� pou��t jm�no \"lp0\", a proto�e m� tisk�rna\n"
-"i alias \"lp\", bude pou�ita jako standardn�.\n"
+
+#: ../../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"
-"Jestli�e je Va�e tisk�rna p��mo p�ipojen� k Va�emu po��ta�i, vyberte\n"
-"\"M�stn� tisk�rna\". Potom zad�te ke kter�mu portu je tisk�rna p�ipojena\n"
-"a vyberete pro ni filtr(ovlada�).\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"
-"Jestli�e chcete pracovat s tisk�rnou um�st�nou na vzd�len�m Unixov�m\n"
-"stroji, vyberte si \"Vzd�len� lpd\". Abyste ji mohli pou��vat nen�\n"
-"zapot�eb� ��dn� u�ivatelsk� jm�no ani heslo, ale pot�ebujete v�d�t\n"
-"jm�no tiskov� fronty na vzd�len�m serveru.\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"
-"Jestli�e chcete pracovat s SMB tisk�rnu (co� znamen� tisk�rna um�st�n�\n"
-"na vzd�len�m Windows9x/NT stroji), budete muset zadat jej� SMB jm�no\n"
-"(co� nen� jej� TCP/IP jm�no), a pop��pad� jej� IP adresu, u�ivatelsk�\n"
-"jm�no, pracovn� skupinu a heslo pro p��stup na tuto tisk�rnu. A samoz�ejm�\n"
-"jm�no tisk�rny. To sam� plat� pro NetWare tisk�rnu, krom� toho, �e\n"
-"nepot�ebujete informaci o pracovn� skupin�."
+"   * 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:286
+#: ../../help.pm_.c:542
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"  \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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
+"\n"
+"Do not make the password too long or complicated, though: you must be able "
+"to\n"
+"remember it without too much effort."
 msgstr ""
 "Nyn� m��ete zadat superu�ivatelsk� (root) heslo pro v� Mandrake Linux.\n"
 "Heslo mus� b�t zad�no dvakr�t pro vylou�en� p�eklepu.\n"
@@ -1856,7 +2435,7 @@ msgstr ""
 "nebo komplikovan�, proto�e mus�te b�t schopni si ho zapamatovat bez p��li�\n"
 "velk� n�mahy."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1864,15 +2443,16 @@ msgstr ""
 "Pro bezpe�n�j�� syst�m byste si m�li zvolit \"Pou��v�n� st�nov�n�\"\n"
 "(shadow file) a \"Pou��v�n� MD5 hesel\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
 msgstr ""
-"Jestli�e Va�e s�� pou��v� NIS, zvolte \"Pou�ij NIS\". Pokud to nev�te,\n"
+"Jestli�e Va�e s�� pou��v� NIS, zvolte \"Pou�ij NIS\". Pokud si nejste "
+"jist�,\n"
 "zeptejte se Va�eho spr�vce s�t�."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1914,34 +2494,29 @@ msgstr ""
 "kter� si zde vytvo��te, a jako superu�ivatel se p�ihla�ovat pouze pro\n"
 "spravov�n� syst�mu."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Doporu�uji V�m, odpov�zte \"Ano\". Pokud budete pozd�ji instalovat "
-"Microsoft\n"
-"Windows, bude boot sektor p�eps�n. Pokud nem�te vytvo�en� startovac� disk,\n"
-"u� se nebudete moct do Linuxu dostat."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
 "Je zapot�eb� zadat kam si p�ejete um�stit\n"
-"informaci pot�ebnou k nastartov�n� Linuxu.\n"
+"informaci pot�ebnou k nastartov�n� GNU/Linuxu.\n"
 "\n"
 "\n"
 "Pokud nev�te p�esn� co d�l�te, zvolte \"Prvn� sektor disku (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1949,10 +2524,10 @@ msgstr ""
 "Pokud nem�te jin� speci�ln� po�adavek, obvykle se vol� \"/dev/hda\"\n"
 "(master disk na prvn�m �adi�i) nebo \"/dev/sda\" (prvn� SCSI disk)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1963,12 +2538,14 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 "LILO (LInux LOader) a Grub jsou zav�d�c� programy, co� znamen�, �e mohou\n"
-"spustit bu� Linux, nebo kter�koliv jin� opera�n� syst�m, kter� je na Va�em\n"
+"spustit bu� GNU/Linux, nebo kter�koliv jin� opera�n� syst�m, kter� je na "
+"Va�em\n"
 "po��ta�i. Norm�ln� jsou v�echny takov�to syst�my detekov�ny a nastaveny.\n"
 "Pokud se tak nestalo, m��ete v t�to obrazovce ru�n� p�idat dal�� z�znam.\n"
 "Mus�te ale spr�vn� zadat n�kter� parametry dan�ho syst�mu."
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1985,10 +2562,12 @@ msgid ""
 "\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."
 msgstr ""
-"Hlavn� mo�nosti pro LILO a grub jsou:\n"
+"Hlavn� mo�nosti pro LILO a Grub jsou:\n"
 "  - Startovac� za��zen�: Nastav�te jm�no za��zen� (nap�. diskov� odd�l)\n"
 "kter� obsahuje startovac� sektor (boot sector). Pokud nem�te jin� speci�ln�\n"
 "po�adavek, zvolte \"/dev/hda\".\n"
@@ -2007,10 +2586,57 @@ msgstr ""
 "    * norm�ln�: standardn� re�im 80x25 znak�\n"
 "    * <��slo>: pou�ije odpov�daj�c� re�im."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 zav�d�c� program pro SPARC: um� nastartovat bu� GNU/Linux, nebo\n"
+"jak�koliv jin� opera�n� syst�m na Va�em po��ta�i. Norm�ln� jsou v�echny\n"
+"takov�to syst�my detekov�ny a nastaveny. Pokud se tak nestalo, m��ete\n"
+"v t�to obrazovce ru�n� p�idat dal�� z�znam. Mus�te ale spr�vn� zadat\n"
+"n�kter� parametry dan�ho syst�mu."
+
+#: ../../help.pm_.c:692
+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 ""
+"Hlavn� mo�nosti pro SILO jsou:\n"
+"  - Instalace zav�d�c�ho programu: Nastav�te jm�no za��zen� (nap�.\n"
+"diskov� odd�l) kam si p�ejete um�stit informace pot�ebn� pro start syst�mu.\n"
+"Pokud p�esn� nev�te co d�l�te, zvolte \"Prvn� sektor disku (MBR)\".\n"
+"\n"
+"\n"
+"  - Prodleva p�ed automatick�m startem: Ur�uje po�et desetin sekundy, po "
+"kter�\n"
+"bude zav�d�c� program �ekat, ne� spust� standardn� volbu. Toto je �ikovn� "
+"pro\n"
+"po��ta�e, kter� okam�it� po zapnut� kl�vesnice za�nou startovat. Zav�d�c�\n"
+"program nebude �ekat pokud je tato hodnota nastavena na 0, nebo nen� zad�na\n"
+"v�bec."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2021,7 +2647,7 @@ msgid ""
 "settings suit you. If they don't, you can come back and\n"
 "change them, as many times as necessary."
 msgstr ""
-"Te� je �as nastavit grafick� syst�m X, co� je j�dro Linuxov�ho GUI\n"
+"Te� je �as nastavit grafick� syst�m X, co� je j�dro GNU/Linuxov�ho GUI\n"
 "(Grafick�ho U�ivatelsk�ho Rozhran�). K tomuto ��elu mus�te nastavit\n"
 "Va�i grafickou kartu a monitor. V�t�ina t�to pr�ce je prov�d�na\n"
 "automaticky, tak�e na V�s by m�la zb�t pouze kontrola toho co bylo\n"
@@ -2033,7 +2659,7 @@ msgstr ""
 "Pokud V�m vyhovovat nebudou, m��ete se vr�tit a m�nit je tak dlouho,\n"
 "dokud to bude zapot�eb�."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2041,7 +2667,7 @@ msgstr ""
 "Pokud je nastaven� X �patn�, pou�ijte tyto mo�nosti pro spr�vn� nastaven�\n"
 "grafick�ho syst�mu."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2049,42 +2675,47 @@ msgstr ""
 "Jestli�e rad�ji pou��v�te p�ihla�ov�n� v grafick�m re�imu, zvolte \"Ano\".\n"
 "Jinak zvolte \"Ne\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\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"
+"\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"\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."
 msgstr ""
 "Nyn� m��ete zm�nit r�zn� nastaven� Va�eho syst�mu.\n"
 "\n"
@@ -2099,11 +2730,6 @@ msgstr ""
 "  - Zvolte si �rove� zabezpe�en�: M��ete si vybrat jak moc si p�ejete\n"
 "zabezpe�it V� syst�m. Bli��� informace m��ete naj�t v instala�n�\n"
 "p��ru�ce. Pokud nev�te co zvolit, bude nejvhodn�j�� volba \"St�edn�\".\n"
-"Pokud opravdu chcete m�t zabezpe�en� syst�m zvolte \"Paranoidn�\",\n"
-"ale pozor, V T�TO �ROVNI NEBUDE POVOLENO P�IHL��EN� ROOTa V KONZOLI! Pokud\n"
-"se chcete p�ihl�sit jako superu�ivatel, mus�te se nejprve p�ihl�sit jako\n"
-"norm�ln� u�ivatel a potom pou��t p��kaz \"su\". Obecn� nebude takov�to\n"
-"po��ta� pou�iteln� jinak ne� server. Byli jste varov�ni.\n"
 "\n"
 "\n"
 "  - Pokud t�eba, up�esn�te velikost RAM: Bohu�el v dne�n� dob� neexistuje\n"
@@ -2120,9 +2746,9 @@ msgstr ""
 "\n"
 "  - P�i startu zapni Numlock: Jestli chcete aby byl po startu Numlock "
 "zapnut,\n"
-"pak zvolte tuto mo�nost. (Pozn.: Numlock nebude zapnut� v X)."
+"pak zvolte tuto mo�nost. (Pozn.: Numlock m��e a nemus� fungovat v X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2135,96 +2761,119 @@ msgstr ""
 "Po resetu se V� nov� Mandrake Linux automaticky spust�. Jestli chcete\n"
 "nastartovat jin� existuj�c� opera�n� syst�m, p�e�t�te si dal�� informace."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Zvolte si jazyk"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Zvolte si typ instalace"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Detekce hardisk�"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Nastaven� my�i"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Zvolte si kl�vesnici"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "R�zn�"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Souborov� syst�my"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Form�tov�n� odd�l�"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "V�b�r bal��k� k instalaci"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Nainstalov�n� syt�mu"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Nastaven� s�t�"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "�ifrov�n�"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "�asov� p�smo"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Nastaven� slu�eb"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Nastaven� tisk�rny"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Hlavn�(root) heslo"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "P�id�n� u�ivatele"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Startovac� disketa"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Zav�d�c� program"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Nastaven� X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Auto-instala�n� disketa"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Ukon�it instalaci"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Chyba p�i �ten� souboru $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "Vyzkou�ejte pros�m, zda my� funguje"
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Vyzkou�ejte pros�m, zda my� funguje"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+"N�kter� ��st va�eho hardware pot�ebuje ``speci�ln�'' ovlada�e, aby mohla "
+"pracovat.\n"
+"Dal�� informace m��ete nal�zt na: %s"
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2232,237 +2881,256 @@ msgid ""
 msgstr ""
 "Mus�te m�t ko�enov� odd�l.\n"
 "K jeho vytvo�en� mus�te zvolit jeden existuj�c� odd�l\n"
-"(nebo vytvo�it nov�), pot� zvolit ``P��pojn� bod''\n"
+"(nebo vytvo�it nov�), zvolit ``P��pojn� bod''\n"
 "a nastavit ho na `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Nem��u p�e��st Va�i tabulku odd�l�, mo�n� je p��li� naru�en� :(\n"
-"Pokus�m se pokra�ovat v �i�t�n� �patn�ch odd�l�"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "Mus�te m�t odkl�dac� odd�l"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake neusp�l p�i �ten� tabulky odd�l�.\n"
-"Pokra�ujte pouze na vlastn� riziko!"
+"Nem�te odkl�dac� odd�l\n"
+"\n"
+"P�esto chcete pokra�ovat?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Vyhled�v�n� ko�enov�ho odd�lu."
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Pou��t voln� m�sto"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Informace"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "Nen� dostatek m�sta pro vytvo�en� nov�ho diskov�ho odd�lu"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: Toto nen� ko�enov� diskov� odd�l, pros�m zvolte jin�."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "Pou��t existuj�c� odd�l"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Nebyl nalezen ��dn� ko�enov� odd�l"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "Nen� zde ��dn� existuj�c� odd�l k pou�it�"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Nem��u pou��t broadcast bez NIS dom�ny"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Pou��t Windows odd�l jako loopback"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Chyba p�i �ten� souboru $f"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Kter� diskov� odd�l chcete pou��t pro Linux4Win?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Stala se chyba, ale nev�m jak j� spr�vn� interpretovat.\n"
-"Pokra�ujte na vlastn� riziko."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Zvolte velikosti"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Zdvojen� p��pojn� bod %s"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Velikost ko�enov�ho odd�lu v MB:"
 
-#: ../../install_steps.pm_.c:323
-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 ""
-"N�kter� d�le�it� bal��ky nebyli spr�vn� nainstalovan�.\n"
-"Je mo�n�, �e po�kozen CD disk nebo CD-ROM mechanika\n"
-"Zkontrolujete to pou�it�m p��kazu \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Velikost swapov�ho odd�lu v MB: "
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "V�tejte na %s"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "Pou��t voln� m�sto na Windows odd�lu"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Nen� dostupn� disketov� mechanika"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Na kter�m odd�lu chcete m�nit velikost?"
+
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "Po��t�m hranice souborov�ho syst�mu s Windows"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "Za��n�m `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"Zm�nu velikost FAT nen� mo�n� prov�st, \n"
+"vyskytla se n�sleduj�c� chyba: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "Mus�te m�t odd�l odkl�dac�ho prostoru"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
+"V� diskov� odd�l s Windows je p��li� fragmentov�n, pou�ijte nejd��ve "
+"``defrag''"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"Nem�te odd�l odkl�dac�ho prostoru\n"
+"VAROV�N�!\n"
 "\n"
-"P�esto chcete pokra�ovat?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Zadejte velikost kterou chcete pro nainstalovan� syst�m"
+"DrakX nyn� mus� zmen�it odd�l s Windows. Bu�te opatrn�: tato operace je\n"
+"nebezpe�n�. Pokud jste tak ji� neu�inili, m�li byste nejprve ukon�it "
+"instalaci\n"
+"spustit scandisk ve Windows (pop��pad� i defrag) a potom instalaci znovu "
+"spustit\n"
+"Tak� byste si m�li data z�lohovat. A� si budete jist�, �e chcete pokra�ovat\n"
+"stiskn�te Ok."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Celkov� velikost: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "Jakou velikost odd�lu chcete nechat pro Windows na"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "Verze: %s\n"
+msgid "partition %s"
+msgstr "diskov�m odd�lu %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "Velikost: %d kB\n"
+msgid "FAT resizing failed: %s"
+msgstr "Zm�na FAT odd�lu neusp�la: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Vyberte si bal��ky kter� chcete nainstalovat"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+"Nejsou zde ��dn� FAT odd�ly, kter� by bylo mo�n� zm�nit (nebo nen� dostatek "
+"m�sta)"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Informace"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "Smazat cel� disk"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Instaluj"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Odstranit Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Instaluji"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr "M�te v�ce ne� jeden pevn� disk, na kter� chcete instalovat Linux?"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Pros�m po�kejte, "
+#: ../../install_interactive.pm_.c:156
+#, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "V�echny diskov� odd�ly a data na disku %s budou zru�ena"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Zb�vaj�c� �as "
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "M�d pro Experty"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Celkov� �as "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "Pou��t DiskDrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "P�ipravuji instalaci"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "Pou��t fdisk"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "Instaluji bal��ek %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Nyn� m��ete rozd�lit V� %s hardisk\n"
+"A� skon��te, nezapome�te ulo�it zm�ny pomoc� `w'"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "P�esto pokra�ovat?"
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Pou��t voln� m�sto na Windows odd�lu"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Stala se chyba p�i �azen� bal��k�:"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Nem��u p�idat ��dn� dal�� odd�l"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Pou��t existuj�c� nastaven� pro X11?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "Pr�vodce DrakX na�el n�sleduj�c� �e�en�:"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Pros�m zvolte jednu z n�sleduj�c�ch instala�n�ch t��d:"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Vytv��en� diskov�ch odd�l� selhalo: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Nem�te ��dn� Windows-ov� odd�ly!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Startuji s��"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Nem�te dostatek prostoru pro Lnx4win"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Zastavuji s��"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"VAROV�N�!\n"
-"\n"
-"DrakX nyn� mus� zmen�it odd�l s Windows. Bu�te opatrn�: tato operace je\n"
-"nebezpe�n�. Pokud jste tak ji� neu�inili, m�li byste nejprve ukon�it "
-"instalaci\n"
-"spustit scandisk ve Windows (pop��pad� i defrag) a potom instalaci znovu "
-"spustit\n"
-"Tak� byste si m�li data z�lohovat. A� si budete jist�, �e chcete pokra�ovat\n"
-"stiskn�te Ok."
+"Stala se chyba, ale nev�m jak j� spr�vn� interpretovat.\n"
+"Pokra�ujte na vlastn� riziko."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Automatick� zm�na velikosti neusp�la"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Zdvojen� p��pojn� bod %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Kter� diskov� odd�l chcete pou��t pro Linux4Win?"
+#: ../../install_steps.pm_.c:375
+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 ""
+"N�kter� d�le�it� bal��ky nebyly spr�vn� nainstalovan�.\n"
+"Je mo�n�, �e je po�kozen CD disk nebo CD-ROM mechanika\n"
+"Zkontrolujete to pou�it�m p��kazu \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Zvolte velikosti"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "V�tejte na %s"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Velikost ko�enov�ho odd�lu v MB:"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Nen� dostupn� ��dn� disketov� mechanika"
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Velikost swapov�ho odd�lu v MB: "
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Za��n�m `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"V� syst�m m� m�lo prost�edk�. P�i instalaci Mandrake Linuxu se\n"
+"m��ete setkat s r�zn�mi probl�my. Pokud se tak stane, zkuste textovou\n"
+"verzi instala�n�ho programu. Ten se spou�t� tak, �e p�i startu z\n"
+"CD mechaniky stisknete `F1' a pot� nap��ete `text'."
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Pros�m zvolte jednu z n�sleduj�c�ch instala�n�ch t��d:"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "Celkov� velikost zvolen�ch bal��k� je p�ibli�n� %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2476,7 +3144,7 @@ msgstr ""
 "Mal� po�et procent nainstaluje pouze ty nejd�le�it�j�� bal��ky, 100%%\n"
 "nainstaluje v�echny zvolen�."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2491,58 +3159,99 @@ msgstr ""
 "procent. Mal� po�et procent nainstaluje pouze ty nejd�le�it�j��\n"
 "bal��ky, %d%% nainstaluje maxim�ln� mo�n� mno�stv� bal��k�."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "P�esn�ji si budete moci vybrat v p���t�m kroku"
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Procent bal��k� k instalaci"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Vyberte si bal��ky kter� chcete nainstalovat"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Informace"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Instaluj"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Automatick� z�vislosti"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
-msgstr "Rozbal strom"
+msgstr "Rozbal v�tev"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
-msgstr "Sbal strom"
+msgstr "Sbal v�tev"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
-msgstr "P�epnut� mezi z�kladn�m a skupinov�m rovn�n�m"
+msgstr "P�epnut� mezi celkov�m a skupinov�m rovn�n�m"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "�patn� bal��ek"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Jm�no: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Verze: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Velikost: %d kB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "D�le�itost: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Celkov� velikost: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+"Nem��ete ozna�it tento bal��ek, proto�e pro jeho instalaci nen� dost m�sta"
+
+#: ../../install_steps_gtk.pm_.c:386
+msgid "The following packages are going to be installed"
+msgstr "Tyto bal��ky budou instalov�ny"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "Tyto bal��ky budou odebr�ny"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Nem��ete vybrat/nevybrat tento bal��ek"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Toto je nepostradateln� bal��ek, nem��e b�t odstran�n"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "Nem��ete od-ozna�it tento bal��ek, proto�e je u� nainstalovan�"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2550,45 +3259,89 @@ msgstr ""
 "Tento bal��ek mus� b�t obnoven\n"
 "Jste si jisti, �e ho nechcete zvolit?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Tento bal��ek mus� b�t obnoven, nem��ete ho nezvolit"
 
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-"Nem��ete ozna�it tento bal��ek, proto�e pro jeho instalaci nen� dost m�sta"
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Tyto bal��ky budou instalov�ny/odebr�ny"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "Nem��ete vybrat/nevybrat tento bal��ek"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Instaluji"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Odhaduji"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Pros�m po�kejte, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Zb�vaj�c� �as "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Celkov� �as "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Zru�it"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "P�ipravuji instalaci"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d bal��k�"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U Mb"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Instaluji bal��ek %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Accept"
+msgstr "Vytvo�it u�ivatele"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2603,181 +3356,390 @@ msgstr ""
 "\n"
 "Pokud toto CD nem�te stiskn�te Zru�it a toto CD nebude nainstalov�no."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Zm�nit velikost"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "P�esto pokra�ovat?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Stala se chyba p�i �azen� bal��k�:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Stala se chyba p�i instalaci bal��k�:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Stala se chyba"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Pros�m zvolte si, kter� jazyk chcete pou��vat."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Kl�vesnice"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Jak� je rozlo�en� Va�� kl�vesnice?"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr "M��ete si zvolit dal�� jazyky, kter� budou dostupn� po instalaci"
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Ko�enov� odd�l"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Kter� diskov� odd�l je ko�enov� (/) ?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Typ instalace"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Kter� typ instalace chcete?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Instalace/Upgrade"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr "Je to instalace nebo upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
+msgstr "Je to instalace nebo z�chrana?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Automatick�"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Doporu�en�"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Vlastn�"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Expert"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "Jste si jist�, �e jste expert?\n"
-"Pozor na to, budete moct prov�d�t i nebezpe�n� v�ci."
+"Pozor na to, budete moct prov�d�t i nebezpe�n� v�ci.\n"
+"\n"
+"Budete dotazov�ni na ot�zky jako nap�. ``Pou��t st�nov�(shadow) hesla?''.\n"
+"Um�te na takov�to ot�zky odpov�d�t?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Upgrade"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Norm�ln�"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "Pracovn� stanice"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "V�vojov�"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Server"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+#, fuzzy
+msgid "What is your system used for?"
 msgstr "Jak budete po��ta� vyu��vat ?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Jak� je typ Va�� my�i?"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "P�ipojen� my�i"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Ke kter�mu s�riov�mu portu je p�ipojena Va�e my�?"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Nastavuji PCMCIA karty"
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "Nastavuji IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "nejsou dostupn� ��dn� diskov� odd�ly"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Kter� diskov� odd�l chcete pou��t jako ko�enov�"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Zvolte si p��pojn�(mount) body"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Nem��u p�e��st Va�i tabulku odd�l�, je pro m� p��li� poru�en� :(\n"
+"M��u se pokusit pokra�ovat v �i�t�n� �patn�ch odd�l� (V�ECHNA\n"
+"DATA budou ztracena!). Jin� mo�nost je zak�zat DrakX m�nit tabulku\n"
+"odd�l� (chyba je %s)\n"
+"\n"
+"Souhlas�te s t�m, �e p��jdete o v�echny odd�ly?\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake neusp�l p�i �ten� tabulky odd�l�.\n"
+"Pokra�ujte pouze na vlastn� riziko!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Ko�enov� odd�l"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Kter� diskov� odd�l je ko�enov� (/) ?"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Mus�te restartovat po��ta� aby se projevily zm�ny v tabulce odd�l�"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Zvolte diskov� odd�ly kter� chcete naform�tovat"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Otestovat na vadn� stopy?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Form�tuji odd�ly"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Vytv���m a form�tuji soubor %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Nen� dostatek odkl�dac�ho prostoru k instalaci, pros�m p�idejte n�jak�"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Hled�m dostupn� bal��ky"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Vyhled�v�m bal��ky pro upgrade"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr "Na Va�em syst�mu nen� dostatek m�sta pro instalaci nebo upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
+msgstr ""
+"Na Va�em syst�mu nen� dostatek m�sta pro instalaci nebo upgrade (%d > %d)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "Kompletn� (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "Minim�ln� (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Doporu�en� (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "Vlastn�"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "Zadejte velikost kterou chcete pou��t pro nainstalovan� syst�m"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "V�b�r skupiny bal��k�"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "V�b�r jednotliv�ch bal��k�"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2787,12 +3749,12 @@ msgstr ""
 "Pokud nem�te ��dn� z nich, klepn�te na Zru�it.\n"
 "Pokud V�m chyb� pouze n�kter� z nich, od-ozna�te je, a zvolte Ok."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROM �. \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2800,172 +3762,11 @@ msgstr ""
 "Instaluji bal��ek %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Nastaven� po instalaci"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Ponechat st�vaj�c� nastaven� IP"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Nyn� znovu nastavit s��"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Nenastavovat s�t�"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Nastaven� s�t�"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "M�stn� s�� u� byla nastavena. Chcete:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Chcete na Va�em po��ta�i nastavit m�stn� s�� ?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "nebyla nalezena s��ov� karta"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Nastaven� modemu"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "Chcete na Va�em po��ta�i nastavit p�ipojen� k s�ti p�es modem?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Nastavuji s��ov� za��zen� %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Pros�m zadejte IP nastaven� pro tento stroj.\n"
-"Ka�d� polo�ka mus� b�t zad�na jako IP adresa v desetinn� form�\n"
-"(nap��klad 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Automatick� IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP adresa:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Maska s�t�:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP adresa mus� b�t ve form�tu 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Nastavuji s��"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Pros�m zadejte Va�i hostname.\n"
-"Va�e hostname mus� b�t �pln�, jako ``mybox.mylab.myco.com''.\n"
-"Pokud pou��v�te br�nu(gateway), m��ete tak� zadat jej� adresu"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS server:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Za��zen� br�ny(gateway):"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Br�na(gateway):"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Hostname:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "M�m se pokusit naj�t modem?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Ke kter�mu s�riov�mu portu je V� modem p�ipojen?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Mo�nosti vyt��en�"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Jm�no p�ipojen�"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Telefonn� ��slo"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "P�ihla�ovac� jm�no"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Ov��en�"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Podle sc�n��e"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Pomoc� termin�lu"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Jm�no dom�ny"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Prvn� DNS Server"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Druh� DNS Server"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3003,7 +3804,7 @@ msgid ""
 "Altadena California 91001\n"
 "USA"
 msgstr ""
-"Nyn� si m��ete st�hnout �ifrovac� software.\n"
+"Nyn� si m��ete st�hnout �ifrovac� software. Chcete tak u�init P�ijmout ?\n"
 "\n"
 "VAROV�N�:\n"
 "\n"
@@ -3033,88 +3834,92 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Zvolte si zrcadlo(mirror) pro stahov�n� bal��k�"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Stahuji ze zrcadla(mirror) seznam dostupn�ch bal��k�"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Pros�m vyberte si bal��ky kter� chcete nainstalovat."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
-msgstr "Kter� �asov� p�smo je Va�e?"
+msgstr "Jak� je va�e �asov� p�smo?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Jsou Va�e hardwarov� hodiny nastaveny na GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "Kter� syst�m chcete pou��t pro tisk?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "��dn� heslo"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Pou��t st�nov� soubor (shadow)"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "st�n"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Pou��vat MD5 hesla"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Pou��vat NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "�lut� str�nky"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "Toto heslo je p��li� jednoduch� (mus� b�t alespo� %d znak� dlouh�)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Ov��en� pravosti NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS Dom�na"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS Server"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
-msgstr "P�ijmout u�ivatele"
+msgstr "Vytvo�it u�ivatele"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "P�idat u�ivatele"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(u� byl p�id�n %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3124,60 +3929,86 @@ msgstr ""
 "Zadejte u�ivatele\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Skute�n� jm�no"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "U�ivatelsk� jm�no"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Toto heslo je p��li� jednoduch�"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Pros�m zadejte u�ivatelsk� jm�no"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "U�ivatelsk� jm�no m��e obsahovat pouze mal� p�smena, ��sla, `-' a `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
-msgstr "Toto u�ivatelsk� jm�no u� bulo p�id�no"
+msgstr "Toto u�ivatelsk� jm�no u� bylo p�id�no"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Pomoc� startovac� diskety m��ete nastartovat Linux, bez pou�it� norm�ln�ho\n"
+"zav�d�c�ho programu (bootloader). To je u�ite�n� pokud nechcete instalovat\n"
+"SILO, nebo jin� opera�n� syst�m odstran� SILO, nebo SILO\n"
+"na Va�em po��ta�i nefunguje. Vlastn� startovac� disketa tak� m��e b�t\n"
+"pou�ita spolu s\"Mandrake z�chrann�m diskem\" (rescue image), co� poskytuje\n"
+"��innou pomoc p�i hav�rii syst�mu.\n"
+"Jestli�e chcete vytvo�it startovac� disketu, nejd��ve vlo�te disketu do\n"
+"mechaniky a potom stiskn�te \"Ok\"."
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Prvn� disketa"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Druh� disketa"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "P�esko�it"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3192,69 +4023,37 @@ msgid ""
 msgstr ""
 "Pomoc� startovac� diskety m��ete nastartovat Linux, bez pou�it� norm�ln�ho\n"
 "zav�d�c�ho programu (bootloader). To je u�ite�n� pokud nechcete instalovat\n"
-"LILO (nebo grub), nebo jin� opera�n� syst�m odstran� LILO, nebo LILO\n"
-"nefunguje na Va�em po��ta�i. Vlastn� startovac� disketa tak� m��e b�t\n"
+"LILO (nebo Grub), nebo jin� opera�n� syst�m odstran� LILO, nebo LILO\n"
+"na Va�em po��ta�i nefunguje. Vlastn� startovac� disketa tak� m��e b�t\n"
 "pou�ita spolu s\"Mandrake z�chrann�m diskem\" (rescue image), co� poskytuje\n"
 "��innou pomoc p�i hav�rii syst�mu. Chcete vytvo�it startovac� disketu ?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Bohu�el nen� dostupn� ��dn� disketov� mechanika"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Zvolte mechaniku kde chcete vytvo�it startovac� disketu"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Vlo�te disketu do mechaniky %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Vytv���m startovac� disketu"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "Instalace LILO neusp�la. Stala se tato chyba:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Chcete pou��t SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "Z�kladn� nastaven� SILO"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Zde jsou jednotliv� z�znamy SILO.\n"
-"M��ete p�idat dal�� nebo zm�nit st�vaj�c�."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Diskov� odd�l"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Tato zna�ka se ji� pou��v�"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "Instalace SILO neusp�la. Stala se tato chyba:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "P�ipravuji zav�d�c� program"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "Chcete pou��t aboot?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3262,135 +4061,127 @@ msgstr ""
 "Stala se chyba p�i instalaci aboot,\n"
 "m�m se pokusit o instalaci i kdy� to zru�� prvn� odd�l na disku?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Nastaven� Proxy"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "Instalace zav�d�c�ho programu neusp�la. Stala se tato chyba:"
 
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy by m�la b�t http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy by m�la b�t ftp://..."
-
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Dve�e doko��n"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Slab�"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "N�zk�"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "St�edn�"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Vysok�"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoidn�"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "R�zn� ot�zky"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(m��e zp�sobit naru�en� dat)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "M�m pou��t optimalizace hardisku?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Zvolte si �rove� zabezpe�en�"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Pokud t�eba, up�esn�te velikost RAM (nalezeno %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Automatick� p�ipojov�n� m�di�"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Vy�istit /tmp p�i ka�d�m startu"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Povolit v�ce profil�"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "P�i startu zapni Numlock"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
-msgstr "Zadejte velikost pam�ti v Mb"
+msgstr "Zadejte velikost pam�ti v MB"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "P�i vysok� �rovni zabezpe�en� nem��ete pou��t supermount"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX vytvo�� soubory s konfigurac� pro XFree verze 3.3 i 4.0.\n"
-"Standardn� je pou�it server verze 3.3 proto�e funguje na v�ce grafick�ch\n"
-"karet.\n"
-"Chcete rad�ji pou��t XFree 4.0?"
+"Pozor: V T�TO �ROVNI ZABEZPE�EN� NEN� MO�N� SE P�IHL�SIT Z KONZOLE JAKO\n"
+"ROOT! Pokud chcete b�t root, mus�te se nejd��ve p�ihl�sit jako norm�ln�\n"
+"u�ivatel a potom pou��t \"su\". Celkov� neo�ek�vejte, �e budete moct pou��t\n"
+"po��ta� k n��emu jin�mu ne� jako server.\n"
+"Byli jste varov�ni."
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "M�m zkusit naj�t PCI za��zen�?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"Dejte si pozor, zda m�te zapnut� Numlock, proto�e jinak mnoho kl�ves\n"
+"p��e ��sla m�sto p�smen (nap�: p�i stisknut� `p' dostanete `6')"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Pou��t existuj�c� nastaven� pro X11?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "P�ejete si vygenerovat auto instala�n� disketu pro replikaci linuxu?"
+msgstr "P�ejete si vytvo�it auto instala�n� disketu pro replikaci Linuxu?"
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Vlo�te pr�zdnou disketu do mechaniky %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Vytv���m disketu pro automatickou instalaci"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
-"N�kter� kroky nejsou dokon�eny.\n"
-"\n"
-"Chcete nyn� opravdu skon�it?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3402,162 +4193,19 @@ msgid ""
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
-"Gratulujeme, instalace je dokon�ena.\n"
-"Vyjm�te startovac� m�dium a stiskn�te Enter pro spu�t�n� syst�mu.\n"
-"\n"
-"Informace o oprav�ch kter� jsou dostupn� pro tuto verzi Mandrake\n"
-"Linuxu z�sk�te na str�nk�ch dostupn�ch na http://www.linux-mandrake.com/.\n"
-"\n"
-"Informace o spr�v� Va�eho syst�mu je dostupn� v po-instala�n� kapitole\n"
-"Ofici�ln� Mandrake Linux U�ivatelsk� p��ru�ce."
-
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Vyp�n�m po��ta�"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Instaluji ovlada� pro %s kartu %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(modul %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Kter� %s ovlada� bych m�l zkusit?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"Aby mohl ovlada� %s spr�vn� pracovat, pot�ebuje v n�kter�ch p��padech extra\n"
-"informace, p�esto�e v�t�inou funguje i bez nich. Chcete zadat n�jak�\n"
-"dopl�uj�c� parametry, nebo nech�te ovlada� samostatn� prozkoumat V�\n"
-"syst�m? Vyj�me�n� m��e zkoum�n� zhroutit po��ta�, ale nem�lo by to\n"
-"zp�sobit ��dnou �kodu."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Automatick� prozkoum�n�"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Zadat parametry"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Nyn� m��ete zadat dopl�uj�c� parametry modulu %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Nyn� m��ete zadat dopl�uj�c� parametry modulu %s.\n"
-"Informace maj� form�t ``jm�no=hodnota jm�no2=hodnota2 ...''.\n"
-"Nap��klad: ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Dopl�uj�c� parametry:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Nata�en� modulu %s neusp�lo.\n"
-"Chcete to zkusit znovu s jin�mi parametry?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "M�m zkusit naj�t PCMCIA za��zen�?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Nastavuj� PCMCIA karty..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "M�m zkusit naj�t za��zen� %s?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Nalezeno %s %s rozhran�"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "M�te jin�?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "M�te n�jak� %s rozhran�"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Ne"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Ano"
 
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Pod�vejte se do dokumentace k hardware"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Startuji s��"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Ukon�uji pr�ci v s�ti"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Mandrake Linux Instalace %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> p�ep. mezi prvky  | <Space> v�b�r   | <F12> dal�� obraz."
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"Nyn� m��ete rozd�lit V� %s hardisk\n"
-"A� skon��te, nezapome�te ulo�it zm�ny pomoc� `w'"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Pros�m po�kejte"
 
@@ -3567,7 +4215,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Dvojsmyslnost (%s), bu�te p�esn�j��\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "�patn� volba, zkuste to znovu\n"
 
@@ -3581,446 +4229,950 @@ msgstr " ? (standardn� %s) "
 msgid "Your choice? (default %s) "
 msgstr "Va�e volba? (standardn� %s)"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Va�e volba? (standardn� %s; zadejte `none' pro nic) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "�esk�"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "N�meck�"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvo��k"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "�pan�lsk�"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Finsk�"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Francouzsk�"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norsk�"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Polsk�"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Rusk�"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "UK-Britsk�"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "US-Americk�"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Arm�nsk� (star�)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Arm�nsk� (psac� stroj)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Arm�nsk� (foneticky)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "�zerbajd��nsk� (latinka)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "�zerbajd��nsk� (cyrilice)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belgick�"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulharsk�"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazilsk� (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "B�lorusk�"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "�v�carsk� (N�meck� styl)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "�v�carsk� (Francouzsk� styl)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "N�meck� (bez mrtv�ch kl�ves)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "D�nsk�"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvo��k (US)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvo��k (Norsk�)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Estonsk�"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gruz�nsk� (\"Rusk�\" rozlo�en�)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gruz�nsk� (rozlo�en� \"Latin\")"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "�eck�"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Ma�arsk�"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Chorvatsk�"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Izraelsk�"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Izraelsk� (foneticky)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "�r�nsk�"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islandsk�"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Italsk�"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "Japonsk� 106 kl�ves"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Latinsko-Americk�"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Holandsk�"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litevsk� AZERTY (star�)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litevsk� AZERTY (nov�)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litevsk� \"��seln� �ada\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litevsk� \"foneticky\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Polsk� (rozlo�en� QWERTY)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Polsk� (rozlo�en� QWERTZ)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugalsk�"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanadsk� (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Rusk� (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "�v�dsk�"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Slovinsk�"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slovensk�"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Thaisk�"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Tureck� (tradi�n� model \"F\")"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Tureck� (modern� model \"Q\")"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukrajinsk�"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "US (mezin�rodn�)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vietnamsk� \"��seln� �ada\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Jugosl�vsk� (rozlo�en� latin)"
 
-# 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
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - my�"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "Standardn�"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Obecn�"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "Kole�ko"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "s�riov�"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Standardn� t��tla��tkov� My�"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Standardn� t��tla��tkov� My�"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech s�rie CC (s�riov�)"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (s�riov�, star� C7 typ)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Bez my�i"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2 ta��tka"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3 tla��tka"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "��dn�"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Bez my�i"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "Dal�� ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Je to spr�vn�?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Nastaven� Internetu"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Chcete se nyn� pokusit p�ipojit k internetu?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Nastaven� p�ipojen� k internetu"
+
+# ../.vygenerovat ./netconnect.pm_.c:528
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Nep�ipojovat se k internetu"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "P�ipojen� k Internetu / Nastaven� m�stn� s�t�"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "Nastaven� ISDN"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Vyberte si sv�ho poskytovatele internetu.\n"
+" Pokud nen� na seznamu, vyberte si Unlisted"
+
+#: ../../netconnect.pm_.c:158
+msgid "Connection Configuration"
+msgstr "Nastaven� P�ipojen�"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "Pros�m vypl�te nebo zkontrolujte n�sleduj�c� �daje"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "IRQ karty"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "DMA karty"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "IO karty"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "IO_0 karty"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "IO_1 karty"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "Va�e osobn� telefonn� ��slo"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "Jm�no poskytovatele (nap� provider.net)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Tel. ��slo poskytovatele"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "Prim�rn� DNS poskytovatele"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "Sekund�rn� DNS poskytovatele"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "Typ vyt��en�"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "V� ��et (u�ivatelsk� jm�no)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Heslo va�eho ��tu"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Heslo va�eho ��tu (je�t� jednou)"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "Evropa"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Evropa (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "Zbytek sv�ta"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "Zbytek sv�ta - ��dn� D-Channel (leased lines)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "Kter� protokol chcete pou��t?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "Nev�m"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "Jak� typ karty m�te?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "Pokra�ovat"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "P�eru�it"
+
+#: ../../netconnect.pm_.c:245
 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"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
-"Vitejte v LILO, v programu pro start operacniho systemu!\n"
 "\n"
-"Pro seznam voleb stisknete <TAB>.\n"
+"Jestli m�te ISA kartu, m�ly by b�t hodnoty na n�sleduj�c� obrazovce "
+"spr�vn�.\n"
 "\n"
-"Napiste jmeno vybraneho systemu a stisknete <ENTER>, nebo pockejte\n"
-"%d sekund do automatickeho startu.\n"
+"Jestli m�te PCMCIA kartu, mus�te zn�t jej� IRQ a IO.\n"
+
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "Kterou z t�hto ISND karet m�te?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "Na�el jsem ISDN kartu:\n"
+
+#: ../../netconnect.pm_.c:287
+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 ""
+"Na�el jsem ISDN PCI kartu, jej�� typ ale nezn�m. Pros�m zvolte si jednu z "
+"n�sleduj�c�ho seznamu PCI karet."
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr ""
+"Nena�el jsem ��dnou ISDN PCI kartu. Pros�m zvolte si jednu z n�sleduj�c� "
+"nab�dky"
+
+#: ../../netconnect.pm_.c:331
+#, fuzzy
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+"Na Va�em po��ta�i nebyl nalezen ��dn� s��ov� adapt�r. Spus�te pros�m program "
+"pro nastaven� hardware."
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Zvolte s��ov� rozhran�"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Vyberte si pros�m kter� s��ov� adapt�r chcete pou��t pro p�ipojen� k "
+"internetu"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "S��ov� rozhran�"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
+"Do you agree?"
+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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Vitejte v GRUBu, programu na vyber operacniho systemu"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Znovu spust�m s��ov� rozhran�. Souhlas�te ?"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "Pro v�b�r polo�ek pou�ijte kl�vesy %c a %c."
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "Nastaven� ADSL"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Stiskn�te ENTER pro start vybran�ho OS, 'e' pro �pravu"
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "Chcete se automaticky p�ipojovat po startu po��ta�e?"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "startovac�ch parametr�, nebo 'c' pro p��kazovou ��dku."
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "M�m se pokusit naj�t modem?"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Vybran� polo�ka bude automaticky spu�t�na za %d sekund."
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Ke kter�mu s�riov�mu portu je V� modem p�ipojen?"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "nen� dost m�sta v /boot"
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Mo�nosti vyt��en�"
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Desktop"
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Jm�no p�ipojen�"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Nab�dka Start"
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "Telefonn� ��slo"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - my�"
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "P�ihla�ovac� jm�no"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Aplle ADB my� "
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Ov��en�"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB my� (2 tla��tka)"
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB my� (3 nebo v�ce tla��tek)"
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Podle sc�n��e"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB my�"
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Pomoc� termin�lu"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB my� (2 tla��tka)"
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Jm�no dom�ny"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB my� (3 nebo v�ce tla��tek)"
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Prvn� DNS Server"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Standardn� my� (PS/2)"
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Druh� DNS Server"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (PS/2)"
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "P�ipojen� k Internetu / Nastaven� m�stn� s�t�"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Standardn� t��tla��tkov� My� (PS/2)"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "Nastaven� p�ipojen� k internetu"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+# ../.vygenerovat ./netconnect.pm_.c:528
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Nep�ipojovat se k internetu"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+# ../.vygenerovat ./netconnect.pm_.c:528
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Nep�ipojovat se k internetu"
+
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "P�ipojit se k internetu"
+
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Odpojit se od internetu"
+
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Nastaven� p�ipojen� k internetu"
+
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "Nastaven� a p�ipojen� k internetu"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+#, fuzzy
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr "Znovu spust�m s��ov� rozhran�. Souhlas�te ?"
+
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Nastaven� p�ipojen� k internetu"
+
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Nastaven� p�ipojen� k internetu"
+
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Intern� ISDN kartou"
+
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Extern�m modemem"
+
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "P�ipojen� k internetu"
+
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "Jak� je va�e ISDN p�ipojen�?"
+
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Nastaven� p�ipojen� k internetu"
+
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "Francie"
+
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "Ostatn� zem�"
+
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "Ve kter� zemi se nach�z�te?"
+
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "Alcatel modem"
+
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "ECI modemem"
+
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "Pokud je v� adsl modem Alcatel, zvolte Alcatel, jinak zvolte ECI."
+
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "pou��t pppoe"
+
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "nepou��vat pppoe"
+
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"Nejb�n�ji se pro p�ipojen� pomoc� adsl pou��v� dhcp + pppoe.\n"
+"P�esto ale existuj� p�ipojen�, kter� pou��vaj� pouze dhcp. Jestli si nejste "
+"jist�, zvolte 'pou��t pppoe'"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Nastaven� p�ipojen� k internetu"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"Kter�ho dhcp klienta chcete pou��t?\n"
+"Standardn� je dhcpd"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Nastaven� p�ipojen� k internetu"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "Nastaven� m�stn� s�t�"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Nastaven� s�t�"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus Mouse"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Chcete si vyzkou�et nastaven�?"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus Mouse"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "Vypnut� s��ov�ch slu�eb"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus Mouse"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "P�ipojen� k Internetu / Nastaven� m�stn� s�t�"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB my�"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"M�stn� s�� u� byla nastavena.\n"
+"Chcete:"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB my� (3 nebo v�ce tla��tek)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "Jak se chcete p�ipojit k Internetu?"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Bez my�i"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Nastaven� s�t�"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Ver. 2.1A nebo vy��� (s�riov�)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech s�rie CC (s�riov�)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "nebyla nalezena s��ov� karta"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (s�riov�)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Nastavuji s��"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (s�riov�)"
+#: ../../network.pm_.c:274
+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 zadejte Va�e hostname, proto�e ji vy�aduj� n�kter�\n"
+"DHCP servery. Va�e hostname mus� b�t �pln�, jako nap��klad\n"
+"``mybox.mylab.myco.com''."
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (s�riov�)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "Host name"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (s�riov�)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (s�riov�)"
+#: ../../network.pm_.c:302
+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 ""
+"Pros�m zadejte IP nastaven� pro tento po��ta�.\n"
+"Ka�d� polo�ka mus� b�t zad�na jako IP adresa v 'desetinn�' form�\n"
+"(nap��klad 1.2.3.4)."
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (s�riov�)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Nastavuji s��ov� za��zen� %s"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (s�riov�, star� C7 typ)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Automatick� IP"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (s�riov�)"
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "IP adresa"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Standardn� my� (s�riov�)"
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "Maska s�t�"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft kompatibiln� (s�riov�)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Standardn� t��tla��tkov� My� (s�riov�)"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP adresa mus� b�t ve form�tu 1.2.3.4"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (s�riov�)"
+#: ../../network.pm_.c:341
+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 ""
+"Pros�m zadejte Va�i hostname.\n"
+"Va�e hostname mus� b�t �pln�, jako ``mybox.mylab.myco.com''.\n"
+"Pokud pou��v�te br�nu(gateway), m��ete tak� zadat jej� adresu"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Je to spr�vn�?"
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "DNS server"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "Br�na(gateway)"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "Za��zen� br�ny(gateway)"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "Nastaven� proxy"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy by m�la b�t http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy by m�la b�t ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
-msgstr "Nepodporovan� roz���en� diskov� odd�ly"
+msgstr "Roz���en� diskov� odd�ly nejsou na tomto syst�mu podporov�ny"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4030,21 +5182,21 @@ msgstr ""
 "Jedin� �e�en� je p�esunout prim�rn� odd�ly tak, abyste m�li mezeru vedle\n"
 "roz���en�ch odd�l�."
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Chyba p�i �ten� souboru %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Obnova ze souboru %s neusp�la: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "�patn� z�lo�n� soubor"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Chyba p�i zapisov�n� do souboru %s"
@@ -4078,42 +5230,51 @@ msgstr "zaj�mav�"
 msgid "maybe"
 msgstr "mo�n�"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (d�le�it�)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (velmi p�kn�)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (p�kn�)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Uka� m�n�"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Uka� v�ce"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "M�stn� tisk�rna"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "Vzd�len� lpd"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "Vzd�len� tisk�rna"
+
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "Vzd�len� CUPS server"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "Vzd�len� lpd server"
+
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "S��ov� tisk�rna (socket)"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "URI Tiskov�ho Za��zen�"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Detekuji za��zen�..."
@@ -4127,11 +5288,11 @@ msgstr "Otestovat porty"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Tisk�rna typu \"%s\" byla nalezena na "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "M�stn� Tisk�rna"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4139,15 +5300,15 @@ msgstr ""
 "Ke kter�mu za��zen� je Va�e tisk�rna p�ipojena\n"
 "(v�imli jste si �e /dev/lp0 odpov�d� LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Za��zen� Tisk�rny"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Mo�nosti Vzd�len� lpd Tisk�rny"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4157,19 +5318,19 @@ msgstr ""
 "mus�te zadat hostname tiskov�ho serveru a jm�no fronty\n"
 "kam m� b�t pos�l�n tisk."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Vzd�len� hostname"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Vzd�len� fronta"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Mo�nosti SMB (Windows 9x/NT) tisk�rny"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4182,27 +5343,27 @@ msgstr ""
 "hostname) a mo�n� i IP adresu tiskov�ho serveru, jm�no sd�len� tisk�rny,\n"
 "vhodn� u�ivatelsk� jm�no, heslo a informace o pracovn� skupin�."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "Hostname SMB serveru"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP SMB serveru"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Sd�len� jm�no"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Pracovn� skupina"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "Mo�nosti NetWare Tisk�rny"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4211,133 +5372,157 @@ msgid ""
 msgstr ""
 "Abyste mohli tisknout na NetWare tisk�rn�, mus�te zadat jm�no NetWare\n"
 "serveru (Pozor! To m��e b�t odli�n� od jeho TCP/IP hostname!), jm�no\n"
-"tiskov� fronty tisk�rny kterou chcete pou��vat a vhodn� u�ivatelsk�\n"
+"tiskov� fronty tisk�rny kterou chcete pou��vat a u�ivatelsk�\n"
 "jm�no a heslo."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Tiskov� Server"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Jm�no Tiskov� Fronty"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "Mo�nosti Soketov� Tisk�rny"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"Abyste mohli tisknout na soketov� tisk�rn�, mus�te zadat\n"
+"hostname tisk�rny a voliteln� i ��slo portu."
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "Hostname tisk�rny"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr "S CUPS m��ete p��mo zadat URI pro p��stup k tisk�rn�."
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Jak� typ tisk�rny m�te?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Chcete vyzkou�et tisk?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Tisknu testovac� str�nku(ky)"
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"Zku�ebn� tisk byl posl�n tiskov�mu d�monu.\n"
+"M��e chvilku trvat ne� za�ne tisk.\n"
+"Stav tisku:\n"
+"%s\n"
+"\n"
+"Prob�hl tisk spr�vn� ?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"Zku�ebn� tisk byl posl�n tiskov�mu d�monu.\n"
+"M��e chvilku trvat ne� za�ne tisk.\n"
+"Prob�hl tisk spr�vn� ?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Ano, vytiskni testovac� ASCII str�nku"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Ano, vytiskni Postskriptovou testovac� str�nku"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Ano, vytiskni ob� testovac� str�nky"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Nastaven� Tisk�rny"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Jak� typ tisk�rny m�te?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Mo�nosti tisk�rny"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Velikost Pap�ru"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Vysunout pap�r po tisku?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Mo�nosti Uniprint ovlada�e"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Mo�nosti Barevn� hloubky"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Tisknout text jako PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Tisknout odzadu"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Opravovat schodovit� text?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Po�et str�nek na jeden vyti�t�n� list"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Prav�/Lev� okraj v bodech (1/72 palce)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Horn�/Doln� okraj v bodech (1/72 palce)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Extra mo�nosti GhostScriptu"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Speci�ln� textov� mo�nosti"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Chcete vyzkou�et ti�t�n�?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Tisknu testovac� str�nku(ky)"
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"Zku�ebn� tisk byl posl�n tiskov�mu d�monu.\n"
-"M��e chvilku trvat ne� za�ne tisk.\n"
-"Stav tisku:\n"
-"%s\n"
-"\n"
-"Prob�hl tisk spr�vn� ?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"Zku�ebn� tisk byl posl�n tiskov�mu d�monu.\n"
-"M��e chvilku trvat ne� za�ne tisk.\n"
-"Prob�hl tisk spr�vn� ?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Tisk�rna"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Cht�li byste nastavit tisk�rnu?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4345,19 +5530,67 @@ msgstr ""
 "Zde jsou tiskov� fronty.\n"
 "M��ete p�idat dal�� nebo zm�nit st�vaj�c�."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "Odhaduji"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Zvolte p�ipojen� tisk�rny"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Jak je tisk�rna p�ipojena?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "Zvolte p�ipojen� vzd�len� tisk�rny"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+"V p��pad� CUPS serveru nemus�te p��mo nastavovat tisk�rny,\n"
+"ty budou automaticky detekov�ny.\n"
+"Pokud si nejste jist�, zvolte \"Vzd�len� CUPS server\"."
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Odebrat frontu"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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� tisk�rna mus� m�t jm�no (nap�. lp).\n"
+"Ostatn� parametry jako je popis tisk�rny, nebo jej� um�st�n�\n"
+"mohou tak� b�t definov�ny. Jak� m� b�t pou�ito jm�no pro tuto\n"
+"tisk�rnu a jak je tak tisk�rna p�ipojena?"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "Jm�no tisk�rny"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "Popis"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "Um�st�n�"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4368,45 +5601,45 @@ msgstr ""
 "jm�no (�asto lp) a vlastn� (spool) adres��. Jak� jm�no a adres��\n"
 "m� b�t pou�it pro tuto frontu, a jak je tisk�rna p�ipojena ?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Jm�no fronty"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Spool adres��"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "P�ipojen� tisk�rny"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Nem��u p�idat odd�l do _naform�tovan�ho_ RAID md%d"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Nem��u zapsat soubor $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid neusp�l"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid neusp�l (mo�n�, �e chyb� raidtools?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Nen� dostatek odd�l� pro RAID �rovn� %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron - spou�t� opakuj�c� se akce"
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4414,7 +5647,7 @@ msgstr ""
 "apmd je pou��v�n pro sledov�n� stavu baterie a zaznamen�v�n� p�es syslog.\n"
 "M��e tak� b�t pou�it pro vypnut� po��ta�e p�i vybit� baterii."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4422,18 +5655,18 @@ msgstr ""
 "Spou�t� p��kazy napl�novan� p��kazem na ur�it� �as p��kazem 'at'.\n"
 "Tak� spou�t� p��kazy p�i n�zk�m vyt��en� syst�mu."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 je standardn� UNIXov� program kter� spou�t� u�ivatelem zadan� programy\n"
+"cron je standardn� Unixov� program kter� spou�t� u�ivatelem zadan� programy\n"
 "v p�edem definovan�ch intervalech. vixie cron m� nav�c mnoho vlastnost�,\n"
 "v�etn� vy��� bezpe�nosti a v�ce mo�nost� nastaven�."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4444,13 +5677,13 @@ msgstr ""
 "Commander).\n"
 "M��e tak� v konzoli prov�d�t operace 'vyjmi' a 'vlo�' a ovl�dat pop-up menu."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
 msgstr "Apache je WWW server. Je pou��v�n k poskytov�n� HTML a CGI soubor�."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4464,7 +5697,7 @@ msgstr ""
 "telnetu, ftp, rsh a rlogin. Pokud vypnete inetd, vypnete t�m i ostatn�\n"
 "slu�by kter� spou�t�."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4473,7 +5706,7 @@ msgstr ""
 "Tento bal��ek nahraje zvolenou mapu kl�vesnice (v /etc/sysconfig/keyboard).\n"
 "Pro v�t�inu po��ta�� byste ho m�li nechat zapnut�."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4481,7 +5714,7 @@ msgstr ""
 "lpd je tiskov� d�mon, bez kter�ho nebude fungovat lpr (program pro tisk).\n"
 "Je to server kter� pos�l� ti�t�n� dokumenty jednotliv�m tisk�rn�m."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4489,7 +5722,7 @@ msgstr ""
 "named (BIND) je DNS server, kter� p�ekl�d� hostitelsk� jm�na (hostnames) na\n"
 "IP adresy."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4498,7 +5731,7 @@ msgstr ""
 "(NCP)\n"
 "p��pojn� body (mount points)."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4506,7 +5739,7 @@ msgstr ""
 "Aktivuje a Deaktivuje v�echny s��ov� rozhran� kter� maj� nastartovat p�i\n"
 "startu syst�mu."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4515,7 +5748,7 @@ msgstr ""
 "NFS je obl�ben� protokol pro sd�len� soubor� p�es s�t� TCP/IP.\n"
 "Tato slu�ba poskytuje NFS server, jeho� nastaven� je v /etc/exports."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4523,7 +5756,7 @@ msgstr ""
 "NFS je obl�ben� protokol pro sd�len� soubor� p�es s�t� TCP/IP.\n"
 "Tato slu�ba poskytuje mo�nost uzamyk�n� soubor� na NFS."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4535,7 +5768,7 @@ msgstr ""
 "probl�m\n"
 "j� m�t nainstalovanou i na po��ta��ch, kter� ji nepot�ebuj�."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4546,13 +5779,13 @@ msgstr ""
 "a NIS. portmap sever mus� b�t spu�t�n na po��ta��ch, kter� funguj� jako\n"
 "servery pro protokoly, kter� pou��vaj� mechanismus RPC."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr "Postfix je program pro doru�ov�n� po�ty z jednoho po��ta�e na jin�."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4560,7 +5793,7 @@ msgstr ""
 "Ukl�d� a obnovuje 'stav entropie' na po��ta�i, co� je pou��v�no pro\n"
 "kvalitn�j�� generaci n�hodn�ch ��sel."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4571,7 +5804,7 @@ msgstr ""
 "pro IP adresy. K tomu pou��v� protokol RIP. Zat�mco RIP je b�n� pou��v�n\n"
 "v mal�ch s�t�ch, pro slo�it�j�� s�t� je zapot�eb� slo�it�j�� protokoly."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4579,7 +5812,7 @@ msgstr ""
 "Protokol rstat umo��uje u�ivatel�m s�t� sledovat vyt��en� jednotliv�ch\n"
 "stroj� p�ipojen�ch k s�ti."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4587,7 +5820,7 @@ msgstr ""
 "Protokol rusers umo��uje u�ivatel�m s�t� zjistit kdo je p�ihl�en na\n"
 "jin�m po��ta�i."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4596,7 +5829,7 @@ msgstr ""
 "v�ech u�ivatel� p�ihl�en�ch na po��ta�i s d�monem rwho (je to podobn�\n"
 "slu�b� finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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."
@@ -4605,53 +5838,212 @@ msgstr ""
 "syst�mov�ch\n"
 "log soubor�. Je dobr� m�t spu�t�n� syslog."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr "Tento startovac� skript se pokus� nahr�t moduly pro Va�i USB my�."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "Startuje a ukon�uje Font Server pro grafick� rozhran�"
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Zvolte si kter� slu�by by m�li b�t automaticky spu�t�ny p�i startu"
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Vitejte v SILO, v programu pro zvoleni operacniho systemu!\n"
-"\n"
-"Pro seznam moznych voleb stisknete <TAB>.\n"
-"\n"
-"Napiste jmeno vybraneho systemu a stisknete <ENTER>, nebo pockejte\n"
-"%d sekund do automatickeho startu.\n"
-"\n"
+"Nem��u p�e��st Va�i tabulku odd�l�, mo�n� je p��li� naru�en� :(\n"
+"Pokus�m se pokra�ovat v �i�t�n� �patn�ch odd�l�"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Nastaven� LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Vytvo�en� startovac� diskety"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Form�tov�n� diskety"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Volba"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "Instalace LILO neusp�la. Stala se tato chyba:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Sd�len� Internetov�ho p�ipojen� je zapnuto"
+
+#: ../../standalone/drakgw_.c:104
+#, fuzzy
+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 "Internetov� sd�len� u� bylo nastaveno.\n"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Tabulka"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Nastaven� X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Sd�len� Internetov�ho p�ipojen� je vypnuto"
+
+#: ../../standalone/drakgw_.c:123
+#, fuzzy
+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 "Internetov� sd�len� u� bylo nastaveno.\n"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Tabulka"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "Nepochopil jsem obsah souboru s nastaven�m."
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "Sd�len� Internetov�ho P�ipojen�"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Typ vyt��en�"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "Na Va�em syst�mu nen� ��dn� s��ov� adapt�r!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Na Va�em po��ta�i nebyl nalezen ��dn� s��ov� adapt�r. Spus�te pros�m program "
+"pro nastaven� hardware."
+
+#: ../../standalone/drakgw_.c:218
+#, fuzzy
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"Na va�em syst�mu je nastaveno pouze jedno s��ov� rozhran�:\n"
+"\n"
+"$interface\n"
+"\n"
+"Cht�li byste na tomto adapt�ru pou��vat internet?"
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr "Pros�m zvolte si ke kter�mu s��ov�mu adapt�ru bude p�ipojena LAN."
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"Pozor, s��ov� adapt�r je u� nastaven.\n"
+"Chcete ho p�esto nastavit znovu?"
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr "Na�el jsem mo�n� konflikt v sou�asn�m nastaven� $_\n"
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "Na�el jsem existuj�c� nastaven� firewallu!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+"Varov�n�! Bylo nalezeno existuj�c� nastaven� firewallu. Po instalaci m��e "
+"b�t zapot�eb� n�jak� ru�n� �prava. M�m pokra�ovat?"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "Nastavuji skripty, instaluji software, startuji servery..."
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Nastavuji IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "Nem��u pomoc� urpmi nainstalovat ipchains RPM."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "Nem��u pomoc� urpmi nainstalovat dhcp RPM."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "Nem��u pomoc� urpmi nainstalovat linuxconf RPM."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "Nem��u pomoc� urpmi nainstalovat bind RPM."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "Nem��u pomoc� urpmi nainstalovat nameserver RPM."
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Gratuluji!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4660,7 +6052,7 @@ msgid ""
 msgstr ""
 "Tato �rove� mus� b�t pou�ita s rozmyslem. Sice m��ete snadn�ji pou��vat "
 "sv�j\n"
-"syst�m, ale na druhou stranu je velmi citliv�. Nem��e potom b�t pou�it pro\n"
+"syst�m, ale na druhou stranu je velmi citliv�: Nesm� b�t pou�it pro\n"
 "po��ta� p�ipojen� k Internetu. Pro p�ihl�en� nen� zapot�eb� ��dn� heslo."
 
 #: ../../standalone/draksec_.c:31
@@ -4712,23 +6104,36 @@ msgstr "�rove� zabezpe�en�"
 msgid "Choose the tool you want to use"
 msgstr "Zvolte si n�stroj, kter� chcete pou��t"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Jak� je rozlo�en� Va�� kl�vesnice?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Zm�nit Rozli�en�"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Jak� je typ Va�� my�i?"
+#: ../../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 ""
+"Vym��te pros�m CD!\n"
+"\n"
+"Pros�m vlo�te CD ozna�en� \"%s\" do mechaniky a stiskn�te Ok.\n"
+"\n"
+"Pokud toto CD nem�te stiskn�te Zru�it a toto CD nebude nainstalov�no."
+
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "nebylo nalezeno serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Emulovat t�et� tla��tko?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Ke kter�mu s�riov�mu portu je p�ipojena Va�e my�?"
 
@@ -4941,249 +6346,825 @@ msgstr "Hled�m v�tve"
 msgid "Finding leaves takes some time"
 msgstr "Hled�n� v�tv� m��e chv�li trvat"
 
-#~ msgid "useless"
-#~ msgstr "nepou�iteln�"
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Nastaven� Internetu"
+
+#, fuzzy
+msgid "Internet"
+msgstr "zaj�mav�"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Office"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multim�dia"
+
+msgid "KDE"
+msgstr "KDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multim�dia"
 
-#~ msgid "garbage"
-#~ msgstr "odpad"
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Dokumentace"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Zadejte velikost kterou chcete pro nainstalovan� syst�m"
+
+#~ msgid "Total size: "
+#~ msgstr "Celkov� velikost: "
+
+#~ msgid "Reconfigure local network"
+#~ msgstr "Op�tovn� nastaven� m�stn� s�t�"
 
 #~ 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 Linux."
+#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "\n"
 #~ msgstr ""
-#~ "Na Va�em po��ta�i byli nalezeny n�jak� true type fonty z instalace Windows.\n"
-#~ "Chcete je pou��vat? Ujist�te se, �e m�te pr�va pro jejich pou��v�n�\n"
-#~ "v Linuxu."
+#~ "V� po��ta� byl nastaven pro sd�len� sv�ho p�ipojen� k internetu.\n"
+#~ "\n"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "V�e bylo nastaveno.\n"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "P�ipojit se k internetu norm�ln�m modemem"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "P�ipojit se k internetu pomoc� ISDN"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "P�ipojit se k internetu pomoc� DSL (nebo ADSL)"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "P�ipojit se internetu p�es kabelovou televize"
+
+#~ msgid ""
+#~ "Time (secs) of inactivity after which\n"
+#~ "it hangs up. (leave blank to disable it)"
+#~ msgstr ""
+#~ "�as (v sekund�ch) po kter�m p�i ne�innosti\n"
+#~ "modem s�m zav�s�. (pokud si to nep�ejete, nic nepi�te)"
+
+#~ msgid "Germany"
+#~ msgstr "N�mecko"
+
+#~ msgid "Germany (1TR6)"
+#~ msgstr "N�meck� (1TR6)"
+
+#~ msgid "What do you wish to do?"
+#~ msgstr "Co chcete d�lat?"
+
+#~ msgid "Install/Rescue"
+#~ msgstr "Instaluj/Zachra�"
+
+#~ msgid "Rescue"
+#~ msgstr "Z�chrana"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Kter� typ odd�lu chcete?"
 
 #~ msgid ""
-#~ "Choose \"Install\" if there are no previous versions of Linux\n"
+#~ "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 already "
+#~ "installed.\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)."
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
 #~ msgstr ""
 #~ "Zvolte \"Instalace\" pokud nem�te ��dnou p�edchoz� verzi Linuxu "
 #~ "nainstalovanou,\n"
 #~ "nebo pokud si p�ejete pou��vat v�ce distribuc� nebo verz� najednou.\n"
 #~ "\n"
+#~ "Zvolte \"Rescue\" jestli�e si p�ejete zachr�nit/obnovit p�edchoz� verzi\n"
+#~ "Mandrake Linuxu.\n"
 #~ "\n"
-#~ "Zvolte \"Upgrade\" jestli�e si p�ejete p�einstalovat st�vaj�c� verzi\n"
-#~ "Mandrake Linuxu: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus)\n"
-#~ "6.1 (Helios), Gold 2000 nebo 7.0 (Air)."
-
-#~ msgid "Recommended"
-#~ msgstr "Doporu�en�"
-
-#~ msgid "Do you want to use LILO?"
-#~ msgstr "Chcete pou��t LILO?"
+#~ "\n"
+#~ "Vyberte si:\n"
+#~ "\n"
+#~ "  - Doporu�en�: To je ta prav� volba, jestli�e jste nikdy d��ve\n"
+#~ "    neinstalovali Linux.\n"
+#~ "\n"
+#~ "  - Vlastn�: Jestli�e zn�te Linux, budete si moct vybrat typick� pou�it�\n"
+#~ "    nainstalovan�ho syst�mu. Detaily jsou pops�ny n��e.\n"
+#~ "\n"
+#~ "  - Expert: Jestli�e jste dob�e obezn�meni s GNU/Linuxem a chcete prov�st\n"
+#~ "    precizn� nastaven� instalace, je pr�v� pro V�s tato volba. Budete si\n"
+#~ "    moct vybrat typick� pou�it� Va�eho syst�mu stejn� jako v p��pad�\n"
+#~ "    \"Vlastn�\" instalace.\n"
+#~ "    Pros�m nevolte tuto instalaci JESTLI�E NEV�TE P�ESN� CO D�L�TE!\n"
 
 #~ msgid ""
-#~ "You may now select the packages you wish to install.\n"
+#~ "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"
 #~ "\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"
+#~ "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"
 #~ "\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 ""
-#~ "Nyn� si m��ete vybrat bal��ky, kter� si p�ejete nainstalovat.\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"
 #~ "\n"
 #~ "\n"
-#~ "Nejprve si m��ete zvolit velikost Va�eho nainstalovan�ho syst�mu, potom "
-#~ "bude\n"
-#~ "proveden automatick� v�b�r bal��k� podle typick�ho pou�it�. Potom si\n"
-#~ "m��ete vybrat dal�� skupiny bal��k�, nebo klepnout na Ok pro zachov�n�\n"
-#~ "p�vodn�ho v�b�ru.\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"
 #~ "\n"
 #~ "\n"
-#~ "Pokud jste v re�imu \"expert\", m��ete si vyb�rat jednotliv� bal��ky.\n"
-#~ "Pros�m pov�imn�te si, �e n�kter� bal��ky vy�aduj� instalaci jin�ch.\n"
-#~ "Takov�to bal��ky jsou ozna�ov�ny jako z�vislosti bal��ku. Bal��ky kter�\n"
-#~ "vyberete a bal��ky kter� jsou zapot�eb� budou automaticky zvoleny pro\n"
-#~ "instalaci. Je nemo�n� nainstalovat bal��ek bez instalace v�ech jeho\n"
-#~ "z�vislost�."
-
-#~ 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"
+#~ "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"
+#~ "\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 want that everybody could access at one of them, you can "
-#~ "remove\n"
-#~ "it now (a boot disk will be needed to boot it)."
+#~ "- Ctrl-m  to set the mount point\n"
 #~ msgstr ""
-#~ "LILO (LInux LOader - zavad�� Linuxu), m��e spou�t�t Linux i jin� opera�n�\n"
-#~ "syst�my. Norm�ln� jsou tyto syst�my detekov�ny p�i instalaci. Pokud je ale\n"
-#~ "nevid�te detekovan�, m��ete je nyn� p�idat sami.\n"
+#~ "Pokud ji� m�te vytvo�en� diskov� odd�ly (od p�edchoz� instalace Linuxu, "
+#~ "nebo\n"
+#~ "pomoc� jin�ho programu), m��ete si zvolit kter� z nich pou�ijete pro "
+#~ "instalaci\n"
+#~ "Mandrake Linuxu. Pokud tyto odd�ly je�t� nem�te, mus�te je nejprve "
+#~ "vytvo�it.\n"
+#~ "To znamen� logicky rozd�lit kapacitu hardisku na v�ce ��st�.\n"
+#~ "\n"
+#~ "Jestli�e mus�te vytvo�it nov� odd�ly, pou�ijte tla��tko \"Automaticky "
+#~ "vyhradit\"\n"
+#~ "pro automatick� vytvo�en� odd�l� pro Linux. Disk pro rozd�len� si m��ete "
+#~ "vybrat\n"
+#~ "klepnut�m na jeho symbol. \"hda\" znamen� prvn� IDE hardisk, \"hdb\" je "
+#~ "druh�,\n"
+#~ "\"sda\" je prvn� SCSI disk, a tak d�le.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dva odd�ly kter� se obvykle vytv��� jsou: ko�enov� odd�l (/), co� je "
+#~ "za��tek\n"
+#~ "stromov� struktury soubor�, a /boot, kter� obsahuje v�echny soubory "
+#~ "pot�ebn�\n"
+#~ "ke startu syst�mu po zapnut� po��ta�e.\n"
+#~ "\n"
 #~ "\n"
+#~ "Rozd�lov�n� disku m��e b�t pro nezku�en�ho u�ivatele stresuj�c�, proto�e\n"
+#~ "n�sledky jsou obvykle nezvratn�. DiskDrake tento proces zjednodu�uje.\n"
+#~ "Ne� budete pokra�ovat, prostudujte si dokumentaci a nechte si v�e proj�t\n"
+#~ "hlavou.\n"
 #~ "\n"
-#~ "Jestli nechcete aby kdokoliv mohl spustit ur�it� syst�m, m��ete ho nyn�\n"
-#~ "odebrat (pro jeho nastartov�n� bude zapot�eb� startovac� disketa)."
+#~ "Ve�ker� operace lze prov�d�t i pomoc� kl�vesnice:\n"
+#~ "Po jednotliv�ch odd�lech se m��ete pohybovat pomoc� kl�vesy Tab a �ipek\n"
+#~ "Nahoru/Dolu.\n"
+#~ " - Ctrl-c vytvo�� nov� odd�l (pokud je zvolen� pr�zdn� odd�l)\n"
+#~ " - Ctrl-d sma�e odd�l\n"
+#~ " - Ctrl-m slou�� k p�i�azen� p��pojn�ho bodu vybran�mu odd�lu\n"
 
 #~ 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."
+#~ "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."
 #~ msgstr ""
-#~ "Nyn� kdy� jste si vybrali kter� skupiny aplikac� chcete,\n"
-#~ "zvolte si pros�m kolik bal��k� byste r�di nainstalovali\n"
-#~ "(od minim�ln� do pln� instalace zvolen� skupiny)."
+#~ "V�echny diskov� odd�ly kter� byly nov� vytvo�eny mus� b�t naform�tov�ny aby\n"
+#~ "mohly b�t pou��v�ny (form�tov�n� znamen� vytv��en� souborov�ho syst�mu).\n"
+#~ "Tak� si m��ete p��t p�eform�tovat n�kter� u� existuj�c� odd�ly aby z nich\n"
+#~ "byla odstran�na data. Pozn�mka: nen� nutn� p�eform�tov�vat u� existuj�c�\n"
+#~ "diskov� odd�ly, obzvl�t� pokud obsahuj� soubory nebo data kter� si p�ejete\n"
+#~ "zachovat. Typicky zachov�van� jsou /home a /usr/local."
 
 #~ 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"
+#~ "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."
 #~ msgstr ""
-#~ "Pro plnou instalaci vybran�ch skupin je zapot�eb� %dMB m�sta na disku.\n"
-#~ "M��ete pokra�ovat, ale pozor, nebudou nainstalov�ny v�echny bal��ky."
+#~ "Vybran� bal��ky se nyn� budou instalovat. Tato operace m��e trvat\n"
+#~ "p�r minut jestli�e jste si nezvolili p�einstalov�n� existuj�c�ho\n"
+#~ "syt�mu. V tomto p��pad� m��e trvat del�� dobu ne� za�ne\n"
+#~ "p�einstalov�v�n�."
 
-#~ msgid "Choose other CD to install"
-#~ msgstr "Vyberte si jin� CD pro instalaci"
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Jestli�e DrakX neusp�l p�i detekci my�i, nebo jestli�e si chcete ov��it\n"
+#~ "co detekoval, bude V�m p�elo�en seznam my��.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jestli�e souhlas�te s nastaven�m, sta�� klepnout na 'Ok'. Pokud budete\n"
+#~ "cht�t pou�� jin� ovlada�, mus�te si ho vybrat z v��e uveden�ho seznamu.\n"
+#~ "Je dobr� si vybrat ovlada� k my�i, kter� je typov� nejbl��e k t� Va��.\n"
+#~ "\n"
+#~ "\n"
+#~ "V p��pad� my�i na s�riov� lince budete tak� muset zadat ke kter�mu\n"
+#~ "s�riov�mu portu je p�ipojena."
 
 #~ msgid ""
-#~ "(a user ``mandrake'' with password ``mandrake'' has been automatically added)"
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
 #~ msgstr ""
-#~ "(automaticky byl p�id�n u�ivatel ``mandrake'' s heslem ``mandrake'')"
+#~ "Tento odd�l je v�nov�n nastaven� m�stn� s�t� (LAN) nebo modemu.\n"
+#~ "\n"
+#~ "Zvolte si \"M�stn� LAN\" a DrakX se na Va�em po��ta�i pokus� naj�t\n"
+#~ "Ethernet adapt�r. PCI adapt�ry by m�ly b�t nalezeny a inicializov�ny\n"
+#~ "automaticky. Pokud je ale Va�e karta ISA, nebude autodetekce fungovat,\n"
+#~ "a budete si muset zvolit ovlada� ze seznamu kter� se pak objev�.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jako u SCSI adapt�r�, m��ete nejprve nechat ovlada� prozkoumat adapt�ry,\n"
+#~ "a p��padn� potom zadat vlastn� nastaven�, kter� z�sk�te z Windowsov�ho\n"
+#~ "ovl�dac�ho panelu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jestli�e instalujete Mandrake Linux na po��ta�i kter� je ��st� u�\n"
+#~ "existuj�c� s�t�, jej� spr�vce V�m sd�l� ve�ker� pot�ebn� informace\n"
+#~ "(IP adresu, s��ovou masku - netmask, a hostname). Jestli�e si\n"
+#~ "z�izujete soukromou s��, nap��klad doma, m�li byste si zvolit\n"
+#~ "adresu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Zvolte si \"P�ipojen� modemem\" pro spojen� s Internetem pomoc� modemu\n"
+#~ "DrakX se pokus� naj�t V� modem, pokud toto sel�e vyberete si s�riov� port\n"
+#~ "kde je V� modem p�ipojen�."
 
 #~ msgid ""
-#~ "Select:\n"
+#~ "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"
+#~ "\n"
 #~ "\n"
-#~ "  - Recommended: If you have never installed Linux before.\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"
 #~ "\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"
+#~ "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"
 #~ "\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\"."
+#~ "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."
 #~ msgstr ""
-#~ "Vyberte si:\n"
-#~ "  - Doporu�en�: Jestli�e jste nikdy p�edt�m neinstalovali Linux.\n"
+#~ "GNU/Linux si rozum� s mnoha typy tisk�ren. Ka�d� tento typ vy�aduje\n"
+#~ "jin� nastaven�. Pozn.: Tiskov� fronta standardn� pou��v� n�zev 'lp'. Pokud\n"
+#~ "byste r�di p�i�adili tisk�rn� dal��, smyslupln�j�� jm�no, m��ete to u�init\n"
+#~ "pomoc� odd�lova�e '|'. Jm�no tisk�rny tedy bude t�eba \"Moje "
+#~ "tisk�rna|lp0|lp\".\n"
+#~ "Prvn� alias (\"Moje tisk�rna\") bude pou�it pro ikonu, sambu, atd. Pro\n"
+#~ "p��kazovou ��dku bude nejsnaz�� pou��t jm�no \"lp0\", a proto�e m� tisk�rna\n"
+#~ "i alias \"lp\", bude pou�ita jako standardn�.\n"
 #~ "\n"
 #~ "\n"
-#~ "  - Vlastn�: Jestli�e zn�te Linux, budete si moct vybrat typick� pou�it�\n"
-#~ "nainstalovan�ho syst�mu mezi Norm�ln�m (Normal), V�vojov� (Development) \n"
-#~ "nebo Server. Zvolte \"Norm�ln�\" pro v�eobecn� pou�it� va�eho po��ta�e.\n"
-#~ "Jestli�e budete po��ta� p�ev�n� pou��vat pro v�voj software zvolte\n"
-#~ "\"V�vojov�\", nebo zvolte \"Server\" jestli�e si p�ejete nainstalovat\n"
-#~ "obecn� server (pro po�tu, ti�t�n� ...).\n"
+#~ "Jestli�e je Va�e tisk�rna p��mo p�ipojen� k Va�emu po��ta�i, vyberte\n"
+#~ "\"M�stn� tisk�rna\". Potom zad�te ke kter�mu portu je tisk�rna p�ipojena\n"
+#~ "a vyberete pro ni filtr(ovlada�).\n"
 #~ "\n"
 #~ "\n"
-#~ "  - Expert: Jestli�e jste dob�e obezn�meni s GNU/Linuxem a chcete prov�st\n"
-#~ "precizn� nastaven� instalace, je pr�v� pro V�s tato volba. Budete si moci\n"
-#~ "vybrat typick� pou�it� Va�eho syst�mu stejn� jako v p��pad� \"Vlastn�\"\n"
-#~ "instalace."
+#~ "Jestli�e chcete pracovat s tisk�rnou um�st�nou na vzd�len�m Unixov�m\n"
+#~ "stroji, vyberte si \"Vzd�len� lpd\". Abyste ji mohli pou��vat nen�\n"
+#~ "zapot�eb� ��dn� u�ivatelsk� jm�no ani heslo, ale pot�ebujete v�d�t\n"
+#~ "jm�no tiskov� fronty na vzd�len�m serveru.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jestli�e chcete pracovat s SMB tisk�rnu (co� znamen� tisk�rna um�st�n�\n"
+#~ "na vzd�len�m Windows9x/NT stroji), budete muset zadat jej� SMB jm�no\n"
+#~ "(co� nen� jej� TCP/IP jm�no), a pop��pad� jej� IP adresu, u�ivatelsk�\n"
+#~ "jm�no, pracovn� skupinu a heslo pro p��stup na tuto tisk�rnu. A samoz�ejm�\n"
+#~ "jm�no tisk�rny. To sam� plat� pro NetWare tisk�rnu, krom� toho, �e\n"
+#~ "nepot�ebujete informaci o pracovn� skupin�."
+
+#~ 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."
+#~ msgstr ""
+#~ "Doporu�uji V�m, odpov�zte \"Ano\". Pokud budete pozd�ji instalovat "
+#~ "Microsoft\n"
+#~ "Windows, bude boot sektor p�eps�n. Pokud nem�te vytvo�en� startovac� disk,\n"
+#~ "u� se nebudete moct do sv�ho GNU/Linuxu tak snadno dostat."
+
+#~ msgid "Move your wheel!"
+#~ msgstr "Pohn�te kole�kem, pros�m"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Zru�it zm�ny?"
+
+#~ msgid "Cable connection"
+#~ msgstr "P�ipojen� p�es kabelovou televizi"
+
+#~ msgid "Host name:"
+#~ msgstr "Hostname:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Jak� je typ Va�� my�i?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Automatick� nastaven� rozli�en�"
+
+#~ 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"
+#~ msgstr ""
+#~ "Abych na�el dostupn� rozli�en�, budu je muset vyzkou�et.\n"
+#~ "Va�e obrazovka bude po tu dobu blikat ...\n"
+#~ "Jestli chcete, m��ete vypnout monitor. Po ukon�en� test� usly��te p�pnut�."
+
+#~ 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?"
+#~ msgstr ""
+#~ "M��u se pokusit naj�t dostupn� rozli�en� (nap�. 800x600),\n"
+#~ "nicm�n� m��e se st�t, �e se p�i tom po��ta� zamrzne.\n"
+#~ "M�m zkusit naj�t dostupn� rozli�en�?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Nepoda�ilo se mi naj�t ��dn� dostupn� rozli�en�\n"
+#~ "Zkuste nastavit jinou videokartu, nebo monitor"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Automatick� vyhled�v�n� rozli�en�"
+
+#~ msgid "dhcpd"
+#~ msgstr "dhcpd"
 
-#~ msgid "Help"
-#~ msgstr "N�pov�da"
+#~ msgid "pump"
+#~ msgstr "pump"
 
-#~ msgid "Downloading cryptographic packages"
-#~ msgstr "Stahuji �ifrovac� bal��ky"
+#~ msgid "dhcpxd"
+#~ msgstr "dhcpxd"
 
-#~ msgid "Setup SCSI"
-#~ msgstr "Nastaven� SCSI"
+#~ msgid "dhcp-client"
+#~ msgstr "dhcp-client"
 
-#~ msgid "Installation CD Nr %s"
-#~ msgstr "Instalace CD �. %s"
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Aplle ADB my� "
 
-#~ msgid "Which language do you want?"
-#~ msgstr "Kter� jazykem chcete komunikovat?"
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB my� (2 tla��tka)"
 
-#~ msgid "Hurt me plenty"
-#~ msgstr "Hurt me plenty"
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB my� (3 nebo v�ce tla��tek)"
 
-#~ msgid "Which usage do you want?"
-#~ msgstr "Jak budete pou��vat po��ta�?"
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB my�"
 
-#~ msgid "Which packages do you want to install"
-#~ msgstr "Vyberte si bal��ky kter� chcete nainstalovat"
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB my� (2 tla��tka)"
 
-#~ msgid "Local LAN"
-#~ msgstr "M�stn� LAN"
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB my� (3 nebo v�ce tla��tek)"
 
-#~ msgid "Dialup with modem"
-#~ msgstr "P�ipojen� modemem"
+#~ msgid "Generic Mouse"
+#~ msgstr "Standardn� my�"
 
-#~ msgid "Installation CD Nr 1"
-#~ msgstr "Instala�n� CD �. 1"
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
 
-#~ msgid "Bad kickstart file %s (failed %s)"
-#~ msgstr "�patn� kickstart soubor (automatick� instalace) %s (neusp�l %s)"
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
 
-#~ msgid "Size: %s MB"
-#~ msgstr "Velikost: %s MB"
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus Mouse"
 
-#~ msgid "US Keyboard"
-#~ msgstr "US kl�vesnice"
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Bus Mouse"
 
-#~ msgid "resizing"
-#~ msgstr "m�n�m velikost"
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech Bus Mouse"
 
-#~ msgid "formatting"
-#~ msgstr "form�tuji"
+#~ msgid "USB Mouse"
+#~ msgstr "USB my�"
 
-#~ msgid "changing type of"
-#~ msgstr "m�n�m typ"
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB my� (3 nebo v�ce tla��tek)"
 
-#~ msgid "After %s partition %s,"
-#~ msgstr "Po %s odd�lu %s "
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Ver. 2.1A nebo vy��� (s�riov�)"
 
-#~ msgid "linear"
-#~ msgstr "line�rn�"
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (s�riov�)"
 
-#~ msgid "Linear (needed for some SCSI drives)"
-#~ msgstr "Line�rn� (je zapot�eb� pro n�kter� SCSI za��zen�)"
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (s�riov�)"
 
-#~ msgid "User name:"
-#~ msgstr "U�ivatelsk� jm�no:"
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (s�riov�)"
 
-#~ msgid "Password:"
-#~ msgstr "Heslo:"
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Standardn� my� (s�riov�)"
 
-#~ msgid "Local Printer Options"
-#~ msgstr "Nastaven� m�stn� tisk�rny"
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsoft kompatibiln� (s�riov�)"
 
-#~ msgid "server"
-#~ msgstr "server"
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Standardn� t��tla��tkov� My� (s�riov�)"
 
-#~ msgid "expert"
-#~ msgstr "expert"
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse (s�riov�)"
 
-#~ msgid "developer"
-#~ msgstr "v�vojov�"
+#~ msgid ""
+#~ "I need to configure your network adapter to be able to connect to internet."
+#~ msgstr ""
+#~ "Abych se mohl p�ipojit k internetu, pot�ebuji nejd��ve nastavit v� s��ov� "
+#~ "adapt�r."
+
+#~ msgid ""
+#~ "Please choose which network adapter do you want to use to connect to "
+#~ "internet.\n"
+#~ "If you don't know, choose eth0.\n"
+#~ msgstr ""
+#~ "Pros�m zvolte si kter� s��ov� adapt�r chcete pou��t pro p�ipojen� k "
+#~ "internetu.\n"
+#~ "Pokud si nejste jist�, zvolte eth0.\n"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "p�ipojov�n� nfs skon�ilo chybou"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Socket"
+#~ msgstr "Soket"
+
+#~ 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?"
+#~ msgstr ""
+#~ "DrakX vytvo�� soubory s konfigurac� pro XFree verze 3.3 i 4.0.\n"
+#~ "Standardn� je pou�it server verze 4.0, pokud ov�em um� pracovat\n"
+#~ "s Va�� grafickou kartou.\n"
+#~ "Chcete rad�ji pou��t XFree 3.3?"
+
+#~ msgid "Cryptographic"
+#~ msgstr "�ifrov�n�"
+
+#~ msgid "Configure LAN"
+#~ msgstr "Nastaven� LAN"
+
+#~ msgid "Do not set up networking"
+#~ msgstr "Nenastavovat s��"
 
-#~ msgid "beginner"
-#~ msgstr "za��te�n�k"
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "Chcete na Va�em po��ta�i nastavit m�stn� s�� ?"
+
+#~ msgid "Show less"
+#~ msgstr "Uka� m�n�"
+
+#~ msgid "Show more"
+#~ msgstr "Uka� v�ce"
+
+#~ msgid "Take over the hard drive"
+#~ msgstr "Pou��t cel� pevn� disk"
+
+#~ msgid "URI for Local printer"
+#~ msgstr "URI pro m�stn� tisk�rnu"
+
+#~ msgid "URI for Network printer"
+#~ msgstr "URI pro s��ovou tisk�rnu"
+
+#~ msgid "Local Printer Device (URI)"
+#~ msgstr "M�stn� tiskov� za��zen� (URI)"
 
 #~ msgid ""
-#~ "Enter a floppy to create an HTP enabled boot\n"
-#~ "(all data on floppy will be lost)"
+#~ "What URI device is your printer connected to\n"
+#~ "(note that parallel:/dev/lp0 is equivalent to LPT1:)?"
 #~ msgstr ""
-#~ "Vlo�te disketu do mechaniky pro umo�n�n� HTP startu\n"
-#~ "(v�echna data na t�to disket� budou ztracena)"
+#~ "Ke kter�mu URI za��zen� je Va�e tisk�rna p�ipojena\n"
+#~ "(v�imli jste si �e /dev/lp0 odpov�d� LPT1:)?"
+
+#~ msgid "Network Printer Options (URI)"
+#~ msgstr "Mo�nosti NetWare Tisk�rny (URI)"
+
+#~ msgid ""
+#~ "Choose the right Device URI for a network printer or a local file. "
+#~ "Examples:\n"
+#~ "   file:/path/to/filename.prn\n"
+#~ "   http://hostname:631/ipp/port1\n"
+#~ "   ipp://hostname/ipp/port1\n"
+#~ "   lpq://hostname/queue\n"
+#~ "   socket://hostname\n"
+#~ "   socket://hostname:9100"
+#~ msgstr ""
+#~ "Zvolte si pro tisk�rnu to prav� URI za��zen�. P��klady:\n"
+#~ "   file:/path/to/filename.prn\n"
+#~ "   http://hostname:631/ipp/port1\n"
+#~ "   ipp://hostname/ipp/port1\n"
+#~ "   lpq://hostname/queue\n"
+#~ "   socket://hostname\n"
+#~ "   socket://hostname:9100"
+
+#~ msgid "curly"
+#~ msgstr "kudrnat�"
+
+#~ msgid "default"
+#~ msgstr "standardn�"
+
+#~ msgid "tie"
+#~ msgstr "s kravatou"
+
+#~ msgid "brunette"
+#~ msgstr "bruneta"
+
+#~ msgid "girl"
+#~ msgstr "d�vka"
+
+#~ msgid "woman-blond"
+#~ msgstr "blond�na"
+
+#~ msgid "automagic"
+#~ msgstr "auto-magick�"
+
+#~ msgid "Have you been provided with a hostname?"
+#~ msgstr "Dostali jste vlastn� hostname?"
+
+#~ msgid "Local Area Network specification"
+#~ msgstr "Up�esn�n� LAN"
+
+#~ msgid "You may now decide which class C network to use.\n"
+#~ msgstr "Nyn� se m��ete rozhodnout kterou s�� t��dy C pou�ijete.\n"
+
+#~ msgid "Network:"
+#~ msgstr "S�t:"
+
+#~ msgid "Internet Connection Sharing - setup of $device"
+#~ msgstr "Sd�len� internetov�ho p�ipojen� - nastaven� $device"
+
+#~ msgid ""
+#~ "The following interface is about to be configured:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+#~ msgstr ""
+#~ "N�sleduj�c� rozhran� bude nastaveno:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+
+#~ msgid "Everything configured!"
+#~ msgstr "V�e je nastaveno!"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Jak� je rozlo�en� Va�� kl�vesnice?"
+
+#~ msgid "Normal"
+#~ msgstr "Norm�ln�"
+
+#~ msgid "Configure my card"
+#~ msgstr "Nastaven� X"
+
+#~ msgid "pptp alcatel"
+#~ msgstr "Automaticky rozm�stit"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "M�m zkusit naj�t PCMCIA karty?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "M�m zkusit naj�t za��zen� %s?"
+
+#~ msgid "Small(%dMB)"
+#~ msgstr "Mal� (%dMB)"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "Nastaven� modemu"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "Chcete na Va�em po��ta�i nastavit p�ipojen� k s�ti p�es modem?"
+
+#~ msgid "Do you want to configure a ISDN connection for your system?"
+#~ msgstr "Chcete na va�em po��ta�i nastavit p�ipojen� ISDN?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "M�m zkusit naj�t PCI za��zen�?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "Vyhled�v�n� ko�enov�ho odd�lu."
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: Toto nen� ko�enov� diskov� odd�l, pros�m zvolte jin�."
 
-#~ msgid "A entry %s already exists"
-#~ msgstr "Z�znam %s u� existuje"
+#~ msgid "No root partition found"
+#~ msgstr "Nebyl nalezen ��dn� ko�enov� odd�l"
 
-#~ msgid "Choose install or upgrade"
-#~ msgstr "Zvolte si instalaci nebo upgrade"
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "Nem��u pou��t broadcast bez NIS dom�ny"
 
-#~ msgid "What usage do you want?"
-#~ msgstr "Jak� chcete pou�it�?"
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "Kter� diskov� odd�l chcete pou��t jako ko�enov�"
diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 2400cd292..d7faa6357 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 1999-11-17 17:21+0100\n"
 "Last-Translator: Dafydd Tomos <dafydd@imaginet.co.uk>\n"
 "Language-Team: Welsh\n"
@@ -14,43 +14,91 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-14\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Cerdyn graffeg"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Dewiswch gerdyn graffeg"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Dewiswch weinydd X"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "Gweinydd X"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, fuzzy, c-format
+msgid "XFree %s"
+msgstr "Gweinydd XFree86: %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Pa fath o rhaniad ydych chi eisiau?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+#, fuzzy
+msgid "XFree configuration"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Dewiswch faint y cof yn eich cerdyn graffeg"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Dewiswch opsiynau ar gyfer y gweinydd"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Dewiswch fonitor"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -64,215 +112,207 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Fe gafwyd gwall:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Gadael mewn %d eiliad"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 #, fuzzy
 msgid "Is this the correct setting?"
 msgstr "Ydi hyn yn gywir?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Cerdyn graffeg: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Gweinydd XFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Dangos i gyd"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Ffurf yr allweddell: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Math y llygoden: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Dyfais y lygoden: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Cerdyn graffeg: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Cof graffeg: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Gweinydd XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "Gweinydd XFree86: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Yn parataoi cyfluniad X-Window"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Newid Monitor"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Newid cerdyn graffeg"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Dangos gwybodaeth"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Profi eto"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Gorffen"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Beth ydych eisiau wneud?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr ""
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Yn parataoi cyfluniad X-Window"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X wrth ddechrau"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -280,452 +320,610 @@ msgstr ""
 "Fe alla'i osod eich cyfrifiadur i ddechrau X yn otomatig ar �l bwtio\n"
 "Hoffech chi X i ddechrau wedi i chi ail-fwtio?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1152
+#, 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."
+msgstr ""
+"Fe alla'i osod eich cyfrifiadur i ddechrau X yn otomatig ar �l bwtio\n"
+"Hoffech chi X i ddechrau wedi i chi ail-fwtio?"
+
+#: ../../Xconfigurator.pm_.c:1154
+#, fuzzy
+msgid "Choose the default user:"
+msgstr "Dewiswch y maint newydd"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Dewiswch weithred"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 lliw (8 did)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil o liwiau (15 did)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil o liwiau (16 did)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 miliwn o liwiau (24 did)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 biliwn o liwiau (32 did)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB neu fwy"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA safonol, 640x480 ar 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Uwch VGA, 800x600 ar 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 cydweithiol, 1024x768 ar 87 Hz masgledig (dim 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "SVGA, 1024x768 ar 87Hz masgledig, 800x600 ar 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "SVGA estynedig, 800x600 ar 60 Hz, 640x480 ar 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "SVGA Di-fasgledig, 1024x768 ar 60 Hz, 800x600 ar 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "SVGA amledd uchel, 1024x768 ar 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Amledd newidiol sydd yn gallu dangos 1280x1024 ar 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Amledd newidiol sydd yn gallu dangos 1280x1024 ar 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Amledd newidiol sydd yn gallu dangos 1280x1024 ar 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor sydd yn gallu dangos 1600x1200 ar 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor sydd yn gallu dangos 1600x1200 ar 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr ""
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr ""
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr ""
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr ""
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr ""
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr ""
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
 msgstr ""
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr ""
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 #, fuzzy
 msgid "None"
 msgstr "Wedi ei wneud"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 #, fuzzy
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Pa sector hoffech chi symud iddo?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr ""
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr ""
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr ""
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr ""
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr ""
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
+msgid "Video mode"
 msgstr ""
 
-#: ../../any.pm_.c:88
-msgid "Video mode"
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
 msgstr ""
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr ""
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr ""
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr ""
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr ""
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr ""
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr ""
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr ""
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
 msgstr ""
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr ""
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Wedi ei wneud"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr ""
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr ""
 
-#: ../../any.pm_.c:123
-msgid "Other OS (windows...)"
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
 msgstr ""
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
+#: ../../any.pm_.c:175
+msgid "Other OS (windows...)"
 msgstr ""
 
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr ""
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr ""
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr ""
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr ""
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr ""
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr ""
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr ""
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr ""
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr ""
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr ""
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr ""
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr ""
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr ""
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr ""
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr ""
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Na"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Ie"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr ""
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr ""
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr ""
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr ""
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr ""
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr ""
+
+#: ../../any.pm_.c:557
+#, 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 ""
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr ""
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+
+#: ../../bootloader.pm_.c:234
+#, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr ""
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr ""
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr ""
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr ""
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr ""
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr ""
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr ""
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr ""
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "Gadael mewn %d eiliad"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Creu"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Dileu"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Fformatio"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Newid maint"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Math"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Ysgrifennu /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Cyffredinol > Arbennigwr"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Arbennigwr > Cyffredinol"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Llwytho o ffeil"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Arbed i ffeil"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Llwytho o flopi"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Arbed ar flopi"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Clirio i gyd"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Fformatio i gyd"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Mae pob rhaniad cynradd wedi ei ddefnyddio"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Alla'i ddim ychwanegu unrhyw raniadau ychwanegol"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr "I gael mwy o raniadau, dil�wch un er mwyn gallu creu rhaniad estynedig"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Achub y tabl rhaniadau"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Dadwneud"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Sgrifennu y tabl rhaniadau"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Ail-lwytho"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Gwag"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Arall"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Gwag"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Arall"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Mathau ffeil-system:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Manylion"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -733,94 +931,94 @@ msgid ""
 "(click on it, then click on \"Resize\")"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Darllenwch yn ofalus!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 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:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Gwall"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Dyfais: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Llythyren disg-yrrwr yn DOS: %s (dim ond dyfalu)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Math: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Dechrau: sector %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Maint: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sector"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Silindr %d i silindr %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Wedi fformatio\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Heb ei fformatio\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -828,80 +1026,80 @@ msgstr ""
 "Y rhaniad i'w bwtio fel rheol\n"
 "    (ar gyfer bwt MS-DOS, nid ar gyfer lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Lefel %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 #, fuzzy
 msgid "Please click on a partition"
 msgstr "Creu rhaniad newydd"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Maint: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometreg: %s silindr, %s pen, %s sector\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, fuzzy, c-format
 msgid "Partition table type: %s\n"
 msgstr "Sgrifennu y tabl rhaniadau"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "ar fws %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Dewiswch weithred"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -913,7 +1111,7 @@ msgstr ""
 "Naill ai nad ydych yn defnyddio LILO a ddim angen /boot neu byddwch yn "
 "defnyddio LILO a ni fydd yn gweithio."
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -925,211 +1123,217 @@ msgstr ""
 "Os ydych yn bwriadu defnyddio y rheolwr bwtio LILO, nodwch fe ddylech greu "
 "rhaniad /boot"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, fuzzy, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "fe fydd yr holl wybodaeth ar y rhaniad yma yn cael ei ddileu"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Gorffen heb arbed"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Gorffen heb ysgrifennu y tabl rhaniadau?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Newid math y rhaniad"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
 msgstr "Pa fath o rhaniad ydych chi eisiau?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, fuzzy, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Pa sector hoffech chi symud iddo?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, fuzzy, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "fe fydd yr holl wybodaeth ar y rhaniad yma yn cael ei ddileu"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Fformatio"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, fuzzy, c-format
 msgid "Formatting loopback file %s"
 msgstr "Yn fformatio rhaniad %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Yn fformatio rhaniad %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Ar �l fformatio pob rhaniad,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "mi fydd yr holl wybodaeth ar y rhaniadau yma yn cael ei ddileu"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Symud"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Pa ddisg hoffech chi symud iddo?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sector"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Pa sector hoffech chi symud iddo?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Symud"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Yn symud rhaniad.."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Mae tabl rhaniad disg-yrrwr %s am gael ei ysgrifennu i'r disg!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Mi fydd angen i chi ail-fwtio cyn i'r newidiadau gymeryd lle"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Newid maint"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Pa fath o rhaniad ydych chi eisiau?"
+
+#: ../../diskdrake.pm_.c:597
 #, fuzzy
 msgid "All data on this partition should be backed-up"
 msgstr "fe fydd yr holl wybodaeth ar y rhaniad yma yn cael ei ddileu"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, fuzzy, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "fe fydd yr holl wybodaeth ar y rhaniad yma yn cael ei ddileu"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Dewiswch y maint newydd"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Creu rhaniad newydd"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Sector dechreuol: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Maint mewn MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Math o ffeilsystem: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Dewiswch ffeil"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1137,127 +1341,157 @@ msgstr ""
 "Rhowch flopi yn y disg-yrrwr\n"
 "Mi fydd yr holl wybodaeth ar y fflopi yma yn gael ei ddileu"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Yn trio achub y tabl rhaniadau"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "dyfais"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "lefel"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "newydd"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "mi fethodd y %s fformatio o %s"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr ""
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr ""
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr ""
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr ""
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr ""
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr ""
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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 ""
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Does gennych chi ddim rhaniadau!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "Dewiswch yr iaith hoffech weld ar gyfer gosodiad a defnydd y system"
 
-#: ../../help.pm_.c:10
+#: ../../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 ""
 
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:25
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"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
+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"
-"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).\n"
 "\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
-"  - 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"
+"\t* Recommanded: 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"
-"  - 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"
+"\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1265,325 +1499,753 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
+msgstr ""
+
+#: ../../help.pm_.c:84
+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 ""
+
+#: ../../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"
+"\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."
 msgstr ""
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:160
 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"
+"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"
+"\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"
-"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"
+"For information, you can reach any option using the keyboard: navigate "
+"trough the partitions using Tab and Up/Down arrows.\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"
+"When a partition is selected, you can use:\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."
+"           * 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"
+msgstr ""
+
+#: ../../help.pm_.c:218
+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 ""
+
+#: ../../help.pm_.c:252
+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:94
+#: ../../help.pm_.c:257
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
+msgstr ""
+
+#: ../../help.pm_.c:267
+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"
-"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"
+"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"
-"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"
 "\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"
-"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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
-"- Ctrl-d  to delete a partition\n"
+"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
+"\"secondary hard drive\", etc.\n"
 "\n"
-"- Ctrl-m  to set the mount point\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:300
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:303
 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."
+"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 ""
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:358
 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."
+"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:161
+#: ../../help.pm_.c:363
 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"
-"\n"
+"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"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
 "\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"Please be patient."
 msgstr ""
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:371
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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:180
+#: ../../help.pm_.c:376
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
-"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"
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
+msgstr ""
+
+#: ../../help.pm_.c:380
+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 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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"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:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+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:425
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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:225
+#: ../../help.pm_.c:437
+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:441
+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:445
 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:229
+#: ../../help.pm_.c:449
 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:233
+#: ../../help.pm_.c:453
 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 ""
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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:257
+#: ../../help.pm_.c:486
 msgid ""
-"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"
+"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:490
+msgid ""
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:505
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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 ""
 
-#: ../../help.pm_.c:302
+#: ../../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"
+"\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 ""
+
+#: ../../help.pm_.c:542
+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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+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 ""
+
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
 msgstr ""
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
 msgstr ""
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1607,34 +2269,33 @@ msgid ""
 "and maintenance purposes."
 msgstr ""
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
 msgstr ""
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1645,7 +2306,7 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1662,14 +2323,45 @@ msgid ""
 "\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."
 msgstr ""
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 ""
+
+#: ../../help.pm_.c:692
+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 ""
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -1681,57 +2373,61 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
 msgstr ""
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
 msgstr ""
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\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"
+"\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"\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."
 msgstr ""
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -1740,315 +2436,346 @@ msgid ""
 "the additional instructions."
 msgstr ""
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr ""
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr ""
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr ""
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr ""
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr ""
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr ""
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr ""
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr ""
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr ""
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr ""
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr ""
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr ""
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr ""
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr ""
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr ""
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr ""
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr ""
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr ""
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr ""
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr ""
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr ""
 
-#: ../../install2.pm_.c:337
-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 `/'"
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
 msgstr ""
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-msgid ""
-"I can't read your partition table, it's too corrupted for me :(\n"
-"I'll try to go on blanking bad partitions"
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
 msgstr ""
 
-#: ../../install_any.pm_.c:351
-msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+#: ../../install_gtk.pm_.c:427
+msgid "To activate the mouse,"
 msgstr ""
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
 msgstr ""
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
+#: ../../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 ""
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
+#: ../../install_interactive.pm_.c:41
+msgid ""
+"You must have a root partition.\n"
+"For this, create a partition (or click on an existing one).\n"
+"Then choose action ``Mount point'' and set it to `/'"
 msgstr ""
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
 msgstr ""
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
+#: ../../install_interactive.pm_.c:47
+msgid ""
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
 msgstr ""
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
 msgstr ""
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
+#: ../../install_interactive.pm_.c:78
+#, fuzzy
+msgid "Use existing partition"
+msgstr "Yn fformatio rhaniad %s"
+
+#: ../../install_interactive.pm_.c:80
+#, fuzzy
+msgid "There is no existing partition to use"
+msgstr "Yn trio achub y tabl rhaniadau"
+
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
 msgstr ""
 
-#: ../../install_steps.pm_.c:323
-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"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Pa sector hoffech chi symud iddo?"
+
+#: ../../install_interactive.pm_.c:92
+#, fuzzy
+msgid "Choose the sizes"
+msgstr "Dewiswch y maint newydd"
+
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
 msgstr ""
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
+#: ../../install_interactive.pm_.c:94
+#, fuzzy
+msgid "Swap partition size in MB: "
+msgstr "Maint mewn MB: "
+
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
 msgstr ""
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
+#: ../../install_interactive.pm_.c:105
+#, fuzzy
+msgid "Which partition do you want to resize?"
+msgstr "Pa fath o rhaniad ydych chi eisiau?"
+
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
 msgstr ""
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:287
+#: ../../install_interactive.pm_.c:122
 #, fuzzy
-msgid "Choose the size you want to install"
-msgstr "Dewiswch weithred"
-
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr ""
+msgid "Which size do you want to keep for windows on"
+msgstr "Pa sector hoffech chi symud iddo?"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr ""
+#: ../../install_interactive.pm_.c:123
+#, fuzzy, c-format
+msgid "partition %s"
+msgstr "Ar �l %s rhaniad %"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
+msgid "FAT resizing failed: %s"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr ""
+#: ../../install_interactive.pm_.c:156
+#, fuzzy, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "fe fydd yr holl wybodaeth ar y rhaniad yma yn cael ei ddileu"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr ""
+#: ../../install_interactive.pm_.c:164
+#, fuzzy
+msgid "Expert mode"
+msgstr "Ext2"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr ""
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Does gennych chi ddim rhaniadau!"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Alla'i ddim ychwanegu unrhyw raniadau ychwanegol"
+
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
+#: ../../install_interactive.pm_.c:218
+#, fuzzy, c-format
+msgid "Partitioning failed: %s"
+msgstr "Sgrifennu y tabl rhaniadau"
+
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:199
-#, fuzzy
-msgid "You don't have any windows partitions!"
-msgstr "Does gennych chi ddim rhaniadau!"
+#: ../../install_steps.pm_.c:74
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:201
-#, fuzzy
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Does gennych chi ddim rhaniadau!"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:375
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:265
-#, fuzzy
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Pa sector hoffech chi symud iddo?"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:284
-#, fuzzy
-msgid "Choose the sizes"
-msgstr "Dewiswch y maint newydd"
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:288
-#, fuzzy
-msgid "Swap partition size in MB: "
-msgstr "Maint mewn MB: "
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2057,7 +2784,7 @@ msgid ""
 "a percentage of 100%% will install all selected packages."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2067,103 +2794,188 @@ msgid ""
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 #, fuzzy
 msgid "Percentage of packages to install"
 msgstr "Dewiswch weithred"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "Dewiswch weithred"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
+#: ../../install_steps_gtk.pm_.c:469
+#, fuzzy
+msgid "Estimating"
+msgstr "fformatio"
+
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:540
-#, fuzzy
-msgid "Estimating"
-msgstr "fformatio"
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2173,359 +2985,410 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Newid maint"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
+#, fuzzy
 msgid "An error occurred"
-msgstr ""
+msgstr "Fe gafwyd gwall:"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
+#, fuzzy
 msgid "Which installation class do you want?"
+msgstr "Pa fath o rhaniad ydych chi eisiau?"
+
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Install/Update"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Is this an install or an update?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:110
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 #, fuzzy
-msgid "Automated"
-msgstr "Wedi fformatio\n"
-
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
 msgid "Customized"
-msgstr ""
+msgstr "Wedi fformatio\n"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
+#, fuzzy
 msgid "Expert"
-msgstr ""
+msgstr "Ext2"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+msgid "Update"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
+#, fuzzy
 msgid "Server"
-msgstr ""
+msgstr "Gweinydd X"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
-msgstr ""
+#: ../../install_steps_interactive.pm_.c:228
+#, fuzzy
+msgid "What is your system used for?"
+msgstr "Pa ddisg hoffech chi symud iddo?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:172
-msgid "Configuring IDE"
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
+#, fuzzy
+msgid "Configuring IDE"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
+#, fuzzy
 msgid "no available partitions"
+msgstr "Yn fformatio rhaniad %s"
+
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:299
+#, fuzzy
+msgid "Choose the mount points"
+msgstr "Dewiswch weithred"
+
+#: ../../install_steps_interactive.pm_.c:316
 #, c-format
-msgid "(%dMB)"
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
-msgid "Choose the mount points"
-msgstr ""
+#: ../../install_steps_interactive.pm_.c:337
+#, fuzzy
+msgid "Root Partition"
+msgstr "Yn fformatio rhaniad %s"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:338
+#, fuzzy
+msgid "What is the root partition (/) of your system?"
+msgstr "Pa fath o rhaniad ydych chi eisiau?"
+
+#: ../../install_steps_interactive.pm_.c:352
+#, fuzzy
 msgid "You need to reboot for the partition table modifications to take place"
-msgstr ""
+msgstr "Mi fydd angen i chi ail-fwtio cyn i'r newidiadau gymeryd lle"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
+#, fuzzy
 msgid "Choose the partitions you want to format"
-msgstr ""
+msgstr "Dewiswch weithred"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 #, fuzzy
 msgid "Formatting partitions"
 msgstr "Yn fformatio rhaniad %s"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "Wedi fformatio\n"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Dewiswch weithred"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 #, fuzzy
 msgid "Post-install configuration"
 msgstr "Yn parataoi cyfluniad X-Window"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2564,88 +3427,96 @@ msgid ""
 "USA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
+#, fuzzy
 msgid "Please choose the packages you want to install."
-msgstr ""
+msgstr "Dewiswch weithred"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
+#, fuzzy
 msgid "Which is your timezone?"
-msgstr ""
+msgstr "Pa ddisg hoffech chi symud iddo?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "Pa fath o rhaniad ydych chi eisiau?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
+#, fuzzy
 msgid "NIS Server"
-msgstr ""
+msgstr "Gweinydd X"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -2653,61 +3524,80 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:747
-msgid "First floppy drive"
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:869
+#, fuzzy
+msgid "First floppy drive"
+msgstr "Fformatio i gyd"
+
+#: ../../install_steps_interactive.pm_.c:870
 #, fuzzy
 msgid "Second floppy drive"
 msgstr "Arbed ar flopi"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -2721,189 +3611,155 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
+#, fuzzy
 msgid "Choose the floppy drive you want to use to make the bootdisk"
-msgstr ""
+msgstr "Dewiswch weithred"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
+#, fuzzy
 msgid "Do you want to use aboot?"
-msgstr ""
+msgstr "Beth ydych eisiau wneud?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
+#, fuzzy
 msgid "Enable num lock at startup"
-msgstr ""
+msgstr "X wrth ddechrau"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
+#, fuzzy
 msgid "Creating auto install floppy"
-msgstr ""
+msgstr "Arbed ar flopi"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -2916,140 +3772,17 @@ msgid ""
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Na"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Ie"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr ""
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr ""
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr ""
 
@@ -3059,7 +3792,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr ""
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr ""
 
@@ -3073,448 +3806,949 @@ msgstr ""
 msgid "Your choice? (default %s) "
 msgstr ""
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr ""
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr ""
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr ""
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr ""
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr ""
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr ""
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr ""
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr ""
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr ""
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr ""
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr ""
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr ""
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr ""
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr ""
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr ""
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr ""
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr ""
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr ""
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr ""
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr ""
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr ""
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr ""
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr ""
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr ""
 
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr ""
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr ""
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr ""
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr ""
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "lefel"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr ""
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr ""
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr ""
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr ""
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr ""
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr ""
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr ""
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr ""
+
+#: ../../mouse.pm_.c:64
+msgid "busmouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+#, fuzzy
+msgid "none"
+msgstr "Wedi ei wneud"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Ydi hyn yn gywir?"
+
+#: ../../netconnect.pm_.c:93
+#, fuzzy
+msgid "Internet configuration"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../netconnect.pm_.c:94
+#, fuzzy
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#: ../../netconnect.pm_.c:101
+msgid "Testing your connection..."
+msgstr ""
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#: ../../netconnect.pm_.c:107
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+#, fuzzy
+msgid "ISDN Configuration"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr ""
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr ""
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr ""
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr ""
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr ""
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr ""
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr ""
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr ""
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:214
+#, fuzzy
+msgid "Which protocol do you want to use ?"
+msgstr "Pa fath o rhaniad ydych chi eisiau?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr ""
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr ""
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr ""
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr ""
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr ""
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:287
+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 ""
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr ""
+
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "Dewiswch y maint newydd"
+
+#: ../../netconnect.pm_.c:336
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
+"Do you agree?"
 msgstr ""
 
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
 msgstr ""
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
 msgstr ""
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
 msgstr ""
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
+#: ../../netconnect.pm_.c:545
+#, fuzzy
+msgid "Connection name"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
 msgstr ""
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
+#: ../../netconnect.pm_.c:547
+#, fuzzy
+msgid "Login ID"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
 msgstr ""
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
 msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
 msgstr ""
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
 msgstr ""
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
 msgstr ""
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
+#: ../../netconnect.pm_.c:552
+#, fuzzy
+msgid "First DNS Server"
+msgstr "Gweinydd X"
+
+#: ../../netconnect.pm_.c:553
+#, fuzzy
+msgid "Second DNS Server"
+msgstr "Arbed ar flopi"
+
+#: ../../netconnect.pm_.c:582
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
 msgstr ""
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can reconfigure your connection."
 msgstr ""
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
 msgstr ""
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
+#: ../../netconnect.pm_.c:641
+msgid "Configure a normal modem connection"
 msgstr ""
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
+#: ../../netconnect.pm_.c:661
+msgid "Configure an ISDN connection"
 msgstr ""
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
 msgstr ""
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Ext2"
+
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+#, fuzzy
+msgid "Connect to the Internet"
+msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
 msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
+#: ../../netconnect.pm_.c:691
+msgid "Configure a DSL (or ADSL) connection"
 msgstr ""
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
 msgstr ""
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
 msgstr ""
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
 msgstr ""
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
 msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "Ext2"
+
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
 msgstr ""
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
 msgstr ""
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
 msgstr ""
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
 msgstr ""
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
+#: ../../netconnect.pm_.c:765
+msgid "Configure a cable connection"
 msgstr ""
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Pa fath o rhaniad ydych chi eisiau?"
+
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
 msgstr ""
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
 msgstr ""
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
 msgstr ""
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#: ../../netconnect.pm_.c:858
+#, fuzzy
+msgid "Network Configuration"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../netconnect.pm_.c:859
+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"
 msgstr ""
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
+#: ../../network.pm_.c:253
+msgid "no network card found"
 msgstr ""
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
 msgstr ""
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
+#: ../../network.pm_.c:274
+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 ""
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
 msgstr ""
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
 msgstr ""
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
+#: ../../network.pm_.c:302
+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 ""
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
 msgstr ""
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Automatic IP"
+msgstr "Wedi fformatio\n"
+
+#: ../../network.pm_.c:314
+msgid "IP address"
 msgstr ""
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
+#: ../../network.pm_.c:314
+msgid "Netmask"
 msgstr ""
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
 msgstr ""
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
+#: ../../network.pm_.c:341
+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 ""
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "Gweinydd X"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
 msgstr ""
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "dyfais"
+
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
 msgstr ""
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Ydi hyn yn gywir?"
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr ""
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr ""
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions"
 msgstr ""
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr ""
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr ""
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr ""
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr ""
@@ -3548,42 +4782,51 @@ msgstr ""
 msgid "maybe"
 msgstr ""
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr ""
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr ""
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr ""
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
+#: ../../printer.pm_.c:19
+msgid "Local printer"
 msgstr ""
 
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
 msgstr ""
 
-#: ../../printer.pm_.c:244
-msgid "Local printer"
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr ""
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
 msgstr ""
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
 msgstr ""
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr ""
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr ""
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr ""
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr ""
@@ -3597,44 +4840,44 @@ msgstr ""
 msgid "A printer, model \"%s\", has been detected on "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 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."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -3643,27 +4886,27 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -3671,139 +4914,203 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "Fformatio"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
+#: ../../printerdrake.pm_.c:346
+msgid "Printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
+#: ../../printerdrake.pm_.c:347
+msgid "Would you like to configure a printer?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:218
-#, c-format
+#: ../../printerdrake.pm_.c:350
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
+"Here are the following print queues.\n"
+"You can add some more or change the existing ones."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:222
-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?"
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "fformatio"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:238
-msgid "Printer"
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
+msgid "Select Printer Connection"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:239
-msgid "Would you like to configure a printer?"
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
+msgid "How is the printer connected?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:388
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"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 ""
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
-msgid "Select Printer Connection"
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
+msgid "Remove queue"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:267
-msgid "How is the printer connected?"
+#: ../../printerdrake.pm_.c:400
+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 ""
 
-#: ../../printerdrake.pm_.c:272
-msgid "Remove queue"
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -3811,57 +5118,57 @@ msgid ""
 "connected?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr ""
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr ""
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr ""
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr ""
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr ""
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr ""
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr ""
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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 ""
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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:19
+#: ../../services.pm_.c:20
 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 "
@@ -3869,7 +5176,7 @@ msgid ""
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -3877,13 +5184,13 @@ msgid ""
 "and includes support for pop-up menus on the console."
 msgstr ""
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
 msgstr ""
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -3893,51 +5200,51 @@ msgid ""
 "all of the services it is responsible for."
 msgstr ""
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
 "You should leave this enabled for most machines."
 msgstr ""
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP networks.\n"
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -3945,7 +5252,7 @@ msgid ""
 "it installed on machines that don't need it."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -3953,91 +5260,239 @@ msgid ""
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr ""
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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:66
+#: ../../services.pm_.c:67
 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:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr ""
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr ""
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr ""
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 #, fuzzy
 msgid "Create a boot floppy"
 msgstr "Arbed ar flopi"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 #, fuzzy
 msgid "Format floppy"
 msgstr "Fformatio i gyd"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr ""
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+msgid "disable"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+msgid "enable"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+msgid "using module"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Yn parataoi cyfluniad X-Window"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4085,23 +5540,29 @@ msgstr ""
 msgid "Choose the tool you want to use"
 msgstr ""
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
+#: ../../standalone/livedrake_.c:23
+msgid "Change Cd-Rom"
 msgstr ""
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
+#: ../../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 ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
+
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr ""
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr ""
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr ""
 
@@ -4313,15 +5774,222 @@ msgstr ""
 msgid "Finding leaves takes some time"
 msgstr ""
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Yn parataoi cyfluniad X-Window"
+
+# ../../share/compssUsers
+msgid "Internet"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Swyddfa"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Aml-gyfrwng"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Aml-gyfrwng"
+
+# ../../share/compssUsers
+msgid "KDE"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Aml-gyfrwng"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Aml-gyfrwng"
+
+#, fuzzy
+msgid "Gnome"
+msgstr "Wedi ei wneud"
+
+msgid "Documentation"
+msgstr "Dogfennau"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Aml-gyfrwng"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Dewiswch weithred"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Pa ddisg hoffech chi symud iddo?"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "Beth ydych eisiau wneud?"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "Newid maint"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Pa fath o rhaniad ydych chi eisiau?"
+
+#, fuzzy
+#~ msgid "Configure LAN"
+#~ msgstr "Yn parataoi cyfluniad X-Window"
+
+#, fuzzy
+#~ msgid "End configuration"
+#~ msgstr "Yn parataoi cyfluniad X-Window"
+
+#, fuzzy
+#~ msgid "Everything configured!"
+#~ msgstr "Yn parataoi cyfluniad X-Window"
+
+#, fuzzy
+#~ msgid "Normal"
+#~ msgstr "Fformatio"
+
+#, fuzzy
+#~ msgid "Autologin - Choose default user"
+#~ msgstr "Dewiswch y maint newydd"
+
+#, fuzzy
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "Does gennych chi ddim rhaniadau!"
+
 #~ msgid "Normal > Expert"
 #~ msgstr "Cyffredinol > Arbennigwr"
 
 #~ msgid "Expert > Normal"
 #~ msgstr "Arbennigwr > Cyffredinol"
 
-#~ msgid "After %s partition %s,"
-#~ msgstr "Ar �l %s rhaniad %"
-
 #~ msgid "Size: %s MB"
 #~ msgstr "Maint: %s MB"
 
diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po
index 9d1f71eb2..b68f2742f 100644
--- a/perl-install/share/po/da.po
+++ b/perl-install/share/po/da.po
@@ -1,60 +1,121 @@
 # Danish translation of/Dansk overs�ttelse af
 # Linux-Mandrake DrakX.
 # Copyright (C) 1999 MandrakeSoft
-# Keld Simonsen <keld@dkuug.dk>, 2000
-# Troels Liebe Bentsen <tlb@iname.com>, 1999-2000
-# Jens Burkal <jburkal@get2net.dk>, 1999
-# Mads Stenhuus Hansen <msh@com.dtu.dk>, 1999
-# Kenneth Christiansen, <kenneth@ripen.dk> 2000
+#
+# In order of aktivity:
+# 1, Keld Simonsen <keld@dkuug.dk>, 2000
+# 2, Troels Liebe Bentsen <tlb@iname.com>, 1999-2000
+# 3, Nikolaj Berg Amondsen <mr_nba@get2net.dk>, 2000
+# 4, Jacob Sparre Andersen, <sparre@sslug.dk>, 2000
+# 5, Kenneth Christiansen, <kenneth@ripen.dk>, 2000
+# 6, Jens Burkal <jburkal@get2net.dk>, 1999
+# 7, Mads Stenhuus Hansen <msh@com.dtu.dk>, 1999
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
-"PO-Revision-Date: 2000-06-10 19:36+0200\n"
-"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
-"Language-Team: Danish <da@li.org>\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
+"PO-Revision-Date: 2000-10-07 13:32+0100\n"
+"Last-Translator: Troels Liebe Bentsen <tlb@iname.com>\n"
+"Language-Team: Danish <dansk@klid.dk>\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.5.3\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "Standard"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Grafikkort"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "V�lg grafikkort"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "V�lg en X-server"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X-server"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Hvilken konfiguration af XFree �nsker du?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"Dit kort kan have 3D acceleration, men kun med XFree %s.\n"
+"Dit kort er underst�ttet af XFree %s som kan have bedre underst�ttelse i 2D."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+"Dit kort kan have 3D hardware accelerations-underst�ttelse med XFree %s."
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s med 3D hardware acceleration"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"Dit kort kan have 3D acceleration underst�ttelse, men kun med XFree %s.\n"
+"VIGTIGT: Dette er eksperimentelt og kan f� din maskine til at l�se eller g� "
+"ned.\n"
+"Dit kort er underst�ttet af XFree %s som kan have bedre underst�ttelse i 2D."
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"Dit kort kan have 3D acceleration underst�ttelse, men kun med XFree %s,\n"
+"VIGTIGT: Dette er eksperimentelt og kan f� din maskine til at l�se eller g� "
+"ned."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s med EKSPERMENTAL 3d hardware acceleration"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "XFree konfiguration"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "V�lg hukommelsesm�ngde for dit grafikkort"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "V�lg server-indstillinger"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "V�lg en sk�rmtype"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Sk�rm"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -76,42 +137,43 @@ msgstr ""
 "Det er MEGET VIGTIGT at du ikke angiver en sk�rmtype med "
 "opdateringsfrekvenser,\n"
 "der er st�rre end din sk�rms form�en: du risikerer at �del�gge din sk�rm.\n"
-"Hvis du er i tvivl, b�r du v�lge en ops�tning, som du med SIKKERHED v�d\n"
+"Hvis du er i tvivl, b�r du v�lge en ops�tning, som du med SIKKERHED ved\n"
 "at din sk�rm kan klare."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Vandret opdateringsfrekvens"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Lodret opdateringsfrekvens"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Sk�rm ikke konfigureret"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Grafikkort er endnu ikke konfigureret"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Opl�sninger ikke valgt endnu"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
-msgstr "�nsker du at teste konfigurationen?"
+msgstr "�nsker du at afpr�ve konfigurationen?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr "Advarsel: testning af dette grafikkort er farligt"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr ""
+"Advarsel: afpr�vning af dette grafikkort kan f� din maskine til at l�se"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Test konfigurationen"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -119,415 +181,396 @@ msgstr ""
 "\n"
 "pr�v at �ndre nogle parametre"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "En fejl opstod:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Vender tilbage om %d sekunder"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
-msgstr "Er dette den korrekt indstilling?"
+msgstr "Er dette den korrekte indstilling?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "En fejl opstod, pr�v at �ndre nogle parametre"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Automatiske opl�sninger"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"For at finde de mulige opl�sninger bliver forskellige kombinationer\n"
-"nu afpr�vet.\n"
-"Din sk�rm vil blinke nogle gange...\n"
-"Hvis du �nsker det, kan du slukke sk�rmen. Du vil h�re en lyd n�r det\n"
-"er overst�et."
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Opl�sning"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "V�lg opl�sning og farvedybde"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafikkort: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86-server: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Vis alle"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Opl�sninger"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Jeg kan fors�ge at finde de mulige opl�sninger (f.eks. 800x600).\n"
-"I nogle tilf�lde kan dette resultere i at computeren g�r ned.\n"
-"�nsker du at pr�ve?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Kunne ikke finde nogen brugbare opl�sninger\n"
-"Pr�v at v�lge et andet grafikkort eller en anden sk�rm"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastatur-type: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Muse-type: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Muse-enhed: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Sk�rm: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
-msgstr "Sk�rm vandret frekvens: %s\n"
+msgstr "Sk�rms vandrette frekvens: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
-msgstr "Sk�rm lodret frekvens: %s\n"
+msgstr "Sk�rms lodrette frekvens: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafikkort: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Grafik-hukommelse: %s kb\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "Farvedybde: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Opl�sninger %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86-server: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 driver: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Forbereder konfiguration af X"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Skift sk�rmtype"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Skift grafikkort"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Foretag �ndringer i server-indstillinger"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Skift opl�sning"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Automatisk s�gning efter brugbare opl�sninger"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Vis information"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Test igen"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Hvad �nsker du at g�re?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Glem �ndringer?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"Behold �ndringer?\n"
+"Nuv�rende konfiguration er:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Log venligst ind i %s igen for at aktivere �ndringerne"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Log venligst ud og tryk herefter p� Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "Start X ved systemopstart"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
 msgstr ""
-"Jeg kan s�tte din computer op til automatisk at starte X ved\n"
+"Jeg kan s�tte din maskine op til automatisk at starte X ved\n"
 "opstart. �nsker du at starte X hver gang du genstarter?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Autologin"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"Jeg kan s�tte din maskine op til automatisk at logge en bruger p�.\n"
+"Hvis du ikke �nsker denne facilitet, s� klik p� 'Annull�r' knappen."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "V�lg forvalgte bruger :"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "V�lg den vinduesbehandler du �nsker at benytte:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 farver (8 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
-msgstr "32-tusinde farver (15 bit)"
+msgstr "32 tusinde farver (15 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
-msgstr "65-tusinde farver (16 bit)"
+msgstr "65 tusinde farver (16 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
-msgstr "16-millioner (24 bit)"
+msgstr "16 millioner (24 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
-msgstr "4-milliarder farver (32 bit)"
+msgstr "4 milliarder farver (32 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kb"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kb"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 Mb"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 Mb"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 Mb"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 Mb"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 Mb eller mere"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standard-VGA, 640x480 ved 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super-VGA, 800x600 ved 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 kompatibel, 1024x768 ved 87 Hz interlaced (ikke 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 ved 87 Hz interlaced, 800x600 ved 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Udvidet Super-VGA, 800x600 ved 60 Hz, 640x480 ved 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "Non-Interlaced SVGA, 1024x768 ved 60 Hz, 800x600 ved 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "H�jfrekvens SVGA, 1024x768 ved 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frekvens, som kan klare 1280x1024 ved 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frekvens, som kan klare 1280x1024 ved 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frekvens, som kan klare 1280x1024 ved 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Sk�rm, som kan klare 1600x1200 ved 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Sk�rm, som kan klare 1600x1200 ved 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "kr�llet"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "forvalgt"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "slips"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "brunette"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "pige"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "kvinde-blond"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "Automagisk"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "F�rste sektor af opstartspartition"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "F�rste sektor p� disken (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "LILO/grub-installering"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "SILO-installering"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Hvor vil du placere opstarteren?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub-installering"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Ingenting"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Hvilken opstarter(e) �nsker du at bruge"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "systemopstarterens installation"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Opstartsenhed"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (virker ikke med gamle BIOS'er)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Kompakt"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "kompakt"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Ventetid f�r opstart af forvalgt styresystem"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Grafik-tilstand"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Ventetid f�r opstart af forvalgt styresystem"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Adgangskode"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Adgangskode (igen)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Begr�ns kommandolinie-indstillinger"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "begr�ns"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "systemopstarterens hovedindstillinger"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Indstillingen ``Begr�ns kommandolinie-indstillinger'' er intet v�rd uden\n"
 "en adgangskode"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Pr�v venligst igen"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Adgangskoderne stemmer ikke overens"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -535,328 +578,518 @@ msgstr ""
 "Her er f�lgende typer indgange.\n"
 "Du kan tilf�je flere eller �ndre de eksisterende."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Tilf�j"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "F�rdig"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Hvilken type �nsker du at tilf�je"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Andet styresystem (SunOs...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Andet styresystem (Windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Hvilken type �nsker du at tilf�je"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Billede"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Rod"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Vedh�ft"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "L�s-skriv"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Tabel"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Usikker"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "M�rkat"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
-msgstr "OK"
+msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
-msgstr "Fjern"
+msgstr "Fjern indgang"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Tom m�rkat er ikke tilladt"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Denne m�rkat er allerede brugt"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Fandt %s %s gr�nsesnit"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Har du �n til?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Har du nogen %s gr�nsesnit?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Nej"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Ja"
+
+#: ../../any.pm_.c:505
+msgid "See hardware info"
+msgstr "Se info for maskinel"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Installerer driver for %s kort %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(modul %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Hvilken %s driver skal jeg pr�ve?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"I nogen tilf�lde beh�ver %s driveren at have ekstra information for at "
+"virke\n"
+"ordentligt, selv om den normalt virker fint uden. �nsker du at angive "
+"ekstra\n"
+"optioner for den eller tillade driveren at sondere din maskine for\n"
+"den information den beh�ver? Af og til vil sondering stoppe maskinen, men "
+"burde\n"
+"ikke for�rsage nogen skader."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Automatisk sondering"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Specific�r optioner"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Du kan nu give dens optioner til modul %s."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"Du kan nu s�tte parametre til modulet %s.\n"
+"Parametrene er i formatet ``name=value name2=value2 ...''.\n"
+"F.eks., ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Modulindstillinger:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Indl�sning af modul %s mislykkedes.\n"
+"�nsker du at pr�ve igen med andre parametre?"
+
+# 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)
+#: ../../bootloader.pm_.c:234
+#, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Velkommen til %s styresystems-v�lger!\n"
+"\n"
+"V�lg et styresystem i den ovenst�enden liste eller\n"
+"vente %d sekunder for at starte standard.\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 suggested 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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Velkommen til GRUB styresystemsv�lgeren!"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "Brug tasterne %c og %c til at v�lge mellem mulighederne."
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Tryk 'enter' for at starte det valgte OS, 'e' for at redigere"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "kommandoerne f�r opstart, eller 'c' for en kommandolinie."
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "Den fremh�vede mulighed vil blive startet automatisk om %d sekunder."
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr "Ikke nok plads i /boot"
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Skrivebord"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Start menu"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutter"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 minut"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekunder"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Opret"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Afmont�r"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Slet"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
-msgstr "Format�r"
+msgstr "Formater"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "St�rrelses�ndring"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Type"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
-msgstr "Mont�r sti"
+msgstr "Monteringssti"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Skriv /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
-msgstr "Normal > Ekspert"
+msgstr "Normal -> Ekspert"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
-msgstr "Ekspert > Normal"
+msgstr "Ekspert -> Normal"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Genskab fra fil"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Gem i fil"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "Guide"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Genskab fra diskette"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Gem p� diskette"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Slet alt"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Format�r alle"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Allok�r automatisk"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Alle prim�re partitioner er brugt"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Kan ikke tilf�je flere partitioner"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr ""
-"For at kunne f� flere partitioner, skal du slette �n for at kunne oprette\n"
-"en `extended' partition"
+"For at du kan f� flere partitioner, skal du slette �n, s� der kan oprettes "
+"en udvidet partition"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Red partitionstabellen"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Fortryd"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Skriv partitionstabellen"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Genindl�s"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Tom"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Andet"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Tom"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Andet"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Filsystems-typer:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 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"
-"generalt bruget af Microsoft Dos/Windows).\n"
+"Du har �n stor FAT partition.\n"
+"(normalt brugt af Microsoft Dos/Windows).\n"
 "Jeg anbefaler, at du �ndrer st�rrelsen p� partitionen\n"
 "(klik p� den, og klik herefter p� \"St�rrelses�ndring\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Lav venligst en sikkerhedkopi af dine data f�rst"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "L�s omhyggeligt!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 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 ""
-"Hvis du planl�gger at bruge aboot s� kun husk at efterlade fri plads p�\n"
+"Hvis du planl�gger at bruge aboot, skal husk at efterlade fri plads p�\n"
 "begyndelsen af disken (2048 sektorer skulle v�re nok)"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "V�r forsigtig: denne operation er farlig."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Fejl"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
-msgstr "Monterings-sti: "
+msgstr "Monteringssti: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Enhed: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS-drevbogstav: %s (bare et g�t)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Type: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Start: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "St�rrelse: %d Mb"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektorer"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Cylinder %d til cylinder %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
-msgstr "Format�ret\n"
+msgstr "Formateret\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
-msgstr "Ikke format�ret\n"
+msgstr "Ikke formateret\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Monteret\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Loopback-fil(er): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -864,79 +1097,79 @@ msgstr ""
 "Partition som opstartes som standard\n"
 "    (g�lder kun MS-DOS-opstart, ikke LILO)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Niveau %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Enhedsst�rrelse %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-diske %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Loopback-filnavn: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Klik venligst p� en partition"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "St�rrelse: %d Mb\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Opbygning: %s cylindre, %s hoveder, %s sektorer\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Partitionstabel-type: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "p� bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Mont�r"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Tilf�j til RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Fjern fra RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
-msgstr "�ndre RAID"
+msgstr "�ndr RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Loopback anvendelse"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "V�lg handling"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -949,7 +1182,7 @@ msgstr ""
 "benytte\n"
 "LILO, hvilket vil betyde, at du ikke har brug for /boot"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -962,212 +1195,214 @@ msgstr ""
 "partition\n"
 "indenfor 1024-cylinder gr�nsen."
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
-"Du har valgt en programmeret RAID-partitionsom rod (/).\n"
+"Du har valgt en software RAID-partition som rod (/).\n"
 "Ingen systemopstarter kan h�ndtere dette uden en /boot partition.\n"
-"S� v�r omhyggelig med at tilf�je en /boot partition hvis du �neker at bruge "
-"lilo eller grub"
+"S� v�r omhyggelig med at tilf�je en /boot partition"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Benyt ``%s'' i stedet"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Benyt ``Afmont�r'' f�rst"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
-"Efter type �ndring af partition %s, alle data p� disse partitioner vil g� "
-"tabt"
+"Efter type-�ndring af partition %s vil alle data p� denne partition g� tabt"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Forts�t alligevel?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Afslut uden at gemme"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Afslut uden at skrive partitionstabellen?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Skift partitionstype"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Hvilken partitionstype �nsker du?"
+#: ../../diskdrake.pm_.c:471
+msgid "Which filesystem do you want?"
+msgstr "Hvilket filsystem �nsker du at bruge?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Du kan ikke bruge ReiserFS for partitioner mindre end 32Mb"
+msgstr "Du kan ikke bruge ReiserFS p� partitioner mindre end 32Mb"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Hvor �nsker du at montere loopback-fil %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Hvor �nsker du at montere partitionen %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
-"Kan ikke fjerne monteringssted, da denne partition bliver brugt til "
+"Kan ikke fjerne monteringssti, da denne partition bliver brugt til "
 "loopback.\n"
 "Fjern loopback f�rst"
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
-"Efter formatering af partition %s, alle data p� disse partitioner vil g� tabt"
+"Efter formatering af partitionen %s vil alle data p� denne partition g� tabt"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
-msgstr "Format�rer"
+msgstr "Formaterer"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
-msgstr "Format�rer loopback-fil %s"
+msgstr "Formaterer loopback-fil %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
-msgstr "Format�rer partition %s"
+msgstr "Formaterer partition %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
-msgstr "Efter format�ring alle partitioner,"
+msgstr "Efter formatering alle partitioner"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
-msgstr "alt data p� disse partitioner vil blive tabt"
+msgstr "vil alle data p� disse partitioner g� tabt"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Flyt"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
-msgstr "Hvilken disk �nsker du at flytte til?"
+msgstr "Hvilken disk �nsker du at flytte den til?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
-msgstr "Hvilken sektor �nsker du at flytte til?"
+msgstr "Hvilken sektor �nsker du at flytte den til?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Flytter"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Flytter partition..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Partitionstabellen for disk %s vil nu blive skrevet p� disken!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Du skal genstarte maskinen for at aktivere �ndringerne"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
-msgstr "Udregner FAT-filsystemet gr�nser"
+msgstr "Udregner FAT-filsystemets gr�nser"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "�ndrer st�rrelsen"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+msgid "This partition is not resizeable"
+msgstr "St�rrelsen p� denne partition kan ikke �ndres"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "Det b�r laves en backup af alle data p� denne partition"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
-"Efter st�rrelse �ndrer af partition %s, alle data p� disse partitioner vil "
-"g� tabt"
+"Efter �ndring af st�rrelsen af partition %s, vil alle data p� denne "
+"partition g� tabt"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "V�lg den nye st�rrelse"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "Mb"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Opret en ny partition"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Start sektor: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "St�rrelse i Mb: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
-msgstr "Filsystem type: "
+msgstr "Filsystemstype: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Pr�ference: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
-msgstr "Denne partition kan ikke blive brugt til loopback"
+msgstr "Denne partition kan ikke bruges til loopback"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Loopback-filnavn: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
-msgstr "Fil allerede brugt af en anden loopback, v�lg en anden"
+msgstr "Filen er allerede brugt af en anden loopback, v�lg en anden fil"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "Filen findes allerede. Skal den bruges?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "V�lg fil"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1175,167 +1410,223 @@ msgstr ""
 "Kopien af partitionstabellen har ikke samme st�rrelse\n"
 "Forts�t alligevel?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
-"Plac�r en diskette i diskettedrevet\n"
+"Inds�t en diskette i diskettedrevet\n"
 "Alle data p� disketten vil blive slettet"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Fors�ger at redde partitionstabellen"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "enhed"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "niveau"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "enhedsst�rrelse"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
-msgstr "V�lg en eksisterende RAID som skal f�jes til"
+msgstr "V�lg en eksisterende RAID som skal udvides"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "ny"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
-msgstr "%s format�ring af %s mislykkedes"
+msgstr "%s formatering af %s mislykkedes"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
-msgstr "ved ikke hvordan man format�rer %s som type %s"
+msgstr "Ved ikke hvordan man formaterer %s som type %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "NFS montering mislykkedes"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "montering mislykkedes: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "fejl ved afmontering af %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
-msgstr "Monterings-stier skal begynder med /"
+msgstr "Monteringsstier skal begynde med /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Der findes allerede en partition med monterings-sti %s\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Cirkul�re monteringer %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr "Dette katalog b�r ligge p� rod-filsystemet"
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Du skal have et rigtigt filsystem (ext2, reiserfs) til dette "
 "monteringspunkt\n"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Fejl ved �bning af %s for skrivning: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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 ""
-"Der er opst�et en fejl - der kunne ikke findes nogen enheder, hvor der\n"
-"kan oprettes nye filsystemer. Unders�g venligst dit hardware for at finde\n"
+"Der er opst�et en fejl - der kunne ikke findes nogen gyldige enheder, hvor "
+"der kan oprettes nye filsystemer. Unders�g venligst din maskine for at finde "
 "�rsagen til problemet"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Du har ikke nogen partitioner!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
-msgstr "V�lg et foretrukket sprog for installation og systemets brug."
+#: ../../help.pm_.c:9
+msgid ""
+"Please choose your preferred language for installation and system usage."
+msgstr "V�lg dit foretrukne sprog til installation- og system-brug."
+
+#: ../../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 bliver n�d til at acceptere den ovenst�ende licens for at forts�tte "
+"installationen.\n"
+"\n"
+"\n"
+"Tryk venligst p� \"Accept�r\" hvis du er enig med betingelserne i licensen.\n"
+"\n"
+"\n"
+"Tryk venligst p� \"Accept�r ikke\" hvis du er uenig med betingelserne. "
+"Installationen vil stoppe uden af �ndre din\n"
+"nuv�rende konfiguration."
 
-#: ../../help.pm_.c:10
+#: ../../help.pm_.c:22
 msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "V�lg det udseende der svarer til dit tastatur fra listen ovenover"
+msgstr "V�lg den udl�gning der svarer til dit tastatur fra listen ovenover"
 
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:25
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"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 ""
+"Hvis du �nsker at andre sprog (end det du har valgt ved\n"
+"begyndelsen af installationen) skal v�re tilg�ngelige efter installationen, "
+"s� v�lg dem\n"
+"venligst fra listen ovenfor. Hvis du �nsker at v�lge dem alle s� tryk p� "
+"\"Alle\"."
+
+#: ../../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"
-"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).\n"
 "\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
-"  - 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"
+"\t* Recommanded: 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"
-"  - 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"
+"\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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 ""
-"V�lg \"Install�r\" hvis der ikke er nogen tidligere installeret\n"
-"version af Linux, eller hvis du �nsker at benytte flere distributioner\n"
-"eller versioner.\n"
-"V�lg \"Opgrad�r\" hvis du �nsker at opdatere en tidligere version af\n"
-"Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios) eller 7.0 (Air).\n"
+"V�lg venligst \"Install�r\" hvis du ikke har nogen tidligere version af "
+"Linux-Mandrake\n"
+"installeret eller du �nsker at have flere operativsystemer.\n"
 "\n"
 "\n"
-"Valgmuligheder:\n"
+"V�lg venligst \"Opdat�r\" hvis �nsker at at opdatere en allerede installeret "
+"version af Linux-Mandrake.\n"
 "\n"
-"  - Automatiseret: Hvis du aldrig har installeret Linux f�r, s� v�lg dette.\n"
-"Bem�rk:\n"
-"    Netv�rk vil ikke blive konfigureret under installationen, brug\n"
-"    'LinuxConf' til dette efter installationen er f�rdig.\n"
 "\n"
-"  - Tilpasset: Hvis du kender til Linux, har du mulighed for at v�lge, hvad\n"
-"    din maskine prim�rt skal benyttes til. Se nedenfor om detaljer.\n"
+"Afh�ngig af din viden om GNU/Linux kan du v�lge en af de f�lgende niveauer "
+"under din installation eller opdatering\n"
+"af Linux-Mandrake:\n"
 "\n"
-"  - Ekspert: Her antages det at du er ekspert i GNU/Linux og �nsker en "
-"specielt\n"
-"    \"skr�ddersyet\" installation. Du vil ogs� her f� mulighed for\n"
-"    at v�lge din maskines anvendelsesomr�de som under \"Tilpasset\"\n"
-"    Men v�r nu rigtig s�d og V�LG IKKE DETTE UDEN AT DU V�D HVAD DU G�R!\n"
+"\t* Anbefalet: hvis du aldrig har installeret et GNU/Linux operativ system "
+"s� v�lg det her. Installationen vil\n"
+"\t  v�re meget nem og du vil kun blive stillet nogen f� sp�rgsm�l.\n"
+"\n"
+"\n"
+"\t* Tilpasset: hvis du kender en del til GNU/Linux, kan du v�lge den prim�re "
+"brug (arbejdsstation, server,\n"
+"\t  udvikling) af systemet. Du kommer til at besvare 2 yderligere sp�rgsm�l "
+"end hvis du v�lger \"Anbefalet\" installation\n"
+"\t  niveau, s� det er n�dvendigt at du v�d hvordan GNU/Linux virker hvis du "
+"v�lger dette installationsniveau\n"
+"\n"
+"\n"
+"\t* Ekspert: hvis du har en god viden om GNU/Linux, kan du v�lge dette "
+"installationsniveau. Som i \"Tilpasset\"\n"
+"\t  installationsniveauet kan du v�lge den prim�re brug (arbejdsstation, "
+"server, udvikling). V�r forsigtig\n"
+"\t  f�r du v�lger dette installationsniveau. Du vil v�re i stand til at lave "
+"meget tilpassede installationer.\n"
+"\t  nogen af sp�rgsm�lene du vil blive stillet kan v�re sv�re hvis du ikke "
+"har s� et s� godt kendskab til GNU/Linux. S� lad v�re med at v�lge\n"
+"\t  dette installationsniveau, medmindre du v�d hvad du laver."
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1343,539 +1634,1216 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Valgmuligheder:\n"
 "\n"
 "  - Tilpasset: Hvis du kender til Linux, har du mulighed for at v�lge, hvad\n"
-"    din maskine prim�rt skal benyttes til. Se nedenfor om detaljer.\n"
+"    din maskine prim�rt skal benyttes til. Se nedenfor for detaljer.\n"
+"\n"
 "\n"
 "  - Ekspert: Her antages det at du er ekspert i GNU/Linux og �nsker en "
 "specielt\n"
 "    \"skr�ddersyet\" installation. Du vil ogs� her f� mulighed for\n"
 "    at v�lge din maskines anvendelsesomr�de som under \"Tilpasset\"\n"
-"    Men v�r nu rigtig s�d og V�LG IKKE DETTE UDEN AT DU V�D HVAD DU G�R!\n"
+"    Men v�r nu rigtig s�d og V�LG IKKE DETTE UDEN AT DU V�D HVAD DU G�R!"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\n"
-msgstr ""
-"Mulighederne for maskinens brug (givet at du har valgt enten\n"
-"'Tilpasset' eller 'Ekspert' som installationsklasse) er de f�lgende:\n"
-"\n"
-"  - Normal: v�lg dette hvis du regner med at bruge din maskine\n"
-"    mest til dagligdags ting (kontorarbejde, grafikmanipulation\n"
-"    og lignende). Regn ikke med at overs�ttere, udviklingsv�rkt�jer\n"
-"    og lignende er installeret.\n"
-"\n"
-"  - Udvikling: som navnet siger. V�lg dette hvis du regner med at\n"
-"    bruge maskinen f�rst og fremmest til programmeludvikling. S� vil\n"
-"    du f� en komplet samling programmel installeret til at kompilere,\n"
-"    fejls�ge og formatere kildekode, eller fremstille programpakker.\n"
-"\n"
-"  - Server: v�lg dette hvis maskinen som du installerer er beregnet\n"
-"    til at blive brugt som server. Enten en filserver (NFS eller\n"
-"    SMB, en printserver (Unix lp (Line Printer) protokol eller\n"
-"    Windows-agtig SMB udskrivning), en bemyndigelsesserver (NIS),\n"
-"    en database server og s� videre. Som s�dan, forvent ikke at\n"
-"    gimmicks (som KDE, GNOME...) installeres.\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"
-"  - Ekspert: Her antages det at du er ekspert i GNU/Linux og �nsker en "
-"specielt\n"
-"    \"skr�ddersyet\" installation. Du vil ogs� her f� mulighed for\n"
-"    at v�lge din maskines anvendelsesomr�de som under \"Tilpasset\"\n"
-"    Men v�r nu rigtig s�d og V�LG IKKE DETTE UDEN AT DU V�D HVAD DU G�R!\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 ""
+"Du skal nu definere maskinens brug. Mulighederne er:\n"
+"\n"
+"\t* Arbejdsstation: dette er det ideelle valg hvis du agter at bruge din "
+"maskine dagligt p� kontoret eller\n"
+"\t  derhjemme.\n"
+"\n"
+"\n"
+"\t* Udvikling: hvis du agter prim�rt at bruge din maskine til udvikling af "
+"software er dette et godt valg. Du\n"
+"\t  vil f� en komplet samling af software installeret til overs�ttelse, "
+"fejlfinding, formatering af kildekode eller fremstilling\n"
+"\t  af programmelpakker.\n"
+"\n"
+"\n"
+"\t* Server: hvis du agter at bruge denne maskine som en server, er dette et "
+"godt valg. Enten som en filserver (NFS eller\n"
+"\t  SMB), en print server (Unix eller Microsoft Windows stil), en login "
+"server (NIS), en database\n"
+"\t  server og s� videre. Men forvent ikke at nogen fine grafiske "
+"brugerflader (KDE, GNOME, etc.) bliver installeret."
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 vil fors�ge at lede efter �n eller flere PCI SCSI\n"
-"adaptorer. Hvis den finder nogen (eller nogle), og hvis den ved\n"
-"hvilke(n) driver(e) der skal benyttes, vil de(n) blive installeret\n"
+"DrakX vil fors�ge at lede efter PCI SCSI adapter. Hvis DrakX\n"
+"finder en SCSI adapter og hvis den v�d hvilken driver der skal benyttes, vil "
+"den blive installeret\n"
 "automatisk.\n"
 "\n"
 "\n"
-"Hvis din SCSI-adaptor sidder p� et ISA kort, eller hvis den er\n"
-"en ukendt PCI-type, eller hvis du IKKE har SCSI overhovedet, vil\n"
-"du blive spurgt om du har SCSI eller ej. Hvis du ikke har SCSI skal\n"
-"du svare \"Nej\". Hvis du har �n eller flere skal du svare \"Ja\".\n"
-"Der vil s� fremkomme en liste af muligheder, hvorfra du skal v�lge.\n"
+"Hvis du ikke har en SCSI adapter, en ISA SCSI adapter, eller en PCI "
+"SCSI-adapter\n"
+"som DrakX ikke genkender, vil du blive spurgt om du har en SCSI-adapter p� "
+"dit system.\n"
+"Hvis der ikke er nogen adapter p� systemet kan du blot klikke \"Nej\". Hvis "
+"du klikker p� \n"
+"\"Ja\" vil der blive forvist en liste af drivere, hvorfra du kan v�lge din\n"
+"specifikke adapter.\n"
 "\n"
 "\n"
-"Efter du har valgt driveren, vil DrakX sp�rge om du vil specificere\n"
-"nogle indstillingsmuligheder for den. Pr�v dog f�rst at lade driveren\n"
-"teste dit hardware selv - det virker som regel fint.\n"
+"Hvis du m�tte angive din driver manuelt, vil DrakX sp�rge om du vil\n"
+"specificere nogle indstillingsmuligheder for den. Du b�r dog lade DrakX "
+"sp�rge\n"
+"hardware'en om ops�tningen. Det virker som regel fint.\n"
 "\n"
 "\n"
-"Hvis det ikke virker fint, m� du ikke glemme de informationer om dit\n"
-"hardware, som du kan f� fra dine manualer eller fra Windows (hvis du\n"
-"har det installeret p� dit system), som anbefalet i installationsguiden.\n"
-"Det er disse ops�tninger som du skal give til driveren."
+"Hvis det ikke virker, skal du angive ops�tningsinformation til driveren.\n"
+"Se i brugervejledningen (kapitel 3, underafsnit \"Collective informations on "
+"your hardware\")\n"
+"om hj�lp med at finde informationen i maskinel-dokumentationen, fra\n"
+"fabrikantens side (hvis du har internet adgang) eller fra Microsoft Windows\n"
+"(hvis du har det p� dit system)."
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:108
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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 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"
-"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"
+"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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
 "\n"
-"- Ctrl-d  to delete a partition\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"
-"- Ctrl-m  to set the mount point\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 ""
-"P� dette sted kan du v�lge p� hvilke(n) partion(er) du vil installere\n"
-"dit Linux-Mandrake system, forudsat at partitionerne allerede er oprettet\n"
-"(fra en tidligere Linux-installation eller via et andet\n"
-"partitioneringsv�rkt�j). I modsat fald skal harddisken partitioneres.\n"
-"Denne operation g�r ud p� at inddele harddisken i din computer i flere\n"
-"logiske enheder, der hver for sig kan benyttes.\n"
+"Ved dette punkt skal du v�lge hvor du skal installere dit\n"
+"Linux-Mandrake operativsystem p� din harddisk. Hvis disken er tom eller\n"
+"et eksisterende operativsystem bruger alt pladsen p� den, bliver du n�dt "
+"til\n"
+"at partitionere den. N�r disken partioneres deles den i logiske dele\n"
+"for at g�re plads til dit nye Linux-Mandrake system.\n"
+"\n"
+"\n"
+"Fordi en partitionering normalt ikke kan fortrydes kan det godt v�re "
+"frustrende\n"
+"og skr�mmende for nybegyndere\n"
+"Denne guide forenkler denne proces. F�r du begynder se da i manualen\n"
+"og tag den tid du skal bruge.\n"
+"\n"
+"\n"
+"Du skal bruge mindst 2 partitioner. Den ene er til selve operativsystemet "
+"og\n"
+"den anden til virtuel hukommelse (ogs� kaldt Swap).\n"
 "\n"
 "\n"
-"Hvis du skal oprette nye partitioner, benyt \"Allok�r automatisk\" til\n"
-"automatisk at oprette Linux-partitionerne. Du kan v�lge hvilken harddisk\n"
-"du vil partitionere ved at klikke p� \"hda\" for den f�rste IDE-disk,\n"
-"\"hdb\" for den anden IDE-disk eller \"sda\" for den f�rste SCSI-disk\n"
-"o.s.v.\n"
+"Hvis partitionerne allerede er definerede (fra en tidlige installation eller "
+"fra\n"
+"et andet partitions-v�rkt�j), skal du bare v�lge dem for at installere dit\n"
+"Linux system\n"
 "\n"
 "\n"
-"Der er normalt to almene partitioner: rod-partitionen (/), som udg�r\n"
-"startstedet for filsystemets katalog-hierarki, og /boot, som indeholder\n"
-"alle de filer som er n�dvendige for at starte operativsystemet, n�r\n"
-"computeren t�ndes.\n"
+"Hvis partitionerne ikke er lavet endnu, bliver du n�dt til at oprette dem. \n"
+"For at g�re det, brug guiden overfor. Afh�ngig af din disks konfiguration\n"
+"er flere muligheder tilstede:\n"
 "\n"
+"\t* Brug eksisterende partitioner: guiden har fundet en eller flere Linux "
+"partitioner p� din harddisk. Hvis\n"
+"\t  du vil beholde dem, v�lg denne mulighed.\n"
 "\n"
-"N�r man har om-partitioneret en disk, kan man normalt ikke bringe\n"
-"systemet tilbage til den oprindelige situation - og normalt mister man\n"
-"alle data p� de ber�rte omr�der af disken. Derfor kan denne operation\n"
-"virke skr�mmende og stressende hvis man ikke har pr�vet det f�r.\n"
-"DiskDrake simplificerer denne operation, s�ledes at det bliver nemmere.\n"
-"L�s i dokumentationen og tag dig god tid f�r du forts�tter.\n"
 "\n"
-"Du kan n� alle mulighederne ved at bruge dit tastatur: naviger gennem "
-"partitionerne\n"
-"ved at bruge Tab og Op/Ned-pilende. N�r en partition er valgt, kan du "
-"bruge:\n"
+"\t* Slet hele disken: hvis du vil slette alle data p� alle partitioner p� "
+"denne disk og erstatte dem med\n"
+"\t  dit nye Linux-Mandrake system, kan du v�lge denne mulighed. V�r "
+"forsigtig med denne l�sning, du vil ikke v�re i\n"
+"\t  stand til at fortryde din �ndringer.\n"
 "\n"
-"- Ctrl-c  til at lave en ny partition (n�r er tom partition er valgt)\n"
 "\n"
-"- Ctrl-d  til at slette en partition\n"
+"\t* Brug den fri plads p� Windows partitionen: hvis Microsoft Windows er "
+"installeret p� din disk og bruger\n"
+"\t  al pladsen, bliver du n�dt til at lave plads til Linux. For at g�re det "
+"kan du slette dine\n"
+"\t  Microsoft Windows partitioner og data (se \"Slet hele disken\" eller "
+"\"Ekspert niveau\" ) eller �ndre st�rrelsen p�\n"
+"\t  din Microsoft Windows partition. St�rrelses�ndringen kan fortages uden "
+"tab af data. Denne l�sning er\n"
+"\t  anbefalet hvis du vil bruge b�de Linux-Mandrake og Microsoft Windows p� "
+"samme maskine.\n"
 "\n"
-"- Ctrl-m  til at s�tte monterings-stien\n"
+"\n"
+"\t  F�r du v�lger denne l�sning, b�r du forst� at st�rrelsen p� din "
+"Microsoft\n"
+"\t  Windows partition vil blive mindre. Det betyder at du vil have mindre "
+"fri plads under\n"
+"\t  Microsoft Windows til at gemme din data eller installere programmel.\n"
+"\n"
+"\n"
+"\t* Ekspert niveau: hvis du vil partitionere disken manuelt, skal du v�lge "
+"dette niveau. V�r forsigtig f�r du\n"
+"\t  v�lger denne l�sning. Det giver dig mange muligheder, men du kan ogs� "
+"nemt komme til at slette dine data. S�\n"
+"\t  lad v�re med at v�lge den l�sning med mindre du v�d hvad du g�r."
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:160
 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."
+"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"
+"\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"
 msgstr ""
-"Alle partitioner, som er blevet oprette skal formateres f�r de kan\n"
-"benyttes (formatere er det samme som at oprette et filsystem). Samtidig\n"
-"kan du v�lge at reformatere eksisterende partitioner for at slette\n"
-"de data, der m�tte ligge herp�. Bem�rk: det er ikke tvingende n�dvendigt\n"
-"at reformatere eksisterende partitioner; specielt ikke hvis de\n"
-"indeholder data du �nsker at beholde. Typisk bevares partitioner s�som\n"
-"/home og /usr/local."
+"Nu skal du v�lge hvor Linux-Mandrake skal installeres. Hvis partitionerne\n"
+"allerede er lavet (fra en tidligere installation af GNU/Linux eller fra et\n"
+"andet partitioneringsv�rkt�j), kan du bruge dem. Ellers skal partitionerne\n"
+"laves f�rst.\n"
+"\n"
+"\n"
+"For at lave partitioner, skal du f�rst v�lge en harddisk. Du kan v�lge\n"
+"harddisk der skal partitioneres ved at trykke p� \"hda\" for den f�rste IDE\n"
+"disk, \"hdb\" for den anden eller \"sda\" for den f�rste SCSI disk og s� "
+"videre.\n"
+"\n"
+"\n"
+"For at partitionere den valgte disk kan du bruge disse muligheder:\n"
+"   * Slet alt: Dette valg sletter alle partitioner p� den valgte disk.\n"
+"\n"
+"\n"
+"  * Allok�r automatisk: dette valg tillader dig automatisk at lave Ext2 og "
+"swappartitioner p� den fri plads p� din\n"
+"    disk.\n"
+"\n"
+"\n"
+"  * Red partitionstabel: hvis din partitionstabel er beskadet, kan du pr�ve "
+"at redde den med denne mulighed. V�r venligst\n"
+"    forsigtig og husk at det kan fejle.\n"
+"\n"
+"\n"
+"   * Fortryd: Du kan bruge denne mulighed for at annullere dine �ndringer.\n"
+"\n"
+"\n"
+"   * Genindl�s: Du kan bruge denne mulighed hvis du �nsker at fortryde alle "
+"�ndringer og genindl�se din oprindelige partitionstabel\n"
+"\n"
+"\n"
+"   * Guide: Hvis du �nsker at bruge guiden til at partitionere din disk, kan "
+"du bruge denne mulighed. Det er anbefalet\n"
+"     hvis du ikke har det store kendskab til partitionering.\n"
+"\n"
+"\n"
+"   * Genskab fra diskette: Hvis du har gemt din partitionstabel p� en "
+"diskette under en tidligere installation, kan du\n"
+"     genskabe den med denne mulighed.\n"
+"\n"
+"\n"
+"   * Gem p� diskette: Hvis du �nsker at gemme din partitionstabel p� en "
+"diskette, for at kunne hente den senere,\n"
+"    kan du bruge denne mulighed. Det er st�rkt anbefalet at bruge denne "
+"mulighed.\n"
+"\n"
+"   * F�rdig: n�r du er f�rdig med partitionering af din disk, s� tryk p� "
+"\"F�rdig\" for at gemme �ndringerne.\n"
+"\n"
+"\n"
+"Som oplysning kan du n� alle mulighederne ved at bruge tastaturet: navig�r "
+"gennem partitioner med Tab og Op og Ned pilene.\n"
+"\n"
+"\n"
+"N�r en partition er valgt kan du bruge:\n"
+"\n"
+"           * Ctrl-c for at lave en ny partition (N�r en tom partition er "
+"valgt)\n"
+"           * Ctrl-d for at slette en partition\n"
+"\n"
+"           * Ctrl-m for at s�tte et monteringssti"
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:218
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"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"
-"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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"\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 ""
-"Du kan nu v�lge den gruppe pakker som du �nsker at installere eller "
-"opgradere.\n"
+"Ovenfor er listet de eksisterende Linux-partitioner genkendt p� din disk.\n"
+"Du kan beholde valgene gjort af troldmanden, de er velegnede til almindelig\n"
+"brug.  Hvis du �ndrer disse valg skal du i det mindste definere en\n"
+"rod-partition '/'. Lad v�re med at v�lge en for lille partition, eller du\n"
+"vil ikke kunne installere nok programmel. Hvis du �nsker at lagre data p�\n"
+"en separat partition, skal du ogs� v�lge en '/home' (kun muligt hvis du har\n"
+"mere end �n Linux-partition).\n"
 "\n"
-"DrakX vil s� tjekke om du har nok plads til at installere dem alle. Hvis "
-"ikke, vil den advare dig om det. Hvis du �nsker at forts�tte alligevel, vil "
-"den g� videre til installationen af alle valgte grupper, men vil droppe "
-"nogle pakker af mindre interesse. P� bunden af listen kan du v�lge "
-"muligheden \"Individuel pakkevalg\"; i dette tilf�lde vil du v�re n�dt til "
-"at bladre igennem mere end 1000 pakker..."
+"\n"
+"Som oplysning er hver partition listet som f�lger: 'Navn', 'Kapacitet'.\n"
+"\n"
+"\n"
+"'Navn' er kodet som f�lger: 'drevtype', 'drevnummer', 'partitionsnummer'\n"
+"(for eksempel '/hda1').\n"
+"\n"
+"\n"
+"'drevtype' er 'hd' hvis dit diskdrev er et IDE drev, og 'sd' hvis det er\n"
+"et SCSI drev.\n"
+"\n"
+"\n"
+"'drevnummer' er altid et bogstav efter 'hd' eller 'sd'. For IDE drev:\n"
+"\n"
+"   * 'a' betyder 'hoved drev p� den prim�re IDE controller',\n"
+"\n"
+"   * 'b' betyder 'slave drev p� den prim�re IDE controller',\n"
+"\n"
+"   * 'c' betyder 'hoved drev p� den s�kund�re IDE controller',\n"
+"\n"
+"   * 'd' betyder 'slave drev p� den s�kund�re IDE controller'.\n"
+"\n"
+"\n"
+"For SCSI drev betyder 'a' det 'f�rste drev', 'b' betyder det 'andet drev', "
+"osv."
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:252
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
-"Hvis du har alle cd-erne i listen ovenover, klik Ok.\n"
-"Hvis du ikke har nogen af disse cd-er, klik Fortryd.\n"
-"Hvis kun nogen cd-er mangler, frav�lg dem, og klik s� Ok."
+"V�lg den disk du vil slette for at installere din\n"
+"nye Linux-Mandrake partition. V�r forsigtig, alle data p� disken vil g� tabt."
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:257
 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."
+"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 ""
-"De valgte pakker bliver nu installeret. Denne opgave b�r tage nogle\n"
-"f� minutter medmindre du har valgt at opgradere et eksisterende\n"
-"system. I s� fald kan det vare endnu l�ngere tid f�r opgraderingen\n"
-"starter"
+"Klik p� 'Ok' hvis du �nsker at slette alle data og\n"
+"partitioner som forefindes p� denne disk. V�r forsigtig, efter klik p� 'Ok' "
+"\n"
+"vil du *ikke* kunne redde nogen data eller partitioner p� denne disk,\n"
+"inklusive nogensomhelst data fra Windows.\n"
+"\n"
+"Klik p� 'Annull�r' for at annullere denne handling uden at tabe nogen data "
+"og\n"
+"partitioner p� denne disk."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:267
 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"
+"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"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\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"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"   * \"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 ""
-"Hvis DrakX ikke kunne finde din mus, eller hvis du vil tjekke, hvad\n"
-"DrakX har valgt, kan du se det (og eventuelt v�lge om) i listen af\n"
-"mus ovenfor.\n"
+"Mere end �n Microsoft Windows partition er blevet genkendt p� dit diskdrev.\n"
+"V�lg venligst den som du �nsker at �ndre st�rrelse p� for at kunne "
+"installere\n"
+"dit nye Linux-Mandrake operativsystem.\n"
+"\n"
+"\n"
+"Som oplysning er hver partition listet som f�lger: 'Linux navn', 'Windows "
+"navn',\n"
+"'Kapacitet'.\n"
+"\n"
+"'Linux navn' er kodet som f�lger: 'drevtype', 'drevnummer', "
+"'partitionsnummer'\n"
+"(for eksempel '/hda1').\n"
+"\n"
+"\n"
+"'drevtype' er 'hd' hvis dit diskdrev er et IDE drev, og 'sd' hvis det er\n"
+"et SCSI drev.\n"
+"\n"
+"\n"
+"'drevnummer' er altid et bogstav efter 'hd' eller 'sd'. For IDE drev:\n"
+"\n"
+"   * 'a' betyder 'hoved drev p� den prim�re IDE controller',\n"
+"\n"
+"   * 'b' betyder 'slave drev p� den prim�re IDE controller',\n"
 "\n"
+"   * 'c' betyder 'hoved drev p� den s�kund�re IDE controller',\n"
 "\n"
-"Hvis du er enig med DrakX' valg, kan du hoppe til det �nskede punkt\n"
-"ved at klikke p� det i menuen til venstre. Ellers v�lg den mus der\n"
-"passer bedst til din mus.\n"
+"   * 'd' betyder 'slave drev p� den s�kund�re IDE controller'.\n"
 "\n"
 "\n"
-"Hvis du har en seriel-mus, skal du ogs� fort�lle DrakX, hvilken port\n"
-"musen er tilsluttet."
+"For SCSI drev betyder 'a' det 'f�rste drev', 'b' betyder det 'andet drev', "
+"osv.\n"
+"\n"
+"'Windows navn' er det bogstav som dit drev har under Windows (den f�rste\n"
+"disk eller partition kaldes 'C:')."
+
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr "V�r t�lmodig. Denne handling kan tage flere minutter."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:303
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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 ""
-"V�lg venligst den korrekte port. F.eks. har COM1-porten (kendt fra MS\n"
-"Windows) navnet ttyS0 i Linux."
+"Enhver partition der netop er blevet defineret, skal formateres til brug\n"
+"(formatering betyder oprettelse af et filsystem).\n"
+"\n"
+"\n"
+"Nu kan du ogs� �nske at omformatere nogle allerede eksisterende partitioner\n"
+"for at slette de data som de indeholder. Hvis du �nsker dette, s� v�lg "
+"venligst\n"
+"de partitioner som du �nsker at formatere.\n"
+"\n"
+"\n"
+"Bem�rk venligst at det ikke er n�dvendigt at omformatere alle allerede "
+"eksisterende\n"
+"partitioner. Det er n�dvendigt at omformatere de partitioner, der "
+"indeholder\n"
+"operativsystemet (s�som '/', '/usr' og '/var', men du er ikke n�dt til at "
+"omformatere\n"
+"partitioner som du �nsker at beholde (typisk /home).\n"
+"\n"
+"\n"
+"V�r venligst forsigtig med valg af partitioner; efter formatering vil alle "
+"data\n"
+"v�re slettede, og du vil ikke kunne redde nogetsomhelst af det.\n"
+"\n"
+"\n"
+"Klik p� 'Ok' n�r du er klar til at formatere partitioner.\n"
+"\n"
+"\n"
+"Klik p� 'Annull�r' hvis du �nsker at v�lge andre partitioner til at "
+"installere\n"
+"dit nye Linux-Mandrake operativsystem."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:329
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"You may now select the group of packages you wish to\n"
+"install or upgrade.\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"
+"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 ""
+"Du kan nu v�lge den gruppe pakker som du �nsker at installere eller "
+"opgradere.\n"
+"\n"
+"\n"
+"DrakX vil s� tjekke om du har nok plads til at installere dem alle. Hvis "
+"ikke,\n"
+"vil den advare dig om det. Hvis du �nsker at forts�tte alligevel, vil den\n"
+"g� videre til installationen af alle valgte grupper, men vil droppe nogle "
+"pakker af mindre interesse. P� bunden af listen kan du v�lge\n"
+"muligheden \"Individuelt pakkevalg\"; i dette tilf�lde vil du v�re n�dt til "
+"at\n"
+"bladre igennem mere end 1000 pakker..."
+
+#: ../../help.pm_.c:341
+msgid ""
+"You can now choose individually all the packages you\n"
+"wish to install.\n"
 "\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"
+"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 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"
+"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
+"\"Toggle flat and group sorted\".\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."
+"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 ""
-"Denne sektion drejer sig om konfiguration af netv�rket (LAN) eller\n"
-"dit modem.\n"
+"Du kan nu lave individuelle valg af alle pakker du �nsker at installere.\n"
 "\n"
-"Hvis du v�lger \"LAN\" vil DrakX lede efter et Ethernetkort i din\n"
-"computer. PCI-kort burde blive fundet og initialiseret automatisk.\n"
-"P� den anden side, hvis dit netkort er af ISA-typen, virker den\n"
-"automatiske detektion normal ikke, og du skal s� v�lge en driver\n"
-"ud fra den liste som vil fremkomme.\n"
 "\n"
+"Du kan udvide eller sammenfolde tr�et ved at klikke p� indstillinger i det\n"
+"venstre hj�rne af pakke-vinduet.\n"
 "\n"
-"Ligesom for SCSI adaptorer, kan du til at starte med lade driveren\n"
-"initialisere adaptoren. Hvis dette ikke virker efter hensigten, kan\n"
-"du selv specificere driverens indstillinger ud fra de oplysninger, som\n"
-"du har fra dit hardware's dokumentation.\n"
 "\n"
+"Hvis du foretr�kker at se pakker sorteret i alfabetisk orden, klik da p� "
+"ikonen\n"
+"'Skift mellem flad og gruppesorteret'\n"
 "\n"
-"Hvis du installerer et Linux-Mandrake system p� en maskine, som er en\n"
-"del af et eksisterende netv�rk, kan netv�rksadministratoren give dig\n"
-"alle de forn�dne oplysninger (IP-adresse, netmaske and navnet p� din\n"
-"maskine). Hvis du derimod ops�tter et privat netv�rk (eksempelvis\n"
-"derhjemme) skal du selv v�lge passende adresser.\n"
+"\n"
+"Hvis du �nsker ikke at blive advaret om afh�ngigheder, klik da p� "
+"'Automatiske\n"
+"afh�ngigheder'. Hvis du g�r dette, bem�rk da at fravalg af en pakke kan\n"
+"frav�lge adskillige andre pakker som afh�nger af denne uden yderligere "
+"advarsel."
+
+#: ../../help.pm_.c:358
+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 ""
+"Hvis du har alle cd'erne i listen ovenover, klik Ok. Hvis du ikke\n"
+"har nogen af disse cd'er, klik Annull�r. Hvis kun nogen cd'er mangler, "
+"frav�lg dem,\n"
+"og klik s� Ok."
+
+# Fejl
+#: ../../help.pm_.c:363
+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"
-"Hvis du v�lger \"Opkald via modem\" kan du ops�tte din modem-forbindelse\n"
-"til Internettet. DrakX vil fors�ge at finde dit modem, men hvis dette\n"
-"ikke lykkes, skal du selv angive hvilken serielle port dit modem er\n"
-"forbundet til."
+"Please be patient."
+msgstr ""
+"Dit nye Linux-Mandrake styresystem er i f�rd med\n"
+"at blive installeret. Denne operation burde kun tage et par minutter "
+"(afh�ngig\n"
+"af den installationsst�rrelse du har valgt og hastigheden p� din maskine).\n"
+"\n"
+"\n"
+"Hav venligst t�lmodighed."
+
+#: ../../help.pm_.c:371
+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 teste din mus. Brug knapperne og hjulet for sikre\n"
+"dig at det virker. Hvis ikke, s� klik p� \"Annull�r\" og v�lg en anden\n"
+"driver."
+
+#: ../../help.pm_.c:376
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
+msgstr ""
+"V�lg venligst den korrekte port. F.eks. har COM1-porten (kendt fra MS\n"
+"Windows) navnet ttyS0 i GNU/Linux."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:380
 msgid ""
-"Enter:\n"
+"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 ""
+"Hvis du �nsker at forbinde din maskine til internettet eller\n"
+"til et lokalnetv�rk, v�lg da venligst den rigtige indstilling. T�nd "
+"venligst\n"
+"for din enhed f�r den rigtige indstilling v�lges, s� DrakX kan finde den\n"
+"automatisk.\n"
+"\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
+"Hvis du ikke har nogen forbindelse til internettet eller et lokalnetv�rk, "
+"s�\n"
+"v�lg 'Deaktiv�r netv�rk'.\n"
 "\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\n"
+"Hvis du �nsker at konfigurere netv�rket senere efter installationen, eller\n"
+"hvis du er f�rdig med at konfigurere din netv�rksforbindelse, v�lg da "
+"'F�rdig'."
+
+#: ../../help.pm_.c:393
+msgid ""
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
 "\n"
-"  - Automatic IP: If your network uses bootp or dhcp protocol, select \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+"Der blev ikke fundet noget modem. V�lg venligst hvilken port modemet sidder "
+"p�.\n"
+"\n"
+"\n"
+"Som oplysning kaldes den f�rste serielle port (hedder \"COM1\" under "
+"Microsoft\n"
+"Windows) \"ttyS0\" under Linux."
+
+#: ../../help.pm_.c:400
+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 ""
+"Du kan nu indtaste opkalds-indstillinger. Hvis du ikke v�d noget, eller "
+"ikke\n"
+"er sikker p� hvad der skal indtastes, kan de korrekte informationer f�s fra\n"
+"din internet-udbyder. Hvis du ikke indtaster DNS (navneservice) "
+"informationen\n"
+"her, vil informationen blive hentet fra din internet-udbyder ved "
+"forbindelsen."
+
+#: ../../help.pm_.c:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
 msgstr ""
-"Indtast:\n"
+"Hvis dit modem er et eksternt modem, s� t�nd det, s� DrakX kan finde det "
+"automatisk."
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr "T�nd venligst dit modem og v�lg det rigtige"
+
+#: ../../help.pm_.c:413
+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 ""
+"Hvis du ikke er sikker p� om oplysningerne ovenfor er rigtige, eller hvis\n"
+"du ikke v�d eller ikke er sikker p� hvad der skal indtastes, kan de "
+"korrekte\n"
+"informationer f�s fra din internet-udbyder. Hvis du ikke indtaster DNS\n"
+"(navneservice) informationen her, vil informationen blive hentet fra din\n"
+"internet-udbyder ved forbindelsen."
+
+#: ../../help.pm_.c:420
+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 indtaste dit v�rtsnavn. Hvis du ikke \n"
+"er sikker p� hvad du skal skrive, kan du f� de korrekte oplysninger fra din\n"
+"internet-udbyder (ISP)."
+
+#: ../../help.pm_.c:425
+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"
-"  - IP-adresse: hvis du ikke kender den, sp�rg din netv�rksadministrator.\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 ""
+"Du kan du konfigurere din netv�rksenhed\n"
 "\n"
-"  - Netmaske: \"255.255.255.0\" er normalt et godt valg. Hvis du ikke er\n"
-"sikker, sp�rg din netv�rksadministrator.\n"
+"   * IP-adresse: hvis du ikke kender den, sp�rg din netv�rksadministrator\n"
+"    Du m� ikke skrive en IP adresse hvis du v�lger \"Automatisk IP\" "
+"nedenfor.\n"
 "\n"
+"   * Netmaske: \"255.255.255.0\" er normalt et godt valg. Hvis du ikke er\n"
+"sikker, sp�rg din\n"
+"     netv�rksadministrator.\n"
 "\n"
-"  - Automatisk IP: hvis dit netv�rk anvender `bootp' eller `dhcp' "
-"protokollen,\n"
-"v�lg denne mulighed. Hvis den er valgt, skal du ikke skrive noget i feltet\n"
-"\"IP-adresse\". Hvis du ikke er sikker, sp�rg din netv�rksadministrator.\n"
+"   * Automatisk IP: hvis dit netv�rk anvender `BOOTP' eller `DHCP'  "
+"protokollen, s� v�lg denne mulighed.\n"
+"      Hvis denne mulighed er valgt, skal du ikke skrive noget i feltet\n"
+"     \"IP-adresse\". Hvis du ikke er sikker, sp�rg din netv�rksadministrator."
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+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 skive dit v�rtsnavn om n�dvendigt.\n"
+"Hvis du ikke v�d hvad du skal skrive, sp�rg din netv�rks administrator."
+
+#: ../../help.pm_.c:441
+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 skive dit v�rtsnavn om n�dvendigt\n"
+"Hvis du ikke ved hvad du skal skrive, s� efterlad det blankt."
+
+#: ../../help.pm_.c:445
 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 ""
 "Du kan nu indtaste dine opkaldsindstillinger. Hvis du ikke er sikker p�,\n"
 "hvad du skal skrive, kan du f� de korrekte oplysninger fra din\n"
-"Internet-udbyder (ISP)."
+"internet-udbyder (ISP)."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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 ""
-"Hvis du vil benytte proxyer, skal du konfigurere dem nu. Hvis du ikke\n"
-"ved, om du vil benytte proxyer, kan du sp�rge din netv�rksadministrator\n"
-"eller din Internet-udbyder (ISP)."
+"Hvis du vil benytte proxy'er, skal du konfigurere dem nu. Hvis du ikke\n"
+"ved, om du vil benytte proxy'er, kan du sp�rge din netv�rksadministrator\n"
+"eller din internet-udbyder (ISP)."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
 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 ""
 "Du har mulighed for at installere krypterings-pakker, hvis din\n"
-"Internet-forbindelse er blevet sat korrekt op. V�lg f�rst en server,\n"
+"internetforbindelse er blevet sat korrekt op. V�lg f�rst en server,\n"
 "hvorfra du vil hente pakkerne, og v�lg herefter hvilke pakker du �nsker at\n"
 "installere.\n"
 "\n"
+"\n"
 "Bem�rk, at du skal v�lge server og krypterings-pakker i overensstemmelse "
 "med\n"
 "dit lands lovgivning p� dette omr�de."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr "Du kan nu v�lge din tidszone efter hvor du bor."
+
+#: ../../help.pm_.c:465
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
-"Du kan nu v�lge din tidszone i overensstemmelse med hvor du bor.\n"
-"\n"
-"\n"
-"Linux styrer sin tid efter GMT (\"Greenwich Mean Time\") og\n"
+"GNU/Linux styrer sin tid efter GMT (\"Greenwich Mean Time\") og\n"
 "overs�tter denne tid til den lokale tid alt efter hvilken tidszone du\n"
-"har valgt"
+"har valgt.\n"
+"\n"
+"Hvis du bruger Microsoft Windows p� denne maskine, v�lg da 'nej'."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 ""
 "Du kan nu v�lge hvilke tjenester du �nsker skal startes ved opstart af "
 "maskinen.\n"
+"\n"
+"\n"
 "N�r din mus passerer over et emne kommer en lille hj�lpeballon frem\n"
 "som beskriver tjenestens rolle.\n"
 "\n"
+"\n"
 "V�r specielt varsom p� dette trin hvis du planl�gger at bruge maskinen som\n"
 "server: du vil formentlig �nske ikke at starte nogensomhelst tjeneste\n"
-"op som du ikke har brug for."
+"op som du ikke har brug for. Husk venligst at adskillige tjenester kan v�re\n"
+"farlige hvis de er aktiveret p� en server.\n"
+"V�lg som hovedregel kun de tjenester som du virkelig beh�ver."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
 msgid ""
-"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"
-"\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"
-"\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"
-"\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."
-msgstr ""
-"Linux kan h�ndtere mange forskellige slags printere. Hver af disse\n"
-"kr�ver sin egen ops�tning. Du skal do notere at printer k�en\n"
-"bruger 'lp' som det standard printer navn; S� du skal\n"
-"have en printer med s�dan et navn; men du kan give\n"
-"flere navne, separeret med '|', til en printer.\n"
-"S� hvis du foretr�kker at bruge et mere meningsflydt navn skal du\n"
-"bare putte det f�rst, f.eks: \"Min Printer|lp\".\n"
-"printeren med \"lp\" i sit navn(e) vil v�re standard printer.\n"
-"\n"
-"Hvis din printer er direkte forbundet til din computer, skal du v�lge\n"
-"\"Lokal printer\". Du skal s� angive, hvilken port din printer er\n"
-"forbundet til, og v�lge et passende printer-filter (et filter er en\n"
-"form for driver).\n"
-"\n"
-"\n"
-"Hvis du vil have adgang til en printer, som sidder p� en anden Unix\n"
-"computer, skal du v�lge \"Netv�rksprinter\". For at f� dette til at\n"
-"fungere skal du kende navnet p� Unix computeren samt navnet p�\n"
-"printerk�en p� denne computer (brugernavn og adgangskode er ikke\n"
-"n�dvendig.\n"
-"\n"
-"\n"
-"Hvis du �nsker at benytte en SMB printer (hvilket er en printer, der\n"
-"er forbundet til en Windows 9x/NT maskine), skal du angive computerens\n"
-"SMB-navn (ikke TCP/IP-navnet), og muligvis dens IP-adresse, plus\n"
-"et brugernavn, arbejdsgruppe og adgangskode kr�vet for at f� tilgang\n"
-"til printeren, og - naturligvis - navnet p� printeren. Det samme\n"
-"g�lder for en NetWare printer, bortset fra at du ikke skal angive nogen\n"
-"arbejdsgruppe."
-
-#: ../../help.pm_.c:286
-msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
-"\n"
-"\n"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"You can configure a local printer (connected to your computer) or remote\n"
+"printer (accessible via a Unix, Netware or Microsoft Windows network)."
+msgstr ""
+"Du kan konfigurere en lokal printer (siddende p� din maskine) eller en "
+"fjern\n"
+"printer (gennem et Unix, Netware eller Microsoft Windows netv�rk)."
+
+#: ../../help.pm_.c:490
+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 ""
+"Hvis du �nsker at kunne udskrive, s� v�lg venligst et af printsystemerne\n"
+"CUPS eller LPR\n"
+"\n"
+"\n"
+"CUPS er et nyt st�rkt og fleksibelt printsystem til Unix-systemer\n"
+"(CUPS betyder 'Common Unix Printing System'). Det er standard "
+"udskriftssystemet\n"
+"i Linux-Mandrake.\n"
+"\n"
+"\n"
+"LPR er det gamle udskriftssystem som blev brugt i tidligere Linux-Mandrake "
+"distributioner,\n"
+"\n"
+"\n"
+"Hvis du ikke har nogen printer, klik p� 'None'."
+
+#: ../../help.pm_.c:505
+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 kan behandle mange printertyper. Hver af disse typer kr�ver sin\n"
+"egen ops�tning.\n"
+"\n"
+"\n"
+"Hvis din printer er fysisk forbundet til din maskine, v�lg 'lokal printer'\n"
+"\n"
+"\n"
+"Hvis du �nsker at anvende en printer placeret p� en enstern Microsoft\n"
+"Windows maskine (eller p� en Unix-maskine med SMB-protokol), v�lg "
+"'SMB/Windows\n"
+"95/98/NT'"
+
+# Mangler
+#: ../../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"
+"\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 ""
+
+# Mangler
+#: ../../help.pm_.c:542
+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:567
+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 ""
+"Din printer er ikke blevet fundet. Indtast venligst navnet p� den enhed som\n"
+"den er forbundet til.\n"
+"\n"
+"\n"
+"Som oplysning er de fleste printere forbundet til den f�rste parallelle "
+"port.\n"
+"Denne kaldes '/dev/lp0' under GNU/Linux og 'LPT1' under Microsoft Windows."
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr "Du skal nu v�lge din printer i listen ovenfor."
+
+#: ../../help.pm_.c:578
+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 ""
+"V�lg venligst rettigheds-indstillinger svarende til din printer.\n"
+"Se venligst i dokumentationen hvis du ikke v�d hvad der skal v�lges her.\n"
+"\n"
+"\n"
+"Du vil kunne afpr�ve din konfiguration i det n�ste trin, og du vil kunne\n"
+"�ndre den, hvis den ikke virker som du �nsker."
+
+#: ../../help.pm_.c:585
+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 ""
 "Du kan nu angive adgangskoden for brugeren `root' (som p� dansk ofte\n"
 "kaldes `rod' eller `superbruger') p� dit Linux-Mandrake system.\n"
@@ -1885,15 +2853,19 @@ msgstr ""
 "\n"
 "`root' er systemets administrator og er den eneste bruger, der har\n"
 "rettigheder til at �ndre p� systemets ops�tning. Derfor skal du v�lge\n"
-"adgangskoden med omhu! Utilsigtet adgang til systemet `root'-konto\n"
+"adgangskoden med omhu! Utilsigtet adgang til systemets `root'-konto\n"
 "kan v�re ekstremt farlig for systemets sikkerhed, de data der ligger\n"
-"p� systemet, samt andre systemer p� netv�rket. Adgangskoden b�r v�re\n"
-"en blanding af alfanum�riske tegn og v�re mindst 8 tegn lang.\n"
-"Adgangskoden b�r *aldrig* blive skrevet ned. Du b�r dog heller ikke\n"
-"g�re adgangskoden *for* lang eller for kompliceret, idet du jo gerne\n"
-"skulle kunne huske den uden *alt* for meget besv�r."
+"p� systemet, samt andre systemer p� netv�rket.\n"
+"\n"
+"\n"
+"Adgangskoden b�r v�re en blanding af alfanumeriske tegn og v�re\n"
+"mindst 8 tegn lang. Adgangskoden b�r *aldrig* skrives ned.\n"
+"\n"
+"\n"
+"Du b�r dog heller ikke g�re adgangskoden *for* lang eller for kompliceret,\n"
+"idet du jo gerne skulle kunne huske den uden *alt* for meget besv�r."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1901,7 +2873,7 @@ msgstr ""
 "For at f� et mere sikkert system, b�r du v�lge \"Benyt skygge-fil\" og\n"
 "\"Benyt MD5-adgangkoder\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1909,7 +2881,7 @@ msgstr ""
 "Hvis dit netv�rk benytter NIS, v�lg \"Benyt NIS\". Hvis du ikke ved det,\n"
 "kan du sp�rge din netv�rksadministrator."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1952,46 +2924,44 @@ msgstr ""
 "systemet, og *kun* logge ind som rod hvis du skal foretage administrative\n"
 "handlinger eller vedligeholde systemet."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Det anbefales p� det kraftigste, at du svarer \"Ja\" her. Hvis du\n"
-"installerer Microsoft Windows p� et senere tidspunkt vil dette overskrive\n"
-"boot sektoren. Med mindre du har lavet en bootdiskette, som anbefalet,\n"
-"vil du ikke l�ngere kunne opstarte Linux."
+"Oprettelse af en opstartsdiskette er st�rkt anbefalet. Hvis du ikke kan\n"
+"starte din maskine, er det den eneste m�de at redde den uden at "
+"geninstallere alt."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
 "Du skal indikere, hvor du �nsker at placere de informationer, der er\n"
-"n�dvendige for at starte Linux op.\n"
+"n�dvendige for at starte GNU/Linux op.\n"
 "\n"
 "\n"
 "Med mindre du ved pr�cist hvad du g�r, b�r du v�lge \"F�rste sektor p�\n"
 "disken (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
 msgstr ""
 "Med mindre du ved bedre, er det s�dvanlige valg \"/dev/hda\" (F�rste\n"
-"IDE-harddisk) eller \"/dev/sda\" (f�rste SCSI-disk)."
+"IDE-disk) eller \"/dev/sda\" (f�rste SCSI-disk)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -2002,7 +2972,7 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 "LILO (LInux LOader) og Grub er systemopstartere: de kan starte\n"
-"enten Linux eller ethvert andet operativsystem op p� din maskine. \n"
+"enten GNU/Linux eller ethvert andet operativsystem op p� din maskine. \n"
 "Normalt bliver disse operativsystemer opdaget korrekt og installeret. \n"
 "Hvis dette ikke er tilf�ldet, kan du tilf�je en indgang manuelt p� \n"
 "dette sk�rmbillede. V�r forsigtig med at v�lge de rigtige parametre.\n"
@@ -2014,7 +2984,7 @@ msgstr ""
 "i dette tilf�lde vil du have brug for en opstartsdiskette for at \n"
 "kunne starte dem op!"
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -2031,12 +3001,13 @@ msgid ""
 "\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."
 msgstr ""
 "LILO's og grub hovedindstillingsmuligheder er:\n"
-"  - Opstarts-enhed: Angiver navnet p� enheden (f.eks. en harddisk "
-"partition)\n"
+"  - Opstarts-enhed: Angiver navnet p� enheden (f.eks. en disk partition)\n"
 "som indeholder opstarts-sektoren. Med mindre du selv ved bedre, b�r du "
 "v�lge\n"
 "\"/dev/hda\".\n"
@@ -2045,7 +3016,7 @@ msgstr ""
 "  - Ventetid f�r standard-styresystem skal opstartes: Angiver det antal\n"
 "tiendedele sekunder opstarteren skal vente f�r den starter det "
 "operativsystem,\n"
-"man har valgt som standard. Dette er nyttigt p� systemer, der startes\n"
+"du har valgt som standard. Dette er nyttigt p� systemer, der startes\n"
 "�jeblikkeligt fra harddisken efter tastaturet er aktiveret. Opstarteren "
 "venter\n"
 "ikke, hvis \"delay\" (ventetid) er udeladt eller sat til nul.\n"
@@ -2054,12 +3025,65 @@ msgstr ""
 "  - Video indstilling: Dette angiver den VGA-tekstindstilling som skal\n"
 "v�lges ved opstart. F�lgende v�rdier kan benyttes: \n"
 "    * normal: v�lger den normale 80x25 tegn tekstindstilling.\n"
-"    * <tal>:  benyt den til <tal> svarende tekstindstilling"
+"    * <tal>:  benyt den til <tal> svarende tekstindstilling."
+
+#: ../../help.pm_.c:680
+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 er en opstarter for SPARC: den kan starte\n"
+"enten GNU/Linux eller ethvert andet operativsystem der ligger p� din "
+"maskine. \n"
+"Normalt bliver disse operativsystemer opdaget korrekt og installeret. \n"
+"Hvis dette ikke er tilf�ldet, kan du tilf�je en indgang manuelt p� \n"
+"dette sk�rmbillede. V�r forsigtig med at v�lge de rigtige parametre.\n"
+"\n"
+"\n"
+"Du vil m�ske ogs� �nske ikke at give adgang til disse andre operativsystemer "
+"\n"
+"til nogensomhelst, i s� fald kan du slette de tilsvarende indgange. Men \n"
+"i dette tilf�lde vil du have brug for en opstartsdiskette for at \n"
+"kunne starte dem op!"
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:692
+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 ""
+"SILOs hovedindstillingsmuligheder er:\n"
+"  - Opstarts-installation: Angiv hvor du �nsker at placere informationen\n"
+"der kr�ves for at opstarte GNU/Linux. Med mindre du ved n�jagtig hvad\n"
+"du g�r, v�lg 'F�rste sektor p� drev (MBR)'\n"
+"\n"
+"\n"
+"  - Ventetid f�r standard-styresystem skal opstartes: Angiver det antal\n"
+"tiendedele sekunder opstarteren b�r vente f�r den starter det f�rste "
+"operativsystem, Dette er nyttigt p� systemer, der startes\n"
+"�jeblikkeligt fra harddisken efter tastaturet er aktiveret. Opstarteren\n"
+"venter ikke, hvis \"delay\" (ventetid) er udeladt eller sat til nul."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2071,18 +3095,18 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 "Det er nu tid til at konfigurere X-vinduessystemet, som er kernen\n"
-"i Linux' grafiske brugerflade. Til dette form�l skal du konfigurere\n"
+"i GNU/Linux' grafiske brugerflade. Til dette form�l skal du konfigurere\n"
 "dit grafikkort samt din sk�rm. De fleste af disse valg foreg�r dog\n"
 "automatisk, hvilket betyder at du normalt blot skal godkende de valg\n"
 "som er truffet :)\n"
 "\n"
 "\n"
 "N�r konfigurationen er afsluttet, vil X blive startet (medmindre du\n"
-"v�lger at lade v�re) s�ledes at du kan se om ops�tningen passer til\n"
-"dig. Hvis ikke, kan du g� tilbage og �ndre ops�tningerne s� ofte det\n"
+"beder DrakX om at lade v�re) s�ledes at du kan se om ops�tningen passer til\n"
+"dig. Hvis ikke, kan du komme tilbage og �ndre ops�tningerne s� ofte det\n"
 "m�tte v�re n�dvendigt."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2090,7 +3114,7 @@ msgstr ""
 "Hvis der er noget galt med X-konfigurationen, skal du benytte disse\n"
 "indstillingsmuligheder til at s�tte X-vinduessystem korrekt op."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2098,80 +3122,84 @@ msgstr ""
 "Hvis du fortr�kker at benytte grafisk logind, v�lg \"Ja\". Hvis ikke,\n"
 "v�lg \"Nej\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"\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"
+"\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"
+"\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."
 msgstr ""
 "Du kan nu v�lge mellem diverse indstillinger for dit system.\n"
 "\n"
-"  - Benyt harddisk optimeringer: Denne indstilling kan for�ge hastigheden\n"
-"    for operationer p� harddisken, men den b�r kun benyttes af erfarne "
-"brugere:\n"
-"    nogle fejlbeh�ftede chips�t kan �del�gge dine data, s�\n"
-"    pas p�. Bem�rk at kernen har en indbygget sortliste p� drev og\n"
-"    chips�t, men hvis du vil undg� kedelige overraskelser, s� undlad at\n"
-"    bruge denne valgmulighed.\n"
-"  - V�lg sikkerhedniveau: Du kan v�lge et sikkerhedsniveau for dit system.\n"
-"    L�s venligst i manualen for en fyldestg�rende forklaring. I korthed:\n"
-"    hvis du ikke v�d det, v�lg 'Medium' ; hvis du virkelig vil have \n"
-"    en sikker maskine, v�lg 'Paranoid' men pas p�: P� DETTE NIVEAU\n"
-"    ER ROOT LOGIN IKKE TILLADT P� KONSOLLEN! Hvis du �nsker at v�re\n"
-"    root er du n�dt til at logge ind som en bruger og s� bruge 'su'.\n"
-"    I det hele taget, regn ikke med at bruge din maskine til andet\n"
-"    end en server. Du er advaret.\n"
-"\n"
-"  - Pr�cis RAM-m�ngde, hvis p�kr�vet: desv�rre er der i dagens\n"
-"    pc-verden ingen standardmetode til at sp�rge BIOS-en om hvor \n"
-"    RAM der er i en maskine. Som f�lge deraf kan Linux i nogle\n"
-"    tilf�lde ikke korrekt detektere hele den installerede m�ngde\n"
-"    RAM. Hvis dette er tilf�ldet kan du her angive den korrekte\n"
-"    m�ngde. Bem�rk at en forskel p� 2 eller 4 Mb er ganske normalt.\n"
-"\n"
-"  - Automatisk mount af flytbare medier: Hvis du foretr�kker ikke at\n"
-"    skulle montere flytbare medier (cdrom, disketter, zip, ...) manuelt ved "
-"at skrive\n"
-"    \"mount\" og \"unmount\", kan du v�lge denne mulighed.\n"
-"\n"
-"\n"
-"  - Aktiv�r numerisk l�s p� tastaturet ved opstart: Hvis du �nsker at "
-"numlock skal v�re\n"
-"    aktiveret efter opstart, skal du v�lge denne mulighed (Bem�rk: numlock\n"
-"    kan dog stadig m�ske ikke fungere n�r du starter X)."
-
-#: ../../help.pm_.c:428
+"* Benyt harddisk optimeringer: Denne indstilling kan for�ge hastigheden for "
+"operationer p� harddisken, men den b�r \n"
+"  kun benyttes af erfarne brugere: nogle fejlbeh�ftede chips�t kan �del�gge "
+"dine data, s� pas p�. Bem�rk at \n"
+"  kernen har en indbygget sortliste p� drev og chips�t, men hvis du vil "
+"undg� kedelige overraskelser, s� undlad at \n"
+"  bruge denne valgmulighed.\n"
+"\n"
+"\n"
+"* V�lg sikkerhedniveau: Du kan v�lge et sikkerhedsniveau for dit system. L�s "
+"venligst i manualen for en fyldestg�rende \n"
+"  forklaring. I korthed: hvis du ikke ved noget, behold standarden.\n"
+"\n"
+"* Pr�cis RAM-m�ngde, hvis p�kr�vet: desv�rre er der i dagens pc-verden ingen "
+"standardmetode til at sp�rge BIOS'en om\n"
+"  hvor meget RAM der er i en maskine. Som f�lge deraf kan GNU/Linux i nogle "
+"tilf�lde ikke korrekt detektere hele den\n"
+"  installerede m�ngde RAM. Hvis dette er tilf�ldet kan du her angive den "
+"korrekte m�ngde. Bem�rk at en forskel p� 2 eller\n"
+"  4 Mb er ganske normalt.\n"
+"\n"
+"\n"
+"* Automatisk montering af flytbare medier: Hvis du foretr�kker ikke at "
+"skulle montere flytbare medier (cdrom,\n"
+"  disketter, zip) manuelt ved at skrive \"mount\" og \"unmount\", s� v�lg "
+"denne mulighed.\n"
+"\n"
+"\n"
+"* Aktiv�r numerisk l�s p� tastaturet ved opstart: Hvis du �nsker at NumLock "
+"skal v�re aktiveret efter opstart,\n"
+"  skal du v�lge denne mulighed Bem�rk venligst at man ikke b�r benytte denne "
+"indstilling p� b�rbare, og at\n"
+"  det er muligt at NumLock m�ske ikke fungerer, n�r du starter X)."
+
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2185,96 +3213,118 @@ msgstr ""
 "Hvis du �nsker at starte et andet eksisterende operativsystem, bedes du\n"
 "l�se de ekstra instruktioner."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "V�lg sprog"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "V�lg installations-metode"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Harddisk bestemmelse"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
-msgstr "Konfigurer mus"
+msgstr "Konfigur�r mus"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "V�lg tastatur"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "V�lg filsystemer"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Format�r partitioner"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "V�lg pakker til installation"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Install�r system"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
-msgstr "Konfigurer netv�rk"
-
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Kryptering"
+msgstr "Konfigur�r netv�rk"
 
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Konfigur�r tidszone"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
-msgstr "Konfigurer service"
+msgstr "Konfigur�r tjenester"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
-msgstr "Konfigurer printer"
+msgstr "Konfigur�r printer"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "S�t rod-adgangskode"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Tilf�j bruger"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Opret opstartsdiskette"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Install�r opstarter"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Konfigur�r X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Autoinstallerings-diskette"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Afslut installation"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Fejl ved l�sning af fil $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "Test venligst musen"
+
+#: ../../install_gtk.pm_.c:427
+msgid "To activate the mouse,"
+msgstr "For at aktivere musen,"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr "FLYT 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 ""
+"Noget maskinel p� din maskine skal bruge ''propriet�re'' drivere for at "
+"virke.\n"
+"Du kan finde information om dem hos: %s"
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2282,237 +3332,251 @@ msgid ""
 msgstr ""
 "Du skal have en rod partition. For at f� dette, lav en ny partition (eller "
 "v�lg en eksisterende).\n"
-"V�lg s� kommandoen \"Mount sti\" og s�t den til `/'"
+"V�lg s� kommandoen \"Monterings-sti\" og s�t den til `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Jeg kan ikke l�se din partitionstabel, den er for �delagt :(\n"
-"Jeg vil fors�ge mig med at slette de beskadigede partitioner"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "Du skal tildele en partition til Swap"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake kunne ikke l�se partitionstabellen korrekt.\n"
-"Forts�t p� eget ansvar!"
+"Du har ingen Swap partition\n"
+"\n"
+"Forts�t alligevel?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "S�ger efter rod-partition"
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Brug fri plads"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Information"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "Ikke nok fri plads til at tildele nye partitioner"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: Dette er ikke en rod-partition - v�lg venligst en anden."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "Brug eksisterende partition"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Kunne ikke finde nogen rod-partition"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "Der er ingen eksisterende partition der kan bruges"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Kan ikke benytte broadcast, uden et NIS-dom�ne"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Brug Windows partitionen til Loopback"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Fejl ved l�sning af fil $f"
+#: ../../install_interactive.pm_.c:90
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Hvilken partition vil du benytte som Linux4Win?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Der opstod en fejl, men jeg ved ikke hvordan den kan h�ndteres p� en\n"
-"p�n m�de.\n"
-"Forts�t p� eget ansvar!"
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "V�lg st�rrelserne"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Duplik�r monterings-sti %s"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Rod-partitions st�rrelse i Mb: "
 
-#: ../../install_steps.pm_.c:323
-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 ""
-"Nogle vigtige pakker blev ikke installeret rigtigt.\n"
-"Enten er dit cdrom-drev eller din cdrom fejlbeh�ftet.\n"
-"Tjek cdrom-en p� en f�rdiginstalleret maskine ved brug af \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Swap-partitions st�rrelse i Mb: "
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Velkommen til %s"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "Brug den frie plads p� Windows partitionen"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Intet tilg�ngeligt diskettedrev"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Hvilken partition �nsker du at �ndre st�rrelse p�?"
+
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "Udregner Windows filsystemet gr�nser"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "G�r til `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"Programmet til at �ndre st�rrelse p� FAT kan ikke behandle din partition, \n"
+"den f�lgende fejl opstod: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "Du skal tildele en partition til swap"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr "Din Windows partition er for fragmenteret, k�r venligst 'defrag' f�rst"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"Du har ingen swap partition\n"
+"ADVARSEL!\n"
 "\n"
-"Forts�t alligevel?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "V�lg den samlede st�rrelse som din installation m� fylde"
+"DrakX vil nu �ndre st�rrelsen p� din Windows-partition. Udvis\n"
+"forsigtighed: denne operation er farlig. Hvis du ikke allerede har gjort "
+"det, b�r du f�rst g� ud af denne installation, \n"
+"k�re scandisk under Windows (og eventuelt defrag)  og s� genstarte\n"
+"installationen. Du b�r ogs� tage en sikkerhedskopi af dine data.\n"
+"Tryk p� Ok, hvis du er helt sikker."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Total st�rrelse: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "Hvilken st�rrelse �nsker du at at beholde windows p�?"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "Version: %s\n"
+msgid "partition %s"
+msgstr "partition %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "St�rrelse: %d KB\n"
+msgid "FAT resizing failed: %s"
+msgstr "FAT st�rrelses�ndring mislykkedes: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "V�lg pakker som skal installeres"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+"Der er ingen FAT-partitioner at �ndre st�rrelse p�, eller bruge som loopback "
+"(eller ikke nok plads tilbage)"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "Slet hele disken"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Install�r"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Fjern Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Installerer"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr "Du har mere end et diskdrev, hvilken �nsker du at installere Linux p�?"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Vent venligst, "
+#: ../../install_interactive.pm_.c:156
+#, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "Alle eksisterende partitioner og deres data vil g� tabt p� drev %s"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Resterende tid "
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "Ekspert modus"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Total tid "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "Brug diskdrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Forbereder installationen"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "Brug fdisk"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "Installerer pakke %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Du kan nu partitionere %s.\n"
+"N�r du er f�rdig, s� husk at gemme med 'w'"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Forts�t alligevel?"
+#: ../../install_interactive.pm_.c:195
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Du har ikke nok fri plads p� din Windows-partition"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Der opstod en fejl ved sorteringen af pakkerne:"
+#: ../../install_interactive.pm_.c:210
+msgid "I can't find any room for installing"
+msgstr "Kan ikke finde plads til installering"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Benyt eksisterende konfiguration for X11?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "DrakX partitionerings-troldmanden fandt de f�lgende l�sninger:"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Venligst v�lg en af de f�lgende installations-m�der"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Partitionering mislykkedes: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Du har ikke nogen Windows-partitioner!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Bringer netv�rket op"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Du har ikke nok plads til Lnx4win"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Lukker netv�rket ned"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"ADVARSEL!\n"
-"\n"
-"DrakX er nu n�dt til at �ndre st�rrelsen p� din Windows-partition. Udvis\n"
-"forsigtighed: denne operation er farlig. Hvis du ikke allerede har gjort "
-"det,\n"
-"b�r du f�rst k�re scandisk (og eventuelt defrag) p� denne partition og tage\n"
-"en sikkerhedskopi af dine data.\n"
-"Tryk p� Ok, hvis du er helt sikker."
+"Der opstod en fejl, men jeg ved ikke hvordan den kan h�ndteres p� en\n"
+"p�n m�de.\n"
+"Forts�t p� eget ansvar!"
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Automatisk st�rrelses�ndring mislykkedes"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Duplik�r monterings-sti %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Hvilken partition vil du benytte som Linux2Win"
+#: ../../install_steps.pm_.c:375
+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 ""
+"Nogle vigtige pakker blev ikke installeret rigtigt.\n"
+"Enten er dit cdrom-drev eller din cdrom fejlbeh�ftet.\n"
+"Tjek cdrom'en p� en f�rdiginstalleret maskine ved brug af \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "V�lg st�rrelserne"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Velkommen til %s"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Rod-partitions st�rrelse i Mb: "
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Intet tilg�ngeligt diskettedrev"
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Swap-partitions st�rrelse i Mb: "
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "G�r til trin `%s'\n"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"Dit system har kun f� resurser. Du kan f� problemer med at installere\n"
+"Linux-Mandrake. Hvis dette sker, kan du pr�ve en tekst-baseret installation "
+"istedet.\n"
+"Dette g�res ved at trykke 'F1' ved opstart fra cdrommen, og s� skrive 'text'."
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "V�lg venligst en af de f�lgende installations-m�der"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "Den totale st�rrelse af de grupper du har valg er cirka %d Mb.\n"
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2526,7 +3590,7 @@ msgstr ""
 "En lav procentdel vil kun installere de vigtigste pakker;\n"
 "en procentdel p� 100%% vil installere alle valgte pakker."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2542,59 +3606,101 @@ msgstr ""
 "En lav procentdel vil kun installere de vigtigste pakker;\n"
 "en procentdel p� %d%% vil installere s� mange pakker som muligt."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr ""
-"Du har mulighed for at v�lge dem mere pr�cist i n�ste installationsskridt"
+"Du har mulighed for at v�lge dem mere pr�cist i n�ste installationstrin"
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Procentandel pakker til installation"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "V�lg pakker som skal installeres"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Install�r"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Automatiske afh�ngigheder"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Udvid tr�"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Sammenfold tr�"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Skift mellem flad og gruppesorteret"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "D�rlig pakke"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Navn: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Version: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "St�rrelse: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
-msgstr "Vigtigheds: %s\n"
+msgstr "Vigtighed: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Total st�rrelse: %d / %d Mb"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+"Du kan ikke v�lge denne pakke, da der ikke er nok plads tilbage til at "
+"installere den"
+
+#: ../../install_steps_gtk.pm_.c:386
+msgid "The following packages are going to be installed"
+msgstr "Den f�lgende pakke vil blive installeret"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "De f�lgende pakker vil blive afinstalleret"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Du kan ikke v�lge/frav�lge denne pakke"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Dette er en n�dvendig pakke, den kan ikke v�lges fra"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "Du kan ikke frav�lge denne pakke. Den er allerede installeret"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2602,46 +3708,89 @@ msgstr ""
 "Denne pakke skal opgraderes\n"
 "Er du sikker p� at du vil frav�lge den?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
-msgstr "Du kan ikke frav�lge denne pakke. Den skal upgraderes"
+msgstr "Du kan ikke frav�lge denne pakke. Den skal opgraderes"
 
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-"Du kan ikke v�lge denne pakke, da der ikke er nok plads tilbage til at "
-"installere det"
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "De f�lgende pakker vil blive installerede/afinstallerede"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "Du kan ikke v�lge/frav�lge denne pakke"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Installerer"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Beregner"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Vent venligst, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Resterende tid "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Total tid "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Annull�r"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Forbereder installationen"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pakker"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U Mb"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Installerer pakke %s"
+
+# Mangler
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "Accept�r"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2654,200 +3803,404 @@ msgstr ""
 "\n"
 "Inds�t cdrom'en med navnet \"%s\" i dit cdrom-drev og tryk p� Ok, n�r det "
 "gjort\n"
-"Hvis du ikke har den s� tryk p� Annuller, s� undg�s installation fra denne cd"
+"Hvis du ikke har den s� tryk p� Annull�r, s� undg�s installation fra denne cd"
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "N�gt"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Forts�t alligevel?"
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Der opstod en fejl ved sorteringen af pakkerne:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Der opstod en fejl ved installeringen af pakkerne:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Der er opst�et en fejl"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
-msgstr "Venligst v�lg det sprog, du vil bruge."
-
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+msgstr "V�lg venligst det sprog, du vil bruge."
+
+# Mangler
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr "Licensaftale"
+
+# Mangler
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
-msgstr "Venligst v�lg tastaturlayout."
+msgstr "V�lg venligst tastaturlayout."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
-msgstr ""
-"Du kan v�lge et andet sprog der vil v�re tilg�ngelig efter installationen"
+msgstr "Du kan v�lge andre sprog der vil v�re tilg�ngelig efter installationen"
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Rod-partition"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "Alt"
 
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Hvilken partition indeholder systemets rod-partition (/)?"
-
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Installationsmetode"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Hvilken installations-klasse �nsker du?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
-msgstr "Install�r/Opgrad�r"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Install/Update"
+msgstr "Install�r/Opdat�r"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr "Er dette en nyinstallation eller en opgradering?"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Is this an install or an update?"
+msgstr "Er dette en nyinstallation eller en opdatering?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Automatiseret"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Anbefalet"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Tilpasset"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Ekspert"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "Er du sikker p� at du er en ekspert? \n"
-"Det er ikke for sjov, du f�r adgang til kraftige men farlige ting her."
+"Du f�r adgang til st�rke men farlige ting her.\n"
+"Du vil blive givet sp�rgsm�l som: ``Brug skyggefil for adgangskoder?'',\n"
+"er du klar til at svare p� s�danne sp�rgsm�l?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
-msgstr "Opgrad�r"
+#: ../../install_steps_interactive.pm_.c:216
+msgid "Update"
+msgstr "Opdatering"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Normal"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "Arbejdsstation"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Udvikling"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Server"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
-msgstr "Hvilken brug vil du g�re af dit system?"
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
+msgstr "Hvad skal dit system bruges til?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
-msgstr "Venligst v�lg muse-type."
+msgstr "V�lg venligst muse-type."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Muse-port"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
-msgstr "Venligst v�lg hvilken seriel port din mus er forbundet til."
+msgstr "V�lg venligst hvilken seriel port din mus er forbundet til."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Konfigurerer PCMCIA kort..."
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "Konfigurerer IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "ingen ledige partitioner"
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr "Skanner partitioner for at finde monteringspunkter"
+
+#: ../../install_steps_interactive.pm_.c:299
+msgid "Choose the mount points"
+msgstr "V�lg monterings-stierne"
+
+#: ../../install_steps_interactive.pm_.c:316
 #, c-format
-msgid "(%dMB)"
-msgstr "(%d Mb)"
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Jeg kan ikke l�se din partitionstabel, den er for �delagt for mig :(\n"
+"Jeg kan fors�ge fortsat at udblanke d�rlige partitioner, ALLE DATA vil g� "
+"tabt\n"
+"Den anden mulighed er at forbyde DrakX at �ndre partitionstabellen.\n"
+"(fejlen er %s)\n"
+"\n"
+"Er du indforst�et med at �del�gge alle partitionerne?\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake kunne ikke l�se partitionstabellen korrekt.\n"
+"Forts�t p� eget ansvar!"
 
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Venligst v�lg hvilken partition du vil benytte som rod-partition"
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Rod-partition"
 
-#: ../../install_steps_interactive.pm_.c:198
-msgid "Choose the mount points"
-msgstr "V�lg mount stierne"
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Hvilken partition indeholder systemets rod-partition (/)?"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Du skal genstarte for at aktivere �ndringerne i partitionstabellen"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "V�lg partitioner der skal formatteres"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
-msgstr "Led efter beskadiget blokke"
+msgstr "Led efter beskadigede blokke"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
-msgstr "Format�rer partitioner"
+msgstr "Formaterer partitioner"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
-msgstr "Laver og formatere filen %s"
+msgstr "Opretter og formaterer fil %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Ikke nok swap-plads til at gennemf�re installationen, tilf�j mere"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Leder efter tilg�ngelige pakker"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Leder efter pakker som skal opgraderes"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
-"Dit system har ikke nok plads tilbage til en installation eller opgradering"
+"Dit system har ikke nok plads tilbage til en installation eller opgradering "
+"(%d > %d)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "F�rdig (%dMb)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "Minimum (%d Mb)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Anbefalet (%d Mb)"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "Tilpasset"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "V�lg den st�rrelse som du vil installere"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Valg af pakke-gruppe"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
-msgstr "Individuel pakke-valg"
+msgstr "Individuelt pakke-valg"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 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 ""
-"Hvis du har alle cd-erne i listen nedenunder, klik Ok.\n"
-"Hvis du ikke har nogen af disse cd-er, klik Fortryd.\n"
-"Hvis kun nogen cd-er mangler, frav�lg dem, og klik s� Ok."
+"Hvis du har alle cd'erne i listen nedenunder, klik Ok.\n"
+"Hvis du ikke har nogen af disse cd'er, klik Annull�r.\n"
+"Hvis kun nogen cd'er mangler, frav�lg dem, og klik s� Ok."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cdrom med etikette '%s'"
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2855,172 +4208,11 @@ msgstr ""
 "Installerer pakke %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Konfiguration efter installation"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Behold nuv�rende IP-konfiguration"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Omkonfigur�r netv�rk nu"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "S�t ikke netv�rk op"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Konfigur�r netv�rk"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Lokalnet er allerede konfigureret. �nsker du at:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "�nsker du at konfigurere LAN lokalnetv�rk til dit system"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "kunne ikke finde noget netkort"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Modem-konfiguration"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "�nsker du at konfigurere opkaldt netv�rk med modem til dit system?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Konfigurerer netv�rksenheden %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Indtast IP konfigurationen for denne maskine. Hvert felt skal udfyldes\n"
-"med en IP adresse i `dotted-decimal' notation (for eksempel 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Automatisk IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP-adresse:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Netmaske:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP adresse skal have formatet 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Konfigurerer netv�rk"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Indtast dom�nenavn, hostnavn og IP adressen for evt. ekstra navne-servere.\n"
-"Dit hostnavn skal v�re et fuldt-kvalificeret hostnavn inklusive dom�ne,\n"
-"f.eks. minpc.mitfirma.dk. Hvis du ikke har nogen ekstra navne-servere,\n"
-"s� lad navne-server-felterne v�re blanke."
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS-server"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Gateway-enhed:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Gateway:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "V�rtnavn:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Fors�g at finde et modem?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Venligst angiv hvilken seriel port dit modem er forbundet til."
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Opkaldsindstillinger"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Navn p� forbindelsen"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Logind-id"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Identifikation"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Skript-baseret"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Terminal-baseret"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Dom�nenavn"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "F�rste DNS-server"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Anden DNS server"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3062,114 +4254,119 @@ msgstr ""
 "\n"
 "ADVARSEL:\n"
 "\n"
-"Grundet forskellige krav til software der bruger kryptering og p�tvunget\n"
-"af forskellige lokale lovomr�der, b�r kunder og/eller slut brugere af\n"
-"dette software sikre sig at lokale love fra dit/jeres lokal omr�de\n"
-"tillader dig/jer at nedl�se, oplagre og/eller bruge dette software.\n"
+"Grundet forskellige krav til programmel der bruger kryptering, og p�tvunget\n"
+"af forskellige lokale lovomr�der, b�r kunder og/eller slutbrugere af\n"
+"dette programmel sikre sig at lokale love fra dit/jeres lokalomr�de\n"
+"tillader dig/jer at nedl�se, gemme og/eller bruge dette programmel.\n"
 "\n"
-"Der ud over skal kunder og/eller slut brugere v�re opm�rksom ikke at bryde\n"
-"lokal love fra dit/jeres lokal omr�de. Skulle en kunder og/eller slut\n"
-"brugere ikke respektere det lokal omr�des love, vil han/de blive udsat\n"
+"Derudover skal kunder og/eller slutbrugere v�re opm�rksomme p� ikke at "
+"bryde\n"
+"lokale love fra dit/jeres lokalomr�de. Skulle en kunde og/eller slutbruger\n"
+"ikke respektere det lokale omr�des love, vil han/de blive udsat\n"
 "for seri�se sanktioner.\n"
 "\n"
 "Under ingen omst�ndigheder kan Mandrakesoft eller dens producenter\n"
-"og/eller leverand�rer holdes ansvarlig for speciale, indirekte eller\n"
-"tilf�ldig skade (includeret, men ikke begr�nset til tab af overskud,\n"
-"forretnings afbrydelser, tab af kommerciel data og andre pekuni�re tab,\n"
-"eventuelle risikoer og erstatninger der skal betales i overensstemmelse\n"
-"med retsal beslutning) som medf�lge af brug, besiddelse eller nedl�sning af\n"
-"dette software, som kunder og/eller slut brugere kunne f� adgang til efter\n"
-"at have accepteret den aftale.\n"
+"og/eller leverand�rer holdes ansvarlig for speciel, indirekte eller\n"
+"tilf�ldig skade (inkluderet, men ikke begr�nset til tab af overskud,\n"
+"forretningsafbrydelser, tab af kommerciel data og andre pekuni�re tab,\n"
+"eventuelle risici og erstatninger der skal betales i overensstemmelse\n"
+"med retlig beslutning) som medf�lge af brug, besiddelse eller nedl�sning af\n"
+"dette programmel, som kunder og/eller slutbrugere kunne f� adgang til efter\n"
+"at have accepteret denne aftale.\n"
 "\n"
 "\n"
-"For sp�rgsm�l til denne aftale, v�r venlig at kontakte \n"
+"For sp�rgsm�l om denne aftale, v�r venlig at kontakte \n"
 "Mandrakesoft, Inc.\n"
 "2400 N. Lincoln Avenue Suite 243\n"
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "V�lg den server, hvorfra pakkerne skal hentes"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Kontakter serveren for at hente listen af tilg�ngelige pakker"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
-msgstr "Venligst v�lg pakkerne som du vil installere."
+msgstr "V�lg venligst pakkerne som du vil installere."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
-msgstr "I hvilken tidszone befinder du dig?"
+msgstr "Hvad er din tidszone?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
-msgstr "Er computerens interne ur sat til GMT?"
+msgstr "Er maskinens interne ur sat til GMT?"
+
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "Hvilket printersystem �nsker du at bruge?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Ingen adgangskode"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Benyt skygge-fil"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Benyt MD5-adgangskoder"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Benyt NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "gule sider"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
-msgstr "Dette kodeord er for nemt at g�tte(det skal min. v�re p� %d tegn)"
+msgstr "Dette kodeord er for nemt at g�tte (det skal mindst v�re p� %d tegn)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "NIS-identifikation"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS-dom�ne"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS-server"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Accept�r bruger"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Tilf�j bruger"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(har allerede tilf�jet %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3179,60 +4376,90 @@ msgstr ""
 "Indtast en bruger\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Rigtige navn"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Brugernavn"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Skal"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
-msgstr "Adgangskoden for for simpel"
+msgstr "Adgangskoden er for simpel"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Indtast venligst et brugernavn"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Brugernavnet m� kun indeholde sm� bogstaver, tal, `-' og `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Dette brugernavn eksisterer allerede"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"En tilpasset opstartsdiskette lader dig starte Linux systemet op uden at "
+"v�re\n"
+"afh�ngig af den normale opstarter. Det kan v�re nyttigt, hvis du ikke vil\n"
+"installere SILO p� dit system - eller hvis et andet operativsystem fjerner "
+"SILO,\n"
+"eller hvis SILO ikke virker med dit maskinel. En tilpasset opstartsdiskette "
+"kan\n"
+"ogs� bruges sammen med Mandrakes `rescue image', hvilket g�r det meget\n"
+"nemmere at reparere systemet i tilf�lde af systemnedbrud.\n"
+"\n"
+"Hvis du �nsker at lave en opstartsdiskette til dit system, inds�t en\n"
+"diskette i dit f�rste diskettedrev og tryk 'Ok'."
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "F�rste diskette-drev"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Andet diskette-drev"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Spring over"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3257,201 +4484,166 @@ msgstr ""
 "\n"
 "Vil du lave en opstartsdiskette til dit system?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Der er desv�rre ikke noget tilg�ngeligt diskette-drev"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "V�lg det diskette-drev, du vil benytte til at lave boot-disketten"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Inds�t en tom diskette i diskette-drevet %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Oprette opstartsdiskette"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "Installationen af LILO mislykkedes. F�lgende fejl opstod:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "�nsker du at anvende SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "SILO hovedindstillinger"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Her er de f�lgende boot muligheder i SILO.\n"
-"Du kan tilf�je flere eller �ndre de eksisterende."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Partition"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Denne m�rkat er allerede i brug"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "Installationen af SILO mislykkedes. F�lgende fejl opstod:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Forbereder opstarter"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
-msgstr "Vil du bruge \"aboot\"?"
+msgstr "�nsker du at bruge aboot?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 "Fejl ved installation af aboot, \n"
-"pr�v at forc�r installation selv hvis dette �del�gger den f�rste partition?"
+"fors�g at gennemtvinge installation selv om dette kan �del�gge den f�rste "
+"partition?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Konfiguration af proxyer"
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "Installation af opstarter mislykkedes. Den f�lgende fejl opstod:"
 
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP-proxyserver"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP-proxyserver"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy skal v�re http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy skal v�re ftp://..."
-
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Velkommen til Crackere"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Ringe"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Lav"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Mellem"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "H�j"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoid"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Diverse sp�rgsm�l"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(kan medf�re �del�ggelse af data)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Benyt harddisk optimeringer?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "V�lg sikkerhedniveau"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Pr�cis RAM-m�ngde, hvis p�kr�vet (fandt %d Mb)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Automatisk montering af flytbare medier"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Rens /tmp ved hver systemopstart"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Aktiv�r multiprofiler"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Aktiv�r numerisk l�s ved opstart"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Angiv RAM-st�rrelse i Mb"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Kan ikke bruge supermount under h�jt sikkerhedsniveau"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX vil lave konfigurerings-filer for b�de XFree 3.3 og XFree 4.0.\n"
-"Som standard bruges 3.3-serveren fordi den virker p� flere grafikkort.\n"
-"\n"
-"�nsker du at pr�ve XFree 4.0?"
+"bem�rk: I DETTE SIKKERHEDSNIVEAU ER ROOT LOGIN IKKE TILLADT!\n"
+"Hvis du �nsker at blive root, skal du logge ind som en bruger og s� bruge\n"
+"'su'. Mere generelt, forvent ikke at bruge din maskine til andet end en "
+"server\n"
+"Du er hermed advaret."
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Fors�g at finde PCI-enheder?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"V�r forsigtig, NumLock aktiveret for�rsager at en masse tasteanslag\n"
+"giver cifre i stedet for normale bogstaver (fx tastning af 'p' giver '6')"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Benyt eksisterende konfiguration for X11?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 "�nsker du at lave en auto-installations diskette til linux genskabelse?"
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Inds�t en tom diskette i drev %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Laver autoinstallations-diskette"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
-"Nogle skridt er ikke f�rdiggjort.\n"
+"Nogen dele af installationen er ikke f�rdig\n"
 "\n"
-"�nsker du virkelig at afslutte nu?"
+"Er du sikker p� du �nsker du at lukke nu?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+# Mangler
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3463,163 +4655,19 @@ msgid ""
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
-"Tillykke, installationen er komplet.\n"
-"Fjern disketten fra diskettedrevet, og tryk <enter> for at genstarte.\n"
-"\n"
-"Information om rettelser til denne udgave af Linux Mandrake findes p�\n"
-"`Errata'-siden p� http://www.linux-mandrake.com.\n"
-"\n"
-"Information om hvordan man konfigurerer systemet findes i `Post Install'\n"
-"kapitlet i \"Official Linux Mandrake Users's Guide\"."
-
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Lukker ned"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Install�rer driver for %s kort %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(modul %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Hvilken %s driver skal jeg pr�ve?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"I nogle tilf�lde kr�ver %s driveren ekstra parametre for at fungere "
-"korrekt,\n"
-"omend den normalt klarer sig fint uden. Vil du angive ekstra parametre til\n"
-"driveren, eller lade den s�ge p� din maskine efter den information den\n"
-"beh�ver? Det kan ske, at s�gningen f�r din computer til at g� i st�, men\n"
-"det vil ikke beskadige noget."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Automatisk s�gning"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Angiv parametre"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Du kan nu angive dens parametre til modul %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Du kan nu angive dens parametre til modul %s.\n"
-"Du skal benytte formatet ``navn=v�rdi navn2=v�rdi2 ...''.\n"
-"For eksempel, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Modul-parametre:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Indl�sning af modul %s mislykkedes.\n"
-"Vil du fors�ge igen med andre parametre?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Fors�g at finde PCMCIA-kort?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Konfigurerer PCMCIA-kort..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Fors�g at finde %s-enheder?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Fandt %s %s interfaces"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Har du flere?"
 
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Har du nogle %s interfaces?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Nej"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Se hardware info"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Opstarter netv�rket"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Lukker netv�rket ned"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake Installation %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> mellem elementer  | <Space> v�lger  | <F12> n�ste sk�rm "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"Du kan nu partitionere din %s disk\n"
-"N�r du er f�rdig, s� husk at gemme med 'w'"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Vent venligst"
 
@@ -3629,7 +4677,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Flertydighed (%s), v�r mere pr�cis\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "D�rligt valg, pr�v igen\n"
 
@@ -3643,475 +4691,968 @@ msgstr " ? (standard %s) "
 msgid "Your choice? (default %s) "
 msgstr "Dit valg? (standard %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Dit valg? (standard %s  skriv `none' for ingenting) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Tysk"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Finsk"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Fransk"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Britisk"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "Amerikansk"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armensk (gammel)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armensk (skrivemaskine)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
-msgstr "Armensk (fon�tisk)"
+msgstr "Armensk (fonetisk)"
+
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "Azerbaidiansk (latin)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "Azerbaidiansk (kyrillisk)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belgisk"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasiliansk"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "Hviderussisk"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Schweizisk (Tysk layout)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Schweizisk (Fransk layout)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
-msgstr "Tysk (ingen d�de knapper)"
+msgstr "Tysk (ingen d�de taster)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Dansk"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak (US)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (Norsk)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
-msgstr "Estonsk"
+msgstr "Estisk"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgisk (russisk layout)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgisk (Latin layout)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Gr�sk"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Israelsk"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
-msgstr "Israelsk (Fon�tisk)"
+msgstr "Israelsk (Fonetisk)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Iransk"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islandsk"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "Japansk 106 taster"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Latinamerikansk"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Hollandsk"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litauisk AZERTY (gammel)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litauisk AZERTY (ny)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litauisk \"talr�kke\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
-msgstr "Litauisk \"fon�tisk\" QWERTY"
+msgstr "Litauisk \"fonetisk\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Polsk (polsk layout)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Polsk (polsk layout)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Canadisk (Qu�bec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Russisk (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slovakisk"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Thailandsk"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Tyrkisk (traditionel \"F\" model)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Tyrkisk (moderne \"Q\" model)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "Amerikansk (internaltionalt)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vietnamesisk \"talr�kke\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Jugoslavisk (latin layout)"
 
-# 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
-#
-# '\206' is '�' (aring) in cp437 encoding
-# '\202' is '�' (eacute) in cp437 encoding
-# '\221' is '�' (ae) in cp437 encoding
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun-mus"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "Standard"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking-mus"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Standard"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "Hjul"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "seriel"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Standard 2-knaps mus"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Standard 3-knaps mus"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Serien (seriel)"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Serien"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech mus (seriel, gammel C7 type)"
+
+#: ../../mouse.pm_.c:64
+msgid "busmouse"
+msgstr "Busmus"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2 knapper"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3 knapper"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "ingenting"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Ingen mus"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "N�ste ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Er dette korrekt?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Internet-konfiguration"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "�nsker du at fors�ge at skabe forbindelse til internettet nu?"
+
+#: ../../netconnect.pm_.c:101
+msgid "Testing your connection..."
+msgstr "Tester din forbindelse..."
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Du er ikke forbundet til internettet nu."
+
+#: ../../netconnect.pm_.c:107
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+"Det lader ikke til at dit system har forbindelse til internettet.\n"
+"Pr�v at omkonfigurere din forbindelse."
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "ISDN konfiguration"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"V�lg din udbyder.\n"
+" Hvis de ikke er i listen, v�lg Ikke listet"
+
+#: ../../netconnect.pm_.c:158
+msgid "Connection Configuration"
+msgstr "Forbindelses-konfiguration"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "Udfyld eller mark�r venligst feltet nedenunder"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "Kort IRQ"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "Kort mem (DMA)"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "Kort IO"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "Kort IO_0"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "Kort IO_1"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "Dit personlige telefonnummer"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "Navn p� udbyder (f.eks. tilbyder.net)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Udbyders telefonnummer"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "Udbyder DNS 1"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "Udbyder DNS 2"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "Opringningsm�de"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "Konto login (brugernavn)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Kodeord for konto"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Bekr�ft kodeord"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "Europa"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Europa (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "Resten af verden"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "Resten af verden - ingen D-kanal (lejet linje)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "Hvilken protokol �nsker du at bruge?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "Det ved jeg ikke"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "Hvad slags kort har du?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "Forts�t"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "Afbryd"
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
 "\n"
+"Hvis du har et ISA kort burde v�rdiene i n�ste billede v�re rigtige.\n"
+"\n"
+"Hvis du har et PCMCIA kort skal du vide irq og io for kortet.\n"
+
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "Hvilket er dit ISDN-kort?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "Jeg har fundet et ISDN-kort:\n"
+
+#: ../../netconnect.pm_.c:287
+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 ""
+"Jeg har opdaget et ISDN PCI-kort, men jeg ved ikke hvilken type. V�lg "
+"venligst et PCI-kort i n�ste sk�rmbillede."
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr "Ingen ISDN PCI-kort fundet. V�lg venligst �t i n�ste sk�rmbillede."
+
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+"Der blev ikke fundet nogen ethernet netv�rksadapter p� dit system.\n"
+"Kan ikke s�tte denne forbindelsetype op."
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "V�lg netv�rksgr�nsesnit"
+
+#: ../../netconnect.pm_.c:336
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"V�lg venligst hvilken netv�rksadapter du �nsker at bruge til at lave "
+"forbindelse til internettet med."
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "Netv�rksgr�nsesnit"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
+"\n"
+"Do you agree?"
 msgstr ""
-"Velkommen til LILO -  operativsystem v�lgeren!\n"
 "\n"
-"For at f� en liste med valgmulig, tast <TAB>.\n"
+"Er du enig?"
+
+#: ../../netconnect.pm_.c:352
+msgid "I'm about to restart the network device:\n"
+msgstr "Jeg er ved at genstarte netv�rksenheden:\n"
+
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "ADSL Konfiguration"
+
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "�nsker du at starte din forbindelse ved opstart?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Fors�g at finde et modem?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Angiv venligst hvilken seriel port dit modem er forbundet til."
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Opkaldsindstillinger"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Navn p� forbindelsen"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Login id"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Identifikation"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Skript-baseret"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Terminal-baseret"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Dom�nenavn"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "F�rste DNS-server"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Anden DNS server"
+
+#: ../../netconnect.pm_.c:582
+msgid ""
 "\n"
-"For at starte �n af dem skal du skrive navnet og tast <ENTER>. Du kan ogs�\n"
-"vente %d sekunder for at starte det system du har valgt som standard.\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr ""
 "\n"
+"Du kan lave forbindelse til internettet eller omkonfigurere din forbindelse."
 
-# 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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Velkommen til GRUB styresystemsv�lgeren!"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr ""
+"\n"
+"Du kan genkonfigurere din forbindelse"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "Brug tasterne %c og %c til at v�lge hvilken mulighed er fremh�vet."
+#: ../../netconnect.pm_.c:582
+msgid "You are not currently connected to Internet."
+msgstr "Du er ikke forbundet til internettet nu."
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Tryk 'enter' for at starte det valgte OS, 'e' for at redigere"
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
+"\n"
+"Du kan lukke forbindelsen til internettet eller genkonfigurere din "
+"forbindelse."
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "kommandoerne f�r opstart, eller 'c' for en kommandolinie."
+#: ../../netconnect.pm_.c:586
+msgid "You are currently connected to internet."
+msgstr "Du har forbindelse til internettet nu."
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Den fremh�vede mulighed vil blive startet automatisk om %d sekunder."
+#: ../../netconnect.pm_.c:590
+msgid "Connect to Internet"
+msgstr "Lav forbindelse til internettet"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "Ikke nok plads i /boot"
+#: ../../netconnect.pm_.c:592
+msgid "Disconnect from Internet"
+msgstr "Luk forbindelse til internettet"
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Skrivebord"
+#: ../../netconnect.pm_.c:594
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Konfigur�r netv�rks forbindelse (LAN eller internet)"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Start menu"
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "Internetforbindelse & -konfiguration"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun-mus"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr ""
+"Jeg er ved at genstarte netv�rksenheden @netc->{NET_DEVICE}. Er du enig?"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB-mus"
+#: ../../netconnect.pm_.c:641
+msgid "Configure a normal modem connection"
+msgstr "Konfigur�r en normal modem forbindelse"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB-mus (2 knapper)"
+#: ../../netconnect.pm_.c:661
+msgid "Configure an ISDN connection"
+msgstr "Konfigur�r en ISDN forbindelse"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB-mus (3+ knapper)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Internt ISDN-kort"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB-mus"
+#: ../../netconnect.pm_.c:668
+msgid "External ISDN modem"
+msgstr "Eksternt ISDN modem"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB-mus (2 knapper)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "Lav forbindelse til internettet"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB-mus (Mere end 3 knapper)"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "Hvad slags type er din ISDN-forbindelse?"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Standard-mus (PS/2)"
+#: ../../netconnect.pm_.c:691
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Konfigur�r en DSL (eller ADSL) forbindelse"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (PS/2)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "Frankrig"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Standard 3-knaps mus (PS/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "Andre lande"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "I hvilket land er du ?"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "Alcatel modem"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking-mus (PS/2)"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "ECI modem"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "Hvis dit ADSL modem er en Alcatel, v�lg Alcatel. Ellers ECI."
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "brug pppoe"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "brug ikke pppoe"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"Den mest almindelige m�de at forbinde med ADSL er DHCP + pppoe.\n"
+"Men der findes nogen forbindelser der kun bruger DHCP. Hvis du ikke ved "
+"noget, v�lg 'brug pppoe'"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:765
+msgid "Configure a cable connection"
+msgstr "Konfigur�r en kabel forbindelse"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI bus.mus"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"Hvilken DHCP klient �nsker du at bruge?\n"
+"Standard er dhcpd"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft bus-mus"
+#: ../../netconnect.pm_.c:800
+msgid "Disable Internet Connection"
+msgstr "Deaktiv�r internet forbindelse"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech bus-mus"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "Konfigur�r lokalnetv�rk"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB-mus"
+#: ../../netconnect.pm_.c:815
+msgid "Network configuration"
+msgstr "Netv�rks konfiguration"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB-mus (3 knapper eller mere)"
+#: ../../netconnect.pm_.c:816
+msgid "Do you want to restart the network"
+msgstr "�nsker du at genstarte netv�rket"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Ingen mus"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "Deaktiv�r netv�rk"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev. 21A eller h�jere (seriel)"
+#: ../../netconnect.pm_.c:834
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Konfigur�r internettet forbindelse eller lokalnetv�rk"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Serien (seriel)"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"Lokalnet er allerede konfigureret.\n"
+"�nsker du at:"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (seriel)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "Hvordan vil du lave forbindelse til internettet?"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (seriel)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Konfigur�r netv�rk"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (seriel)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
+"Nu da din internetforbindelse er konfigureret,\n"
+"kan din maskine blive konfigureret til at dele sin internetforbindelse.\n"
+"Info: Du skal bruge en ekstra netv�rks adapter for at s�tte et lokalnet op "
+"(LAN).\n"
+"\n"
+"�nsker du at ops�tte deling af internetforbindelsen?\n"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (seriel)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "kunne ikke finde noget netkort"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Serien (seriel)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Konfigurerer netv�rk"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (seriel)"
+#: ../../network.pm_.c:274
+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 ""
+"Indtast venligst v�rtsnavn hvis du kender det.\n"
+"Nogle DHCP-servere kr�ver v�rtsnavnet for at fungere.\n"
+"Dit v�rtsnavn b�r v�re et fuldt kvalificeret v�rtsnavn,\n"
+"fx 'minpc.mitfirma.dk'."
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech mus (seriel, gammel C7 type)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "V�rtsnavn"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (seriel)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+"ADVARSEL: Denne enhed er allerede blevet konfigureret til at lave "
+"forbindelse til internettet.\n"
+"Ved kun at trykke p� OK beholder du den nuv�rende konfiguration.\n"
+"�ndringer i felterne nedenunder vil overskrive denne konfiguration."
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Standard-mus (seriel)"
+#: ../../network.pm_.c:302
+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 ""
+"Indtast IP konfigurationen for denne maskine. Hvert felt skal udfyldes\n"
+"med en IP adresse i `dotted-decimal' notation (for eksempel 1.2.3.4)."
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft kompatibel (seriel)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Konfigurerer netv�rksenheden %s"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Standard 3-knaps mus (seriel)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Automatisk IP"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (seriel)"
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "IP-adresse"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Er dette korrekt?"
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "Netmaske"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP adresse skal have formatet 1.2.3.4"
+
+#: ../../network.pm_.c:341
+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 ""
+"Indtast dom�nenavn, v�rtsnavn og IP adressen for evt. ekstra navne-servere.\n"
+"Dit v�rtsnavn skal v�re et fuldt kvalificeret v�rtsnavn inklusive dom�ne,\n"
+"f.eks. minpc.mitfirma.dk. Hvis du ikke har nogen ekstra navne-servere,\n"
+"s� lad navne-server-felterne v�re blanke."
+
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "DNS server"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "Gateway"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "Gateway enhed"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "Konfiguration af proxy"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP-proxyserver"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP-proxyserver"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy skal v�re http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy skal v�re ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr "Udvidet partition ikke underst�ttet p� denne platform"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 ""
-"Du har plads tilovers i din partitionstabel, som jeg kan ikke udnytte det.\n"
+"Du har plads tilovers i din partitionstabel, men jeg kan ikke udnytte det.\n"
 "Den eneste l�sning er at flytte dine prim�re partitioner, s�ledes at\n"
-"\"hullet\" bliver placeret ved siden af en `extended' partition."
+"\"hullet\" bliver placeret ved siden af de `extended' partitioner."
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fejl ved l�sning af filen %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Genskabning fra fil %s mislykkedes: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Fejl i sikkerhedskopien"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Fejl ved skrivning til fil %s"
@@ -4122,7 +5663,7 @@ msgstr "obligatorisk"
 
 #: ../../pkgs.pm_.c:21
 msgid "must have"
-msgstr "m� have"
+msgstr "skal have"
 
 #: ../../pkgs.pm_.c:22
 msgid "important"
@@ -4145,45 +5686,54 @@ msgstr "interessant"
 msgid "maybe"
 msgstr "m�ske"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (vigtigt)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (meget rart)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (rart)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Vis mindre"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Vis mere"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Lokal printer"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "Netv�rksprinter"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "Fjern printer"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "Fjern CUPS server"
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "Fjern lpd server"
+
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "Netv�rksprinter (sokkel)"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "Printer-enheds URI"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
-msgstr "Detekterer enheder..."
+msgstr "Detektere enheder..."
 
 #: ../../printerdrake.pm_.c:19
 msgid "Test ports"
@@ -4194,48 +5744,48 @@ msgstr "Afpr�v porte"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "En printer, model \"%s\" er blevet fundet p� "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Lokal Printer"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
-"Hvilken enhed er printeren koblet til \n"
+"Hvilken enhed er printeren forbundet til \n"
 "(bem�rk at /dev/lp0 er det samme som LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Printer-enhed"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
-msgstr "Parametre til lpd"
+msgstr "Parametre til fjern lpd"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 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."
 msgstr ""
-"For at bruge en lpd printerk� p� en anden maskine skal du angive navnet\n"
+"For at bruge en lpd printer k� p� en anden maskine skal du angive navnet\n"
 "p� den anden maskine og k�en som jobbet skal l�gges i."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Eksternt maskinnavn"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Eksternt k�navn"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT)-printer indstillinger"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4249,27 +5799,27 @@ msgstr ""
 "k�navnet for printeren, brugernavn, adgangskode og information for\n"
 "arbejdsgruppen."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "SMB-serverv�rt"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "SMB-serverens IP"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Dele-navn"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Arbejdsgruppe"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "NetWare printer-parametre"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4278,133 +5828,157 @@ msgid ""
 msgstr ""
 "For at skrive til en NetWare printer skal du angive navnet p� NetWare\n"
 "printerserveren (bem�rk at dette navn kan v�re forskelligt fra\n"
-"TCP/IP-navnet!) s� vel som k�navnet for den printer du vil benytte\n"
+"TCP/IP-navnet!) s�vel som k�navnet for den printer du vil benytte\n"
 "og et brugernavn samt en adgangskode."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Printer-server"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Printerk�-navn"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "Sokkel-printer-parametre"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"For at udskrive til en sokkel-printer skal du oplyse\n"
+"v�rtsnavnet p� printeren og eventuelt port-nummeret."
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "printer-v�rtsnavn"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr "Du kan direkte angive URI-en til at tilg� printeren via CUPS."
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Hvilken slags printer har du?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "�nsker du at teste udskrift?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Udskriver testside(r)..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"Testsider er blevet sendt til printerd�monen.\n"
+"Dette kan tage lidt tid f�r printeren starter.\n"
+"Udskrivningsstatus:\n"
+"%s\n"
+"\n"
+"Fungerer det korrekt?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"Testsider er sendt til printer-d�monen.\n"
+"Dette kan tage lidt tid f�r printeren starter.\n"
+"Fungerer det korrekt?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Ja, udskriv ASCII-testside"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Ja, udskriv PostScript-testside"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Ja, udskriv begge testsider"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Konfigur�r printer"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Hvilken slags printer har du?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "printer-valg"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Papirst�rrelse"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Skift side efter opgave?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Valgmuligheder for Uniprint driver"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Valgmuligheder for farvedybde"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Udskriv tekst som PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Omvendt sideorden"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Ordn trappetrins-tekst?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Antal sider per udskriftsside"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "H�jre/venstre margener i punkter (1/72 tomme)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Top/bund margener i punkter (1/72 tomme)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Ekstra valgmuligheder til GhostScript"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Ekstra valgmuligheder til tekst"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "�nsker du at teste udskrift?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Udskriver testside(r)..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"Testsider er blevet sendt til printerd�monen.\n"
-"Dette kan tage lidt tid f�r printeren starter.\n"
-"Udskrivningsstatus:\n"
-"%s\n"
-"\n"
-"Fungerer det korrekt?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"Testsider er sendt til printer-d�monen.\n"
-"Dette kan tage lidt tid f�r printeren starter.\n"
-"Fungerer det korrekt?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Printer"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Vil du gerne konfigurere en printer?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4412,19 +5986,66 @@ msgstr ""
 "Her er f�lgende printk�.\n"
 "Du kan tilf�je flere eller �ndre de eksisterende."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "CUPS starter"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr "L�ser CUPS driver database..."
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "V�lg printer-forbindelse"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Hvordan er printeren tilsluttet?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "V�lg fjern printer forbindelse"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+"Med en fjern CUPS server beh�ver du ikke at konfigurere\n"
+"nogen printere; printere vil automatisk blive fundet.\n"
+"Hvis du er i tvivl, s� v�lg \"Fjern CUPS server\"."
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Fjern k�"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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 ""
+"Hver printer beh�ver et navn (fx lp)\n"
+"Andre parametre s�som beskrivelse af printeren eller dens placering\n"
+"kan defineres. Hvilket navn skal bruges for denne printer, og hvordan\n"
+"er printeren forbundet til?"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "Navn p� printer"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "Placering"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4435,85 +6056,86 @@ msgstr ""
 "navn (ofte lp) og et mellemlagringskatalog knyttet til det. Hvilket\n"
 "navn og katalog skal bruges til denne k�, og hvordan er k�en forbundet?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "k�navn"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Mellemlagrings-katalog"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Printer-forbindelse"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Kan ikke tilf�je en partition til _format�ret_ RAID md%d"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Kan ikke skrive filen $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid fejlede"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid fejlede (m�ske mangler raidtools?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ikke nok partitioner til at benytte RAID level %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron en periodisk kommando planl�gger"
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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 er brugt til at overv�ge batteri status og skrive log til syslog.\n"
+"apmd bruges til at overv�ge batteristatus og skrive log til syslog.\n"
 "Den kan ogs� bruges til at lukke maskinen n�r batteriet er p� lav."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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 ""
-"K�rer planlagte kommandoer med 'at' kommandoen p� tiden specificerede da\n"
-"'at' var k�rt, og k�rer batch kommandoer n�r den gennemsnitlige system \n"
-"belastning er lav nok"
+"K�rer planlagte kommandoer med 'at' kommandoen p� tiden specificeret da\n"
+"'at' blev k�rt, og k�rer batch kommandoer n�r den gennemsnitlige\n"
+"systembelastning er lav nok"
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 er et standard UNIX program der k�rer bruge-specifikke programmer\n"
-"p� planlagte tidspunkter. Vixie cron tilf�jer en del forbedringer.UNIX cron, "
-"inkludere bedre sikkerhed og st�rkere konfiguration muligheder."
+"cron er et standard UNIX program der k�rer bruger-specifikke programmer\n"
+"p� planlagte tidspunkter. Vixie cron tilf�jer en del forbedringer til\n"
+"den basale UNIX cron, inklusive bedre sikkerhed og st�rkere "
+"konfigurationsmuligheder."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 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 tilf�jer muse support til tekst-baseret Linux applikationer\n"
-"s� som Midnight Commander. Den tillader muse-baseret konsol kopi-og-s�tind "
+"GPM tilf�jer muse-support til tekst-baserede Linux applikationer\n"
+"s�som Midnight Commander. Den tillader muse-baseret konsol kopi-og-s�tind "
 "operationer\n"
-"og inkludere support for pop-op-menuer i konsollen."
+"og inkluderer support for pop-op-menuer i konsollen."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4521,7 +6143,7 @@ msgstr ""
 "Apache er en webserver.  Den bruges til at betjene HTML-filer\n"
 "og CGI."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4530,31 +6152,33 @@ msgid ""
 "disables\n"
 "all of the services it is responsible for."
 msgstr ""
-"Internet superserveren d�monen (kaldt inetd) starte forskellige\n"
-"Internet servicer efter behov. Den er ansvarlig for at starte servicersom\n"
-"telnet, ftp, rsh og rlogin. Hvis inetd lukkes, lukkes alle de servicer\n"
+"Internet superserver-d�monen (kaldet inetd) starter forskellige\n"
+"internet tjenester efter behov. Den er ansvarlig for at starte tjenester "
+"som\n"
+"telnet, ftp, rsh og rlogin. Hvis inetd deaktiveres, deaktiveres alle de "
+"tjenester,\n"
 "den er ansvarlig for."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 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 ""
-"Denne pakke indl�ser den valgte keyboard oversigt,\n"
-"som valgt i /etc/sysconfig/keyboard. Dette kan blive valgt i kbdconfig "
+"Denne pakke indl�ser den valgte tastatur-tabel,\n"
+"som valgt i /etc/sysconfig/keyboard. Dette kan v�lges i kbdconfig "
 "programmet.\n"
 "Dette b�r v�re sl�et til p� de fleste maskiner."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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 er printer d�monen som er n�dvendig for at lpr virker�.\n"
-"Den er basalt en server der h�ndtere print jobs."
+"lpd er printer-d�monen som er n�dvendig for at lpr virker�.\n"
+"Den er basalt en server der h�ndterer udskrifts-opgaver."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4562,7 +6186,7 @@ msgstr ""
 "named (BIND) er en dom�ne-navneserver (DNS) der bruges til\n"
 "opslag af navne til IP-adresser."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4570,33 +6194,33 @@ msgstr ""
 "Monterer og afmonterer alle netv�rks filsystemer (NFS),\n"
 "SMB (LanManager/Windows) og NCP (NetWare) monterings-stier"
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
-"Aktivere/Deaktivere alle netv�rks-kort som er konfigureret\n"
+"Aktiverer/deaktiverer alle netv�rks-kort som er konfigureret\n"
 "til at starte ved opstart"
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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 er en popul�r protokol til fil deling over TCP/IP netv�rk.\n"
-"Denne service giver NFS-serverfunktionalitet, som konfigureres gennem\n"
+"NFS er en popul�r protokol til fildeling over TCP/IP netv�rk.\n"
+"Denne tjeneste giver NFS-serverfunktionalitet, som konfigureres gennem\n"
 "/etc/exports filen"
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
-"NFS er en popul�r protokol til fil deling over TCP/IP\n"
-"netv�rk. Denne service giver NFS file l�snings funktionalitet"
+"NFS er en popul�r protokol til fildeling over TCP/IP\n"
+"netv�rk. Denne service giver NFS fill�snings funktionalitet"
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4604,139 +6228,300 @@ msgid ""
 "it installed on machines that don't need it."
 msgstr ""
 "PCMCIA underst�ttelse er normalt til at underst�tte ting som\n"
-"ethernet og modemer in b�rbare.  Den vil ikke blive startet medmindre den "
+"ethernet og modemer p� b�rbare.  Den vil ikke blive startet medmindre den "
 "er\n"
-"konfigureret, s� det er sikkert at have den installeret p� maskinen der "
+"konfigureret, s� det er sikkert at have den installeret p� maskiner der "
 "ikke\n"
 "har behov for den."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 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 h�ndtere RPC tilslutninger, som bliver brugt af\n"
-"protokoller som  NFS og NIS. Portmap serveren skal k�re p� maskiner som\n"
+"Portmapper h�ndterer RPC tilslutninger, som bliver brugt af\n"
+"protokoller som NFS og NIS. Portmap serveren skal k�re p� maskiner som\n"
 "bruger protokoller der udnytter RPC mekanismen"
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr ""
-"Postfix er Post transport agent, som bruges af programmer der\n"
+"Postfix er en Post transport agent, som bruges af programmer der\n"
 "flytter post fra en maskine til en anden."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
 "Gemmer og henter system entropi p�l for en h�jre kvalitet\n"
-"af tilf�ldig nummer generering"
+"af generering af tilf�ldige tal."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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 d�monen giver mulighedden for automatisk IP rute tabel opdatering\n"
-"via RIP protokollen. RIP kan bruges til sm� network, men n�r det kommer til\n"
+"Routed d�monen giver mulighed for automatisk IP rutetabel opdatering\n"
+"via RIP protokollen. RIP kan bruges til sm� netv�rk, men n�r det kommer til\n"
 "mere komplekse netv�rk er der behov for en mere kompleks protokol."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
 "rstat protokollen tillader brugere p� et netv�rk at\n"
-"hente system information fra enhver maskine p� det netv�rket."
+"hente systeminformation fra enhver maskine p� dette netv�rk."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
-"rusers protokollen tillader brugere p� et netv�rk at identificer\n"
+"rusers protokollen tillader brugere p� et netv�rk at identificere\n"
 "hvem der er logget p� andre maskiner"
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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 protokollen tillader fjerne brugere a hente en liste over alle\n"
-"brugere der er logget ind i en maskine, der k�rer rwho d�monen (minder om "
+"rwho protokollen tillader fjerne brugere at hente en liste over alle\n"
+"brugere der er logget ind p� en maskine, der k�rer rwho d�monen (minder om "
 "finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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 er en faciliteter som mange d�moner bruger til log beskeder\n"
-"Det er en god ide at altid k�re syslog"
+"Syslog er en facilitet som mange d�moner bruger til log beskeder\n"
+"Det er en god id� altid at k�re syslog"
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
-msgstr "Denne opstarts fil pr�ver at indl�se modulet til din USB-mus"
+msgstr "Denne opstartsfil pr�ver at indl�se modulet til din USB-mus"
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
-msgstr "Starter og stopper X-skriftserveren ven opstart samt nedlukning."
+msgstr "Starter og stopper X-skrifttypeserver ved opstart samt nedlukning."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
-msgstr "V�lg hvilke servicer der skal startes automatisk ved opstart"
+msgstr "V�lg hvilke tjenester der skal startes automatisk ved opstart"
 
-# 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 suggested that for non latin languages an ascii
-# transliteration be used; or maybe the English text be used; as it is best
-#
-# '\206' is '�' (aring) in cp437 encoding
-# '\202' is '�' (eacute) in cp437 encoding
-# '\221' is '�' (ae) in cp437 encoding
-#
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Velkommen til SILO -  styresystem-v��lgeren!\n"
-"\n"
-"For at f�� en liste med valgmulig, tast <TAB>.\n"
-"\n"
-"For at starte �n af dem skal du skrive navnet og tast RETUR>.\n"
-"Du kan ogs�� vente %d sekunder for at starte det system du har valgt som "
-"standard.\n"
-"\n"
+"Jeg kan ikke l�se din partitionstabel, den er for �delagt :(\n"
+"Jeg vil fors�ge mig med at slette de beskadigede partitioner"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Konfigur�r LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Opret opstartsdiskette"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
-msgstr "Format�r diskette"
+msgstr "Formater diskette"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Valg"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "Installationen af LILO mislykkedes. F�lgende fejl opstod:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Deling af internetforbindelse er sl�et til"
+
+# Mangler
+#: ../../standalone/drakgw_.c:104
+#, fuzzy
+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 "Indstilling af deling af internetforbindelse er allerede gjort.\n"
+
+# Mangler
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+msgid "disable"
+msgstr ""
+
+# Mangler
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+msgid "reconfigure"
+msgstr "genkonfigurer"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Deling af internetforbindelse er sl�et fra"
+
+# Mangler
+#: ../../standalone/drakgw_.c:123
+#, fuzzy
+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 "Indstilling af deling af internetforbindelse er allerede gjort.\n"
+
+# Mangler
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Tabel"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "Indhold i konfigurations filen kunne ikke blive fortolket."
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "Deling af internetforbindelse"
+
+# Mangler
+#: ../../standalone/drakgw_.c:152
+#, fuzzy
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+"Nu da din internetforbindelse er konfigureret,\n"
+"kan din maskine blive konfigureret til at dele sin internetforbindelse.\n"
+"Info: Du skal bruge en ekstra netv�rks adapter for at s�tte et lokalnet op "
+"(LAN).\n"
+"\n"
+"�nsker du at ops�tte deling af internetforbindelsen?\n"
+
+#: ../../standalone/drakgw_.c:177
+msgid "using module"
+msgstr "bruger modul"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "Ikke nogen netv�rksadapter i dit system!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Ingen ethernet netv�rksadapter er blevet fundet p� dit system. K�r venligst "
+"v�rkt�jet til maskinel konfiguration."
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"Der er kun en konfigureret netv�rksadapter i dit system:\n"
+"\n"
+"$interface\n"
+"\n"
+"�nsker du at ops�tte dit lokalnet med denne adapter?"
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"V�lg venligst hvilken netv�rksadapter som skal forbindes\n"
+"til dit lokalnet."
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"Advarsel, netv�rksadapteren er allerede konfigureret.\n"
+"Vil du gerne omkonfigurere?"
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr "Mulig LAN-adresse konflikt fundet i konfigurationen til $_!\n"
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "Brandmurkonfiguration genkendt!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+"Advarsel! En eksisterende brandmurkonfiguration er blevet fundet. Du skal "
+"muligvis lave manuelle rettelser efter installationen. Forts�t?"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "Konfigurerer skript, installerer programmel, starter servere..."
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring..."
+msgstr "Konfigurere..."
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "Kunne ikke installere ipchains RPM med urpmi."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "Kunne ikke installere dhcp RPM med urpmi."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "Kunne ikke installere linuxconf RPM med urpmi."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "Kunne ikke installere bind RPM med urpmi."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "Kunne ikke installere caching-nameserver RPM med urpmi."
+
+# Mangler
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Tillykke!"
+
+# Mangler
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4744,8 +6529,9 @@ msgid ""
 "or to the Internet. There is no password access."
 msgstr ""
 "Dette niveau skal bruges med omtanke. Det g�r dit system nemmere at bruge,\n"
-"men meget s�rbart: det m� ikke bruges til en maskine der er i et netv�rk\n"
-"eller har forbindelse til Internettet. Der er ikke nogen kontrol af kodeord."
+"men er meget s�rbart: det m� ikke bruges til en maskine der er i et netv�rk\n"
+"eller har forbindelse til internettet. Der er ikke nogen kontrol af "
+"adgangskoder."
 
 #: ../../standalone/draksec_.c:31
 msgid ""
@@ -4760,16 +6546,16 @@ msgid ""
 "Few improvements for this security level, the main one is that there are\n"
 "more security warnings and checks."
 msgstr ""
-"F� forbedrelse af sikkerheds niveauet, den vigtigste er at der er\n"
-"flere sikkerheds advarsler og eftersyn."
+"Ikke mange forbedringer af sikkerheds-niveauet, den vigtigste er at der er\n"
+"flere sikkerheds-advarsler og eftersyn."
 
 #: ../../standalone/draksec_.c:34
 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 ""
-"Dette er den standart sikkerheds anbefaling for en computere med\n"
-"forbindelse til Internettet. Der er nu sikkerheds eftersyn."
+"Dette er standard sikkerheds-anbefalingen for en maskine med\n"
+"forbindelse til internettet. Der er nu sikkerheds-eftersyn."
 
 #: ../../standalone/draksec_.c:36
 msgid ""
@@ -4798,23 +6584,32 @@ msgstr "Indstiller sikkerhedsniveau"
 msgid "Choose the tool you want to use"
 msgstr "V�lg det v�rkt�j du �nsker at benytte"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Hvilken type tastatur har du?"
+#: ../../standalone/livedrake_.c:23
+msgid "Change Cd-Rom"
+msgstr "Skift cdrom"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Hvilken type mus har du?"
+#: ../../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 ""
+"Inds�t venligst installations-cdrom'en i dit cdrom-drev og tryk p� Ok, n�r "
+"det gjort\n"
+"Hvis du ikke har den - tryk p� Annull�r, s� undg�s levende opgradering"
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr "Kan ikke starte levende opgradering !!!\n"
+
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "ingen seriel_usb fundet\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Emulering af tredje knap?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Hvilken seriel port er din mus forbundet til?"
 
@@ -4902,7 +6697,7 @@ msgstr "Find pakke"
 
 #: ../../standalone/rpmdrake_.c:104
 msgid "Find Package containing file"
-msgstr "Find pakke som indeholder file"
+msgstr "Find pakke som indeholder fil"
 
 #: ../../standalone/rpmdrake_.c:105
 msgid "Toggle between Installed and Available"
@@ -4948,7 +6743,7 @@ msgstr "Hvilken pakke leder efter"
 #: ../../standalone/rpmdrake_.c:278
 #, c-format
 msgid "%s not found"
-msgstr "%s ikke fundet."
+msgstr "%s ikke fundet"
 
 #: ../../standalone/rpmdrake_.c:238 ../../standalone/rpmdrake_.c:262
 #: ../../standalone/rpmdrake_.c:278
@@ -4965,7 +6760,7 @@ msgid ""
 "rpmdrake is currently in ``low memory'' mode.\n"
 "I'm going to relaunch rpmdrake to allow searching files"
 msgstr ""
-"rpmdrake er fortiden i lav hukommelse tilstand.\n"
+"rpmdrake er for tiden i lav hukommelse tilstand.\n"
 "Jeg genstarter rpmdrake s� der bliver mulighed for at s�ge efter filer"
 
 #: ../../standalone/rpmdrake_.c:253
@@ -4997,8 +6792,8 @@ msgid ""
 "For FTP and HTTP, you need to give the location for hdlist\n"
 "It must be relative to the URL above"
 msgstr ""
-"For FTP og HTTP, skal du give adressen til hdlist\n"
-"Den skal v�re relativ til URL-en ovenfor"
+"For FTP og HTTP skal du give adressen til hdlist\n"
+"Den skal v�re relativ til URL'en ovenfor"
 
 #: ../../standalone/rpmdrake_.c:302
 msgid "Please submit the following information"
@@ -5017,7 +6812,7 @@ msgstr "Opdaterer RPM-basen"
 #: ../../standalone/rpmdrake_.c:328
 #, c-format
 msgid "Going to remove entry %s"
-msgstr "Skal til at fjerne indskrivning %s"
+msgstr "Skal til at fjerne indgang %s"
 
 #: ../../standalone/rpmdrake_.c:360
 msgid "Finding leaves"
@@ -5026,3 +6821,186 @@ msgstr "Finder blade"
 #: ../../standalone/rpmdrake_.c:360
 msgid "Finding leaves takes some time"
 msgstr "At finde blade tager nogen tid"
+
+# Mangler
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+msgid "Internet Tools"
+msgstr "Internet v�rkt�jer"
+
+msgid "Internet"
+msgstr "Internet"
+
+# Mangler
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Kontor"
+
+# Mangler
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+msgid "Multimedia - Graphics"
+msgstr "Multimedie - Grafik"
+
+# Mangler
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+msgid "Multimedia - Video"
+msgstr "Multimedie - Video"
+
+msgid "KDE"
+msgstr "KDE"
+
+# Mangler
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multimedie"
+
+# Mangler
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+msgid "Multimedia - Sound"
+msgstr "Multimedie - Lyd"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Dokumentation"
+
+# Mangler
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# Mangler
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+msgid "Games"
+msgstr "Spil"
+
+msgid "Multimedia - CD Burning"
+msgstr "Multimedie - CD-br�nding"
+
+# Mangler
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr "Databaser"
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "V�lg den samlede st�rrelse som din installation m� fylde"
+
+#~ msgid "Total size: "
+#~ msgstr "Total st�rrelse: "
+
+#~ msgid ""
+#~ "The system is now connected to Internet! Congratulation.\n"
+#~ "Feel free to launch draknet at any time to setup your connection.\n"
+#~ msgstr ""
+#~ "Systemet er nu forbundet til internettet! Tillykker.\n"
+#~ "Du kan starte draknet n�r som helst for at konfigurere din forbindelse.\n"
diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po
index 02fbc7cf3..200d585d3 100644
--- a/perl-install/share/po/el.po
+++ b/perl-install/share/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 2000-1-4 16:27+0100\n"
 "Last-Translator: Theodore J. Soldatos <theodore@eexi.gr>\n"
 "Language-Team: GREEK <nls@tux.hellug.gr>\n"
@@ -13,43 +13,104 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "������"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "����� ��������"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "�������� ����� ��������"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "�������� X server (������ ������ ��������)"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "������������ X Window"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "�� ����� XFree ������ �� �����;"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"� ����� �������� ��� ����������� ���������� ������������� �������� ���� \n"
+"�� �� XFree %s. � ����� ��� ������������� ��� �� XFree %s �� ����� ������ �� "
+"������ \n"
+"�������� ���������� ��� ����������� �������."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+"� ����� �������� ��� ����������� ���������� ������������� �������� ��� XFree "
+"%s."
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s �� ���������� ������������� ��������"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"� ����� �������� ��� ����������� ���������� ������������� �������� ���� \n"
+"�� �� XFree %s. �������: ����������� ���������� - ������ �� ������� ��� "
+"���������� ���!\n"
+"� ����� ��� ������������� ��� �� XFree %s �� ����� ������ �� ������ �������� "
+"����������\n"
+"��� ����������� �������."
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"� ����� �������� ��� ����������� ���������� ������������� �������� ��� XFree "
+"%s,\n"
+"�������: ����������� ���������� - ������ �� ������� ��� ���������� ���!"
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s �� ����������� ���������� ������������� ��������"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "��������� XFree"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "������� ������ ������ ��������"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "��������� X server"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "�������� �����"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "�����"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -73,39 +134,39 @@ msgstr ""
 "�����������\n"
 "��� ������ ���. �� ��� ����� ��������, ����� ��� ����������� �������."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "��������� ���������� ���������"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "��������� ����������� ���������"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "� ����� ��� ���� ��������� �����"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "� ����� �������� ��� ���� ��������� �����"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "��� ����� �������� ��������� �����"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "������ �� ���������� ��� ���������;"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr "�������: � ������ ����� ��������� �� ���� ��� ����� ��������"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr "�������: � ������ ����� ���������� �� ���� ��� ����� ��������"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "������ ���������"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -113,185 +174,172 @@ msgstr ""
 "\n"
 "��������� �� �������� ������� �����������"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "���������� ������:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "������ �� %d ������������"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "����� ���� � ����� �������;"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "���������� ������, ��������� �� �������� ������� �����������"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "�������� ������� ���������"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"�� �������� �������� ��������� ��� �� �������� ����� ����� ����������.\n"
-"� ����� ��� �� ������� �� �����������...\n"
-"�������� �� ������ �� ��� ��������, �� �������� ��� ���� �� ���\n"
-"���������� ��� �����������."
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "�������"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "�������� ������� ��� ����� ��������"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "����� ��������: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 server: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "�������� ����"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "���������"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"����� �� �������� �� ��� ��� ���������� ��������� (�� 800�600).\n"
-"���� ���� ���� ���������� ������� ��� ����������.\n"
-"������ �� ����������;"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"��� �������� ������� ���������� �����������\n"
-"��������� ����������� ����� �������� � �����"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "���������� �������������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "����� ���������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "������� ���������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "�����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "��������� ���������� ���������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "��������� ����������� ���������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "����� ��������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "����� ������ ��������: %s kb\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "����� ��������: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "�������: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 server: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "������ XFree86: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "������������ ��������� �������� ������������� (X-Window)"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "������ ������"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "������ ������ ��������"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "������ ��������� X server"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "������ ��������"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "�������� ������ ���������"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "������� �����������"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "��������� �������"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "������"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "�� ������ �� ������;"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "������� �������;"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"��������� ���������� ���������;\n"
+"�� ��������� ��������� �����:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "�������� ��������������� �� %s ��� ������������ ��� �������"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "�������� ������������� ��� ���� ������� Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "������� ���������� (X) ���� ��������"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -300,228 +348,224 @@ msgstr ""
 "������� ���������� (X-Windows).\n"
 "���������� �������� �������� �������� �������������;"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "�������� ������� (Autologin)"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"����� �� ������� �� ������� ��� ���� ���� �� ��������� �������� ����\n"
+"��� �������� �� ���� ������������ ������.\n"
+"��� ��� ������ �� ��������� ����, ������� ��� ������ ��������."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "�������� ��� ��' ������� ������:"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "�������� ��� ����������� ��������� ��� ������ �� ���������������"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 ������� (8 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 �������� ������� (15 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 �������� ������� (16 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 ����������� ������� (24 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 �������������� ������� (32 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kb"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kb"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB � �����������"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standard VGA, 640x480 ��� 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 ��� 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 Compatible, 1024x768 ��� 87 Hz interlaced (no 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "High Frequency SVGA, 1024x768 ��� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frequency ��� ������ �� ����������� ������� 1280x1024 ��� 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frequency ��� ������ �� ����������� ������� 1280x1024 ��� 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frequency ��� ������ �� ����������� ������� 1280x1024 ��� 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "����� ��� ������ �� ����������� ������� 1600x1200 ��� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "����� ��� ������ �� ����������� ������� 1600x1200 ��� 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "�������"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "������� ��' �������"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "�������"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "�������"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "�������"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "������ �������"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "����������"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "������ ������ ��� ���������� ���������"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "������ ������ ��� ������ (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "����������� LILO/grub"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "����������� SILO"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "��� ������ �� ������������� �� ��������� ���������;"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "����������� LILO/grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "������"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "���� ����������� ��������� ������ �� ����������;"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "����������� ������������ ���������"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "������� ���������"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (��� ���������� �� ���������� BIOS)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "��������"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "��������"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "����������� ���� ��� ��������"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "������� ������"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "����������� ���� ��� ��������"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "�����������"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "����������� (����)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "���������� �������� ������� �������"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "����������"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "������� �������� ������������ ���������"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "� ������� ``���������� �������� ������� �������'' ����� ������� ����� "
 "�����������"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "�������� ����������� ����"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "�� ����������� ����� �������"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -529,167 +573,350 @@ msgstr ""
 "�������� �� ��������� ��������.\n"
 "�������� �� ���������� �� ����� � �� �������� ��� ����������."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "��������"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "������������"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "�� ����� ������� ������ �� ����������"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "���� ����������� (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "���� ����������� (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "�� ����� ������� ������ �� ����������"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Image"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Append"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Read-write"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "�������"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "���������"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "��������"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "������� ��' �������"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "��"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "�������� ��������"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "��� ����������� ����� ��������"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "���� � �������� ��������������� ���"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "����� %s %s ������������"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "����� �����;"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "����� ������� ����������� %s;"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "���"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "���"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "����������� ������ ��� %s ����� %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(module %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "����� %s ����� �� ��������;"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"�� ������� �����������, � %s ������ ���������� �������� ����������� ���\n"
+"�� ������������ �����, ���' ��� ��� ������� ���������� ��� ����� �����.\n"
+"�� ������ �� ������ �������� �������� � �� ������� ��� ����� �� ��������\n"
+"�� ����� ��� ��� ��� ����������� ��� ����������; � ������� ���� ����\n"
+"���������� ������� ��� ����������, ���� ��� �� ���������� �����."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "�������� �������"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "������������� ����������"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "�������� ���� �� ������ ����������� ��� ��� ����� %s"
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"�������� ���� �� ������ ��� ����������� ��� ��� ����� %s.\n"
+"�� ���������� ����� ��� ����� ``�����=���� �����2=����2 ...''.\n"
+"��� ����������, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "���������� ������"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"� ������� ��� ������ %s �������.\n"
+"������ �� ���������� ���� �� ������������ �����������;"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"KALOS HRTHATE STON EPILOGEA LEITOURGIKOU SYSTHMATOS %s!\n"
+"\n"
+"EPILEXTE LEITORGIKO SYSTHMA APO TON PARAPANO KATALOGO \n"
+"H PERIMENETE %d DEUTEROLEPTA GIA THN AYTOMATH EPILOGH.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Welcome to GRUB the operating system chooser!"
+
+#: ../../bootloader.pm_.c:597
+#, 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."
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Press enter to boot the selected OS, 'e' to edit the"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "commands before booting, or 'c' for a command-line."
+
+#: ../../bootloader.pm_.c:600
+#, 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:604
+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:696
+msgid "Desktop"
+msgstr "Desktop"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Start Menu"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d �����"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 �����"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d ������������"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "����������"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "����������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "��������"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "�����������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "������ ��������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "�����"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "������ ��������"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "���������� /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "���������� �� ����������� ����� �����������"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "���������� �� �������� ����� �����������"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "��������� ��� ������"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "���������� �� ������"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "�����"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "��������� ��� ��������"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "���������� �� ��������"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "���������� ����"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "����������� ����"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "�������� ��������"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "���� �� ����������� ����������� ����� �� �����"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "��� ����� �� �������� �����������"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -697,59 +924,63 @@ msgstr ""
 "��� �� ���������� �����������, �������� ��������� ��� ���� ������ ����� "
 "������ � �������� ����������� ����������"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "������� ����������� ��������"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "������� ���������� ������"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "���������� ������ �����������"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "������������"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "�����"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "����"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "�����"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "����"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "����� ���������� �������:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "������������"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -761,17 +992,17 @@ msgstr ""
 "������� �� �������� �� ������� ��� �����\n"
 "(�������� ���, ���� �������� \"������ ��������\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "�������� ����� ����� ��� ��������� ��������� ��� ��������� ���"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "�������� ����������!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -781,77 +1012,77 @@ msgstr ""
 "2048 ������ ����� �������)\n"
 "���� ���� ��� ������"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "�������: ���� � ���������� ����� ����������."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "������ ��������: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "�������: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "������ DOS ������ ������: %s \n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "�����: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "����: ������ %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "�������: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s ������"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "��������� %d ��� ��������� %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "��������������\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "�������������\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "������������\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "������ loopback: %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -859,79 +1090,79 @@ msgstr ""
 "��������� ��������� �� �������\n"
 "    (��� MS-DOS, ��� ��� lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "������� %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "������� chunk %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "������ RAID %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "����� ������� loopback: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "�������� ����� ���� �� ��� ���������"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "�������: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "���������: %s ���������, %s �������, %s ������\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "����� ������ �����������: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "��� bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "�������"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "�������� ��� RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "�������� ��� �� RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "����������� RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "����� ��� loopback"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "�������� �����"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -943,7 +1174,7 @@ msgstr ""
 "���� �������������� LILO ��� ��� �� ��������, ���� ��� ��������������LILO "
 "��� ��� ���������� �� /boot"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -954,28 +1185,27 @@ msgstr ""
 "��� ����� ��������� /boot.\n"
 "�� ��������� �� ��������������� LILO, ��������� ��� ��������� /boot."
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "��������� ��� software RAID ��������� �� root (/).\n"
 "������ ��������� ��������� ��� ������ �� �� ��������� ���� ����� ��� "
 "��������� /boot.\n"
-"�� ������ ��������� �� ��������������� �� lilo � �� grub, ��������� �� "
-"���������� ��� ��������� /boot."
+"��������� ������ �� ���������� ��� ��������� /boot."
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "�������������� ``%s'' ��� ���� ���"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "����� ����� ``����������''"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -983,41 +1213,43 @@ msgstr ""
 "���� ��� ������ ����� ���� ��������� %s, ��� �� �������� �� ����� ��� "
 "��������� �� ������"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "�� ��������;"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "������ ����� ����������"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "������ ����� ���������� ��� ������ �����������;"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "������ ����� ����������"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "�� ���� ���������� ������;"
+#: ../../diskdrake.pm_.c:471
+msgid "Which filesystem do you want?"
+msgstr "���� ������ ������� ���������;"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr ""
+"��� �������� �� ��������������� �� ReiserFS ��� ����������� ���������� ��� "
+"32MB"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "��� ������ �� ��������� �� ������ loopback %s;"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "��� ������ �� ��������� ��� ������� %s;"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1026,143 +1258,147 @@ msgstr ""
 "���������������\n"
 "��� loopback. ��������� ����� �� loopback"
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "���� ��� ����������� ��� ���������� %s, ��� �� �������� �� ����� ��� "
 "��������� �� ������"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "�����������"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "����������� ������� loopback %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "����������� ���������� %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "���� ��� ����������� ���� ��� �����������,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "��� �� �������� �� ����� ��� ����������� �� ������"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "����������"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "�� ����� ����� ������ �� �������������;"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "�� ����� ����� ������ �� �������������;"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "���������� �� �������"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "���������� ���������� �� �������..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "� ������� ����������� ��� ������ %s �� ����������� ���� �����!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "���������� ������������ ��� �� ����������� �� �������"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "����������� fat filesystem bounds"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "�������� ��������"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+msgid "This partition is not resizeable"
+msgstr "����� � ����� ���������� ��� ������ �' ������� �������."
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr ""
 "������ �� ����� ��������� ��������� ���� ��� ��������� �� ���� ��� ���������"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "���� ��� ������ �������� ���� ��������� %s, ��� �� �������� �� ����� ��� "
 "��������� �� ������"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "�������� �� ��� �������"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "���������� ���� ����������"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "���� ���� �����: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "������� �� MB"
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "����� ���������� �������: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "���������: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "���� � ��������� ��� ������ �� �������������� ��� loopback"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "����� ������� loopback: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "�� ������ ���������������� ���, �������� ��� ����"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "�� ������ ������� ���. �� �� �������������;"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "�������� ������"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1170,11 +1406,11 @@ msgstr ""
 "� ��������� ������� ����������� ���� ����������� �������\n"
 "�� ��������;"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "�������������"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1182,79 +1418,80 @@ msgstr ""
 "�������� ��� �������� ���� ����� ���������\n"
 "��� �� �������� �� ���� �� �������� �� ������"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "���������� �������� ������ �����������"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "�������"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "�������"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "������� chunk"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "�������� ��� ������� RAID ��� ����� �� ����� � ��������"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "���"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s ����������� ��� %s �������"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "��� ���� ��� �� ����������� �� %s �� ���� %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "������� nfs �������"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "������� �������: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "������ ���� ��� ���������� ��� %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "�� ������ �������� ������ �� �������� �� /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "������� ��� ��������� �� ������ �������� %s\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "�������� ��������� %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+"����� � ��������� ������ �� ���������� ��� ������ ������� ������� (root)"
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "���������� ��� ���������� ������� ������� (ext2, reiserfs) ��� ���� �� "
 "������ ��������\n"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "������ ���� �� ������� ��� %s ��� �������: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1263,74 +1500,94 @@ msgstr ""
 "���������� ���� ���������� �������. �������� ������� �� ����� ��� ������ "
 "����� ����� ��� �����������"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "��� ������� ����� ���������!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
-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"
+"\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"
+"��������� ������."
 
-#: ../../help.pm_.c:10
+#: ../../help.pm_.c:22
 msgid "Choose the layout corresponding to your keyboard from the list above"
 msgstr ""
 "�������� ��� ���������� ��� ����������� ��� ������������ ������ ��� �������� "
 "�����"
 
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:25
 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"
-"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).\n"
-"\n"
-"\n"
-"Select:\n"
+"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
+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"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\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"
-msgstr ""
-"�������� \"�����������\" ��� ��� ������� ���������� ����������� Linux\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).\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* Recommanded: 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"
-"  - ��������: ��� ���� ����� � ����� ���� ��� ����������� Linux.\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - �������������: ��� ����� ������������� �� �� Linux, �� ��������� �� \n"
-"��������� ������ ���������� ������� ������, ���������� ��������� � "
-"�����������\n"
-"�������.\n"
 "\n"
-"  - �������������: ��� ����� ���� ������������� �� ��������� GNU/Linux ���\n"
-"������ �� ���������������� ��� ���������� ������������� �����������, ����\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1338,12 +1595,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "��������:\n"
 "\n"
@@ -1352,223 +1610,429 @@ msgstr ""
 "�����������\n"
 "�������.\n"
 "\n"
+"\n"
 "  - �������������: ��� ����� ���� ������������� �� ��������� GNU/Linux ���\n"
 "������ �� ���������������� ��� ���������� ������������� �����������, ����\n"
 "���� � ������� ����� ��� ���. �� ��������� �� ��������� ���� ������������\n"
-"���� ��� ���� �������� (\"�������������\") �������.\n"
+"���� ��� ���� �������� (\"�������������\") �������."
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
-"�� �������� ��� ����� ������� �� ��� ����� ��� ���������� ��� (�� ��������\n"
-"��� ��������� \"�������������\" � \"�������������\" ����� �� ���������:\n"
+"�� �������� ��� ����� ������� �� ��� ����� ��� ���������� ��� \n"
+"����� �� ���������:\n"
 "\n"
-"  - ��������: �������� ����� ��� ��������� �� ��������������� �� ������� "
-"���\n"
-"    ������ ��� ���������� ����� (�������� ��������, ������� ���). ��� �� \n"
-"    ������������� �������������, �������� ��������� ���.\n"
+"\t* ������� ��������: �������� ����� ��� ��������� �� ��������������� �� "
+"�������\n"
+"\t  ��� ������ ��� ���������� �����, ��� ����� � ��� �������. \n"
 "\n"
-"  - ��������: �������� ���� ��� ��������� �� ��������������� �� ������� ���\n"
-"    ������ ��� �������� ����������. �� ������������ ��� ������ ������� "
+"\t* ��������: �������� ���� ��� ��������� �� ��������������� �� ������� ���\n"
+"\t  ������ ��� �������� ����������. �� ������������ ��� ������ ������� "
 "���������\n"
-"    ��� �����������, ������������� ��� ����������� ������� ������, ����� ��� "
+"\t  ��� �����������, ������������� ��� ����������� ������� ������, ����� "
+"���\n"
+"\t  ���������� ������� ����������.\n"
 "\n"
-"    ���������� ������� ����������.\n"
-"\n"
-"  - ������������: �������� ���� ��� ��������� �� ��������������� �� ������� "
+"\t* ������������: �������� ���� ��� ��������� �� ��������������� �� ������� "
 "���\n"
-"    �� �����������, ���� ������� (NFS � SMB), ���� ���������� (lp � SMB), "
-"���� \n"
-"    ������������ (NIS), ����� ��������� ���. �� ����� ��� ���������, ��� �� "
-"\n"
-"    ������������� �������� ���� �� KDE, �� Gnome ���.\n"
+"\t  �� �����������, ���� ������� (NFS � SMB), ���� ���������� (lp � SMB), "
+"����\n"
+"\t  ������������ (NIS), ����� ��������� ���. �� ����� ��� ���������, ��� ��\n"
+"\t  ������������� �������� ���� �� KDE, �� Gnome ���."
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 �� ����������� ���' ����� �� ��������� ���� � �������������\n"
-"PCI ������������ SCSI. ��� ��������� ������� � �������� ��� �����\n"
-"������ ������� �� ��������������, �� �� ����� ��������.\n"
+"�� DrakX �� ����������� �� ��������� ������������ SCSI ����� PCI.\n"
+"��� �� DrakX ��������� ���� ����������� ��� ����� ��� �� ��� "
+"��������������,\n"
+"�� ������������ �������� ��� ��������� �����\n"
 "\n"
 "\n"
-"��� � SCSI ������������ ��� ����� ISA � ������� PCI ��� ��� �����\n"
-"������� ��� DrakX, � ��� ��� ����� ������������� ����������� SCSI,\n"
-"�� ���������� ��� ����� ������� �����������. ��� ��� �����, ���������\n"
-"\"���\". ��� �����, ��������� \"���\". �� ���������� ���� ���������\n"
-"�� �������, ��� ��� ������ �� ������ �� ��������� ��� ���������.\n"
+"��� ����� ����������� SCSI ����� ISA, ������� �� ������������ PCI "
+"����������� \n"
+"� ��� ����� ������� ����������� SCSI, �� DrakX �� ��� ������� ��� ����� "
+"������� \n"
+"����������� SCSI ��� ������� ���. ��� ��� �����, ������� ����� '���'. ��� "
+"��������\n"
+"'���', �� ��� ������� �� ��������� ��� ���� ��� ��� ���� ��������.\n"
 "\n"
 "\n"
-"���� ��� ������� ������, �� Dra�� �� ��� ������� ��� ������ �� �������\n"
-"��������� ��� ��� �����. ���' �����, ������ ��� ����� �� ������������\n"
-"����� ��� ��� ���������� ���������. ���� ������� ���� �� ���������\n"
-"����������.\n"
+"��� ��������� �����������, �� DrakX �� ��� ������� ��� ������ �� ������� "
+"��������.\n"
+"�������, ��������� �� DrakX �� �������� �������� ��� �����������, ��� �� "
+"����� ��������.\n"
 "\n"
 "\n"
-"��� ���� ��� ������, �������������� ��� ��������� ��� �����������\n"
-"���� ���������� ��� ������ ��� � ����� ��� ������� ��� Windows \n"
-"(��� ���� ����� ������������� ���� ���������� ���), ���� ����������\n"
-"���� ����� ������������."
+"�� �������� ���������, �� ������ �� ������ �������� ��� ��� �����. \n"
+"�������������� ��� ����� ������������ ��� �� ��� �� ������ ����� ��� \n"
+"����������� ��� ��� ����������� ��� Windows (�� �������), ��� ��� "
+"����������\n"
+"��� ������ � ��� ��� ���������� ��� ������������ (�� ����� �������� ��� "
+"Internet)."
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:108
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
 "\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"
-"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"
 "\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"
-"You can reach any option using the keyboard: navigate through the "
+"\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 ""
+
+#: ../../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"
-"using Tab and Up/Down arrows. When a partition is selected, you can use:\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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+"   * Undo: you can use this option to cancel your changes.\n"
 "\n"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\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"
 msgstr ""
-"�� ���� �� ������, �������� �� ��������� ����� ����������� �� "
-"���������������\n"
-"��� ��� ����������� ��� Linux-Mandrake, �� ����� ����� ��� ������� (���\n"
-"���������� ����������� Linux � ��� ������ �������� �����������).  "
-"�����������,\n"
-"�� ������ �� ������� �����������. ���� � ���������� ���������� ���� \n"
-"������ ���������� ��� ����� ��� ������� ��� ������ �� ��������.\n"
+
+#: ../../help.pm_.c:218
+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"
-"��� ������ �� ������������� ���� �����������, �������� \"��������\n"
-"��������\" ��� �������� ���������� ��� ���������� �����������.\n"
-"�������� �� ��������� �� ����� ������ ����� �� ������������� ��\n"
-"����������� �������� ���� ��� \"hda\" ��� ��� ����� IDE �����, \n"
-"��� \"hdb\" ��� ��� ������� IDE �����, ��� \"sda\" ��� ��� �����\n"
-"SCSI ����� ���.\n"
+"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
 "\n"
-"��� ������������ ����������� �����: � ����� ��������� (/), � �����\n"
-"����� �� ������ ������ ��� ��������� ��� ���������� ������� ��� �\n"
-"/boot, � ����� �������� �� ���������� ��� ��� �������� ��� ����������\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"
-"������ �� ������������ ��� ����������� ���������� ����� ������� ��\n"
-"�����������, � ���������� ���� ������ �� ����� ������� ��� ����\n"
-"������ ������. �� DiskDrake ��� ��������� ��� ����� �������.\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"
-"�������� �� ���������� ��� �������� ��������������� �� ������������: \n"
-"������������� ��������������� �� ������� Tab ��� �� ���� ��� ���� ����.\n"
-"���� ��� ��������� ���� ��������, �������� �� ��������:\n"
+"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-C ��� ���������� ���� ���������� (�� ����� ����)\n"
+"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"- Ctrl-d ��� �������� ����������\n"
+"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"- Ctrl-m ��� ������ ������� ��������\n"
+"\n"
+"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
+"\"secondary hard drive\", etc..."
+msgstr ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:252
 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."
+"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"
-"��������������� (����������� ����� � ���������� ����������\n"
-"�������). �� ���� �� ������, ���� �������� �� �������������\n"
-"���� ��� ������� ���������� ����������� ��� �� ������� �������\n"
-"�������� ��� ���� ���������. ��������: ��� ����� ���������� �� \n"
-"������������������ ���������� �����������, ������ �� ���������\n"
-"������ ��� �������� �� ����� �� ������ �� ���������. ������� \n"
-"������������ �� ����������� /home ��� /usr/local."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:257
+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 ""
+
+#: ../../help.pm_.c:267
+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 ""
+
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
+
+#: ../../help.pm_.c:303
+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 ""
+
+#: ../../help.pm_.c:329
 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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"
-"� �� ������������. �� DrakX �� ������������ ��� ����� ������ ���� ���� ����� "
-"���.\n"
+"������������� � �� ������������.\n"
+"\n"
+"\n"
+"�� DrakX �� ������������ ��� ����� ������ ���� ���� ����� ���.\n"
 "��� ���, �� ������ ��� �������������. ��� ������ �� ����������, �� "
 "�������������\n"
 "���� �� ����������� ������, ���� �� ���������� ������ ������ ��������� "
@@ -1577,146 +2041,157 @@ msgstr ""
 "�������\". �� ����\n"
 "�� ��������� �� ������ �� ��������� ������� �� �������� ��� 1000 ������."
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:358
+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:155
+#: ../../help.pm_.c:363
 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."
+"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 ""
-"�� ������ ��� ��������� �� ������������� ����. ���� � ����������\n"
-"�� ��������� ������ �����, ����� ��� ����� �������� �� ������������\n"
-"��� ��������� �����������, ����� �� ��������� ����������� ����� ���\n"
-"���� ������� � ����������."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:371
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"��� �� DrakX ������� �� ������������ ��� ���� ��������� ���\n"
-"��������������, � ��� ������ �� ����� �� ������� �����, �� ���\n"
-"������������ � �������� ���������.\n"
-"\n"
-"\n"
-"��� ���������� �� ��� �������� ��� DrakX, ���� ���������� ����\n"
-"������� ��� ��� ���������� �������� ���� �� �� ������� ��� �����\n"
-"��� ��������. ������, �������� ���� ���� ��������� ��� ���������\n"
-"��� ����� ������������ ���� ���� ���.\n"
-"\n"
-"\n"
-"���� ��������� ��������� ���������, �� ������ ������ �� ����� ���\n"
-"DrakX �� ���� ���� ����� ����������� �� ������� ���."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:376
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
-"�������� �������� ��� ��������� ����. ��� ����������, � COM1 ��� Windows\n"
-"���������� ttyS0 ��� Linux."
+"�������� �������� ��� ��������� ����. ��� ����������,\n"
+"� COM1 ��� Windows ���������� ttyS0 ��� GNU/Linux."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
+"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"
-"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"
-"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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"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"
-"modem.\n"
-"\n"
-"�������� \"������ ������\" ��� �� DrakX �� ����������� �� \n"
-"��������� ��� ����� ������� Ethernet ��� ������� ���. �� ������\n"
-"PCI �� ����������� ��� �� ������������� ��������. \n"
-"�� ���� � ����� ��� ����� ����� ISA, � ��������� ���������� ��� \n"
-"�� ������������ ��� �� ������ �� ��������� ���� ����� ��� ��� \n"
-"�������� ��� �� ���������� ������ ����.\n"
-"\n"
-"\n"
-"��� ����� ��� ������ SCSI, �������� �� ������� ��� ����� �� ���������\n"
-"��� ����������� (�����) ��� ����� ����, ������ �� ������ �� ������\n"
-"����� ��� �������� �����������, ��� ������ �� ���������� ��� ���\n"
-"���������� ��� ������ ���.\n"
-"\n"
-"\n"
-"��� ����������� �� Linux-Mandrake �� ����� ���� ��� ���������� �������,\n"
-"� ������������ ��� ������� ��� �� ��� ���� ��� ����� ��� ����������� \n"
-"����������� (��������� IP, �����, ����� �������). ��� ���������� ���\n"
-"��� ������, ��� ���������� ��� �����, �� ������ �� ����������� �����\n"
-"��� ��� ��� �����������.\n"
-"\n"
-"\n"
-"�������� \"����� modem\" ��� �� ��������� ��� ������� �� �� ���������\n"
-"���� modem. �� DrakX �� ����������� �� ��������� �� modem ���. ���\n"
-"��������, �� ������ �� ��������� ��� �������� ���� ���� ����� �����\n"
-"����������� �� modem ���."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+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:425
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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"
 "  - ��������� IP: ��� ��� ��� ������, ������� ��� �������� ������� �\n"
 "��� ������� ���.\n"
+"��� ������ �� �������� ��������� IP ��� ��������� \"�������� ������� IP\"\n"
+"��������.\n"
 "\n"
 "\n"
 "  - ����� �������: \"255.255.255.0\" ����� ������� ���� �������. ��� ���\n"
@@ -1725,13 +2200,28 @@ msgstr ""
 "\n"
 "  - �������� ������� IP: ��� �� ������ ��� ������������ ��� ��� �� "
 "����������\n"
-"bootp � dhcp, �������� ����. �� ���� ��� ���������, ��� ���������� �� "
+"BOOTP � DHCP, �������� ����. �� ���� ��� ���������, ��� ���������� �� "
 "������\n"
-"��������� IP � ����� �������. ��� ��� ����� ��������, ������� ��� �������� "
-"������� �\n"
-"��� ������� ���.\n"
+"��������� IP. ��� ��� ����� ��������, ������� ��� �������� ������� �\n"
+"��� ������� ���."
+
+#: ../../help.pm_.c:437
+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:441
+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:225
+#: ../../help.pm_.c:445
 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."
@@ -1739,7 +2229,7 @@ msgstr ""
 "�������� ���� �� �������� ��� �������� ��� dialup. ��� ��� ����� ��������,\n"
 "�������� �� �������� ����������� ��� ��� ������� ���."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1747,13 +2237,14 @@ msgstr ""
 "��� ��������������� proxies, �������� �������� ���� ����. ��� ��� ������,\n"
 "������� ��� ������� ��� � ��� �������� �������."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
 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 ""
@@ -1765,112 +2256,249 @@ msgstr ""
 "��������� ��� ������ �� ��������� ���� ��� ������ ������� �� ���\n"
 "��������� ���."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
-"�������� ���� �� ��������� ��� ���� ���� ������� �� �� ����� ���\n"
-"������� �� ���� ����������.\n"
-"\n"
-"\n"
-"�� Linux ���������� ��� ��� �� GMT (\"Greenwich Mean Time\" � \n"
+"�� GNU/Linux ���������� ��� ��� �� GMT (\"Greenwich Mean Time\" � \n"
 "\"���������� ��� ����������\") ��� ��� ���������� �� ������ ���\n"
-"����� ��� ����� ���� ��� �� ���������."
+"����� ��� ����� ���� ��� �� ���������.\n"
+"\n"
+"��� ��� ���� ������� ����� ��������� ��� Microsoft Windows, �������� \"���\"."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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:486
+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"
-"��������. ��� ������������ ��� ������ ��� ��������� ���� �� ��� ��� �����, \n"
-"�� ���������� ��� ��������� �������� ��� �� ������ ��� ���� ���."
+"�������� �� ������� ���� ������ �������� (����������� ���� ���������� ���) \n"
+"� ���� ��������������� (���������� ���� UNIX �������, Netware � ������� \n"
+"Microsoft Windows)."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:490
+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:505
 msgid ""
-"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"
+"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\n"
-"\"Local printer\". You will then have to tell which port your\n"
-"printer is connected to, and select the appropriate filter.\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,\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"
+"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 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."
+"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 ""
-"�� Linux ������ �� ����������� �� ������� ������ ���������. �\n"
-"������� ��� ������ ������� ������������ ���������. ��������� ���\n"
-"�� ��������� ��������� ������������ �� 'lp' �� ��' ������� �����\n"
-"��������, ����� ������ �� ����� ���������� ���� �������� �� ����\n"
-"�� �����. �������� ���� �� ������ ����������� ��� ���� ������� ��\n"
-"���� ��������, ������������� �� �� '|'. �����, ��� ��������� ��� ���\n"
-"������ �����, ������ �� �� ������ �����, �.�. \"My Printer|lp\".\n"
-"� ��������� ��� ���������� (���) \"lp\" �� ����� � ��' ������� ���������.\n"
+"�� 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: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"
-"���, �������� \"������� ���������\". �� ������ ���� �� ������� \n"
-"�� ���� ���� ����� ������������ � ��������� ��� ��� �� ���������\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"
-"��������������� Unix �������, �������� \"���������������� lpd\".\n"
-"��� ���������� �� ������ ������ ������ ��� ������, ���� ������ �� ������\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"
-"��� ������ �� ��������������� ���� �������� SMB (������ ���� ��������\n"
-"����������� �� ������ ������� Windows 9x/NT), �� ������ �� ������\n"
-"�� ����� SMB (�� ����� ��� ����� ����� TCP/IP) ��� ������� ��� ���\n"
-"��������� IP, ����� ������ ��� ������ ������, ���� ������ ��� \n"
-"����� ����� � ������ �������� ��� ������ �� ����� ��� ��������.\n"
-"�� ���� ������� ��� ��� ��������� NetWare, �� ��� ������� ��� \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:542
+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:286
+#: ../../help.pm_.c:567
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"Your printer has not been detected. Please enter the name of the device on\n"
+"which it is connected.\n"
 "\n"
 "\n"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"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:575
+msgid "You must now select your printer in the above list."
+msgstr "�������� ��� �������� ��� ���� �������� ��������"
+
+#: ../../help.pm_.c:578
+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:585
+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 ""
 "�������� ���� �� ������� �� ����-������ ��� ��� ������ \"root\".\n"
 "� ���� ������ �� �������� ��� ������� ��� �����������.\n"
@@ -1881,13 +2509,14 @@ msgstr ""
 "�������� ���������� ���� �� ���� ������! �� ��������������� \n"
 "�������� ��� root ������ �� ��������������� ���������� ��� \n"
 "��� ����������� ��� ���������� ��� ��� ��������� ���, ����� \n"
-"��� ��� ���� ��������� ����������� �� ����. � ���� ������ ������\n"
-"�� ����� ��� ���� �������������� ���������� ��� �� ����� �����������\n"
-"���� (8) ����������. ��� ������ *����* �� �� ������� �� �����. ���\n"
-"�� ������ ���� ���� ����� � ���������, ���� ��� �� ������ �� �����\n"
-"�� ���� �� �� ������� ����� ��������� ����������."
+"��� ��� ���� ��������� ����������� �� ����. \n"
+"\n"
+"\n"
+"� ���� ������ ������ �� ����� ��� ���� �������������� ���������� \n"
+"��� �� ����� ����������� ���� (8) ����������. ��� ������ *����* \n"
+"�� �� ������� �� �����."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1895,7 +2524,7 @@ msgstr ""
 "��� ���������� ��������, ������ �� ��������� \"����� ������� shadow\" ���\n"
 "\"����� ������������ MD5\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1903,7 +2532,7 @@ msgstr ""
 "��� �� ������ ��� ������������ NIS, �������� \"����� NIS\". ��� ���\n"
 "����� ��������, �������������� ��� �������� �������."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1946,23 +2575,17 @@ msgstr ""
 "������ ����� ������ ��� �� ��������� �� root ���� ��� �������� ���������\n"
 "��� ���������� ��� ����������."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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"
-"��������������� ��� Windows, �� ������� ��� ����� ���������\n"
-"(boot sector) ��� ����������. ��� �� �������� �� ����������\n"
-"�� Linux, ����� ��� �� ����� ������������ �������� ���������\n"
-"���� ����������� ���!"
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
@@ -1970,13 +2593,13 @@ msgid ""
 msgstr ""
 "������ �� ������������� ��� ������ �� ������������� �� \n"
 "����������� ��� ����� ����������� ��� ��� �������� ��� \n"
-"Linux.\n"
+"GNU/Linux.\n"
 "\n"
 "\n"
 "����� ��� �� ������ ���� ���� �� ������, �������� \"������ ������\n"
 "��� ������ (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1985,10 +2608,10 @@ msgstr ""
 "����� \"/dev/hda\" (� ������ ������ ��� ����� ������), � \"/dev/sda\n"
 "(� ������ SCSI ������)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1999,12 +2622,12 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 "�� LILO ��� �� Grub ����� ����������� ���������: ������� �� ���������� \n"
-"�� Linux � ����������� ���� ����������� ������� ��� ������� ���. ��������, \n"
+"�� GNU/Linux � ����������� ���� ����������� ������� ��� ������� ���. "
+"��������, \n"
 "�� �������� ����������� ��������������� ��� ����������� �����. ��� ���� ��� "
 "\n"
-"������, �������� �� ���������� �������� �������� �� ����� ��� �����. "
-"�������� \n"
-"�� ��������� ��� ������ �����������.\n"
+"������, �������� �� ���������� �������� �������� �� ����� ��� �����. \n"
+"�������� �� ��������� ��� ������ �����������.\n"
 "\n"
 "�������� ������ �� ����������� ��� �������� �� ���� ����������� ��������� "
 "����������\n"
@@ -2012,7 +2635,7 @@ msgstr ""
 "�������� ���������\n"
 "��� �� �� ���������������!"
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -2029,7 +2652,9 @@ msgid ""
 "\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."
 msgstr ""
 "�� ������ �������� ��� LILO ��� ��� grub �����:\n"
@@ -2047,13 +2672,70 @@ msgstr ""
 "\n"
 "  - ������� ������: ���� ������ ��� VGA ������� �������� ��� �� ��������\n"
 "���� ��� ��������. �������� �� �������� ��������: \n"
+"\n"
 "    * normal: �������� ������� �������� 80�25.\n"
+"\n"
 "    * <�������>: ����� ��� ����������� �������� ��������."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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"
+"��� ����������� ��������. �� ����� ���� ��� ���������, �� ����������� "
+"�������� ���������\n"
+"��� �� �� ���������������!"
+
+#: ../../help.pm_.c:692
+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"
+"  - ����������� bootloader: ������ �� ��� ������ �� ������������� �� "
+"�����������\n"
+"��� ��� �������� ��� GNU/Linux �����������. ����� �� �� ������ �� ������� "
+"������,\n"
+"�������� \"������ ������ ��� ������ (MBR)\".\n"
+"\n"
+"\n"
+"  - ����������� ���� ��� ��������: ������ �� ������ ��� �������������\n"
+"��� �� ������� �� ��������� ���� ��������� �� ����� �����������.\n"
+"���� ����� ������� ������� �� ��������� ��� �������� ��� ��� �����\n"
+"������ ���� ��� ������������ ��� �������������. ��� ������� �����������\n"
+"��� � ������� ����������� � ����� �����."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2065,7 +2747,7 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 "���� ������ �� ��������� �� X Window System, �� ����� ����� � \n"
-"������� ��� �������� ������������� (GUI) ��� Linux. ������ ��\n"
+"������� ��� �������� ������������� (GUI) ��� GNU/Linux. ������ ��\n"
 "��������� ��� ����� �������� ��� ��� ����� ���. �� ����������\n"
 "����� ��� ����������� ����� ����������������, ����� � �������\n"
 "��� ���������� ���� ����������� ��� ������� ��� ��������� \n"
@@ -2078,7 +2760,7 @@ msgstr ""
 "�������� �� ����������� ��� ��� �� ����������� ��� ���������\n"
 "���� ����� ���������."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2086,7 +2768,7 @@ msgstr ""
 "��� ���� ��� ���� ���� �� ��� ��������� ��� �, ��������������� ����� ���\n"
 "�������� ��� �� ��������� ����� �� ������� ���������� (X Window System)."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2094,47 +2776,50 @@ msgstr ""
 "��� ��������� �������� �� ������� ���������� �������� \"���\". ������, \n"
 "�������� \"���\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\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"
+"\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"\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."
 msgstr ""
 "�������� ���� �� ��������� �������� ��������� ��� �� ������� ���.\n"
 "\n"
-"  - ����� ���������������� ������� ������: ���� � ������� ������ �� "
-"���������\n"
+"* ����� ���������������� ������� ������: ���� � ������� ������ �� ���������\n"
 "��� ��������� ��� ������� ��� ������, ���� ����������� ���� ��� "
 "�������������\n"
 "�������, ������ ������ ������������ chipsets ������� �� ������������ "
@@ -2144,38 +2829,37 @@ msgstr ""
 "�� ��������� ���������, �� ��������������� ����� ��� �������.\n"
 "\n"
 "\n"
-"  - ������� �������� ���������: �������� ������� ��������� ��� �� ������� "
+"* ������� �������� ���������: �������� ������� ��������� ��� �� ������� "
 "���.\n"
 "�������� ��������� ���� ���������� ��� ��������� �����������.\n"
-"��� ��� ������, �������� \"������\". ��� ������ ��� ������� ������� "
-"�������,\n"
-"�������� \"���������\", ���� �������: �� ����� ��� ���������, � root ��� \n"
-"������ �� ����� login ��� �������. ������ �� ������ ��� ����� ������� ��� \n"
-"�� ������ \"su\". ������, ���� �� ������� ��������� ����������� ���� ��� \n"
-"���������� ������������.\n"
-"\n"
+"��� ��� ������, �������� ��� ����������. \n"
 "\n"
-"  - ������� ������� RAM ��� ����������: ��� �������� PC ��� ������� "
+"* ������� ������� RAM ��� ����������: ��� �������� PC ��� ������� "
 "�������������\n"
-"������ ����������� ��� �������� ��� RAM ��� �� BIOS. �������, �� Linux ���\n"
+"������ ����������� ��� �������� ��� RAM ��� �� BIOS. �������, �� GNU/Linux "
+"���\n"
 "������ �� ���������� ����� ����� ��� ������������� RAM. ��� ���� ������, "
 "�������� �� �����\n"
 "�������. ��������: ��� ������� 2 � 4 MB ��������� �����������.\n"
 "\n"
 "\n"
-"  �������� ������� ����������� �����: ��� ��������� �� ������� �������� � "
+"* �������� ������� ����������� �����: ��� ��������� �� ������� �������� � "
 "�������\n"
 "������������ ����� ����������� (CD-ROM, ��������, Zip), �������� ����� ��� "
 "�������.\n"
 "\n"
 "\n"
-"  - ������������ numlock ���� ��������: ��� ������ �� Number Lock �� ����� "
+"* ���������� \"/tmp\" ���� ��� ��������: ��� ������ �� ������������ ��� �� "
+"��������� ������ ��� ���������\n"
+"\"tmp\" ���� ��� ��������, �������� ��.\n"
+"\n"
+"\n"
+"* ������������ numlock ���� ��������: ��� ������ �� Number Lock �� ����� "
 "������\n"
-"���� ��� ��������, �������� (��������: �� Num Lock �� ��������� �� ����� "
-"��������\n"
-"��� ������� X Window)."
+"���� ��� ��������, �������� (��������: � ������� ��� ����� ��  ������� X "
+"Window)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2189,96 +2873,118 @@ msgstr ""
 "��������. ��� ������ �� ���������� ��� ���� ������� �����������, ��������\n"
 "�������� ��� �������� �������."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "�������� ������"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "�������� �����������"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "���������� ������� ������"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "������� ���������"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "�������� ������������"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "�������"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "�����. ���. ���."
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "������. ��������."
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "������� �������"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "����������� ����������"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "������� �������"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "������������"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "������� ����� ����"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "������� ���������"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "������� ��������"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "����������� root"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "�������� ������"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "������� ���������"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "���. ��. ���������"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "������� �"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "������� ��������� ������������"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "������"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "������ ���� ��� �������� ��� ������� $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "�������� ��������� �� �������"
+
+#: ../../install_gtk.pm_.c:427
+msgid "To activate the mouse,"
+msgstr "��� ������������ ���������"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr "������� �� ������!"
+
+#: ../../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 ""
+"��� ����� ��� ������ ��� ���������� ``�����������'' ������� ��� �� "
+"������������.\n"
+"�������� �� ������ �������� ����������� ���: %s"
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2288,234 +2994,255 @@ msgstr ""
 "����o������� � �������� ��� ���������.\n"
 "���� ������ �� ������ �������� �� `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"��� ����� �� ������� ��� ������ �����������, ����� ���� ������������� :(\n"
-"�� ���������� �� �������� ���������� ��� ����������� �����������"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "������ �� ����� ��� ��������� swap"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"�� DiskDrake ������� �� �������� ����� ��� ������ �����������.\n"
-"��������� �� ���� ��� ������!"
+"��� ����� ������ ��������� swap\n"
+"\n"
+"�� ��������;"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "������ ��� root partition."
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "����� ��������� �����"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "�����������"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "��� ������� ������� ��������� ����� ��� ���������� ���� �����������"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: ���� ��� ����� root partition, �������� �������� ��� ����."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "����� ���������� �����������"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "��� ������� root partition"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "��� �������� ����������� ���� �����"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "��� ����� �� ������������� broadcast ����� NIS domain"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "����� ���������� Windows ��� loopback"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "������ ���� ��� �������� ��� ������� $f"
+#: ../../install_interactive.pm_.c:90
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "���� ��������� ������ �� ��������������� ��� �� Linux4Win;"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"���������� ������ ��� ��� ���� ��� �� �� ��������.\n"
-"��������� �� ����� ��� ������."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "�������� �� ������"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "����� ������ �������� %s"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "������� ������� ���������� ���������� �� MB:"
 
-#: ../../install_steps.pm_.c:323
-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 ""
-"������ ��������� ������ ��� ������������� �����.\n"
-"� ������ CD-ROM � �� CD-ROM ����� ������������.\n"
-"������� �� CD-ROM �� ��� ���� ������� ��������������� ��� ������ \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "������� ���������� swap �� MB"
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "����� ������ ��� %s"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "����� ��� ��������� ����� ���� ��������� ��� Windows"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "��� ������� ���������� ������ ���������"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "�� �� ���� ���������� ������ �� �������� �������;"
+
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "����������� ����� ���������� ������� Windows"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "���� `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"��� ����� �� ������ ������� ���� ��������� FAT, \n"
+"���������� �� �������� �����: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "������ �� ����� ��� ��������� swap"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
+"� ��������� ��� Windows ����� ���� ����������������, �������� ������ ����� "
+"�� ``defrag'' "
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"��� ����� ������ ��������� swap\n"
+"�������!\n"
 "\n"
-"�� ��������;"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "�������� �� ������� ��� ������ �� �������������"
+"�� DrakX ������ ���� �� ������� �� ������� ��� ���������� ��� Windows.\n"
+"� ���������� ���� ���������� ���������. ��� ��� �� ����� ����� ���,\n"
+"�� ������ �� �������� ��� ��������� �� ������ ������� ��������� (��\n"
+"scandisk) ��� ���� ��������� �� ��� ���������������������� (defragment).\n"
+"���� �� ������ �� ��������� ��������� ��������� ��� ��������� ���.\n"
+"��� ����� ��������, ������� Ok."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "�������� �������: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "�� ���� ������ �� ��������� ��� �� windows ���"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "������: %s\n"
+msgid "partition %s"
+msgstr "��������� %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "�������: %d KB\n"
+msgid "FAT resizing failed: %s"
+msgstr "������ �������� FAT �������: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "�������� �� ������ ��� ������ �� �������������"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+"��� �������� FAT ����������� ��� ������ �������� � ��� ����� �� loopback (� "
+"��� ������� ������� �����)"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "�����������"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "�������� ��������� ��� ������"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "�����������"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "�������� Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "�����������"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr ""
+"����� ������������� ��� ���� �������, �� ����� ������ �� ������������� �� "
+"Linux;"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "�������� ����������, "
+#: ../../install_interactive.pm_.c:156
+#, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr ""
+"���� �� ���������� ����������� ��� �� �������� ���� ���� ����� %s �� ������"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "���������� ������ "
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "��� ��������..."
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "��������� ������ "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "����� diskdrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "������������ ������������"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "����� fdisk"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "����������� ������� %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"�������� ���� �� ����������� ��� ����� %s\n"
+"���� ����������, ��� �������� �� ������������ �������� `w'"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "�� ��������;"
+#: ../../install_interactive.pm_.c:195
+msgid "You don't have enough free space on your Windows partition"
+msgstr "��� ����� ������ �������� ���� ���� ��������� ��� Windows"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "���������� ������ ���� ��� ���������� ��� �������:"
+#: ../../install_interactive.pm_.c:210
+msgid "I can't find any room for installing"
+msgstr "��� ����� �� ��� ������ ���� ��� �����������"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "�� ������������� ��� ���������� ��������� ��� �� �11;"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "�� DrakX ����� ��� �������� ������:"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "�������� �������� ��� �������� �����������"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "� ��������� �������: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "��� ������� ����� ��������� windows!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "�������� �������"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "��� ����� ������ ���� ��� �� Lnx4win!"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "������� ����������� �������."
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"�������!\n"
-"\n"
-"�� DrakX ������ ���� �� ������� �� ������� ��� ���������� ��� Windows.\n"
-"� ���������� ���� ���������� ���������. ��� ��� �� ����� ����� ���,\n"
-"�� ������ �� �������� ��� ��������� �� ������ ������� ��������� (��\n"
-"scandisk) ��� ���� ��������� �� ��� ���������������������� (defragment).\n"
-"���� �� ������ �� ��������� ��������� ��������� ��� ��������� ���.\n"
-"��� ����� ��������, ������� Ok."
+"���������� ������ ��� ��� ���� ��� �� �� ��������.\n"
+"��� ������ � ��� ��� ���������� ��� ������������ (�� ����� �������� ��� "
+"Internet).��������� �� ����� ��� ������."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "�������� ������ �������� �������"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "����� ������ �������� %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "���� ��������� �� ��������������� ��� �� Linux4Win;"
+#: ../../install_steps.pm_.c:375
+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 ""
+"������ ��������� ������ ��� ������������� �����.\n"
+"� ������ CD-ROM � �� CD-ROM ����� ������������.\n"
+"������� �� CD-ROM �� ��� ���� ������� ��������������� ��� ������ \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "�������� �� ������"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "����� ������ ��� %s"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "������� ������� ���������� ���������� �� MB:"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "��� ������� ���������� ������ ���������"
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "������� ���������� swap �� MB"
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "���� `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"�� ������� ��� ��� ���� �������� ������. ������ �� �������������� "
+"����������\n"
+"���� ����������� ��� Linux-Mandrake. ��� ������ ����, �������� �� ���������� "
+"����������� ��������.\n"
+"������� F1 ���� ��� �������� ��� CDROM, ���� ������ `text'."
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "�������� �������� ��� �������� �����������"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2529,7 +3256,7 @@ msgstr ""
 "��� ������ ������� �� ������������ ���� �� ��� ��������� ������.\n"
 "��� ������� 100% �� ������������ ��� �� ���������� ������."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2545,58 +3272,99 @@ msgstr ""
 "��� ������ ������� �� ������������ ���� �� ��� ��������� ������.\n"
 "��� ������� %d%% �� ������������ ��� ����������� �������."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "�� ��������� �� ������ �������������� ������� ��� ������� ����."
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "������� ������� ���� �����������"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "�������� �� ������ ��� ������ �� �������������"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "�����������"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "�����������"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "�������� ������� ����������"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "�������� �������"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "�������� �������"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "�������� ������ �������� ��� �������� �����������"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "����� ������"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "�����: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "������: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "�������: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "�������: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "�������� �������: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+"��� �������� �� ��������� ���� �� ������ ����� ��� ������� ������� �����"
+
+#: ../../install_steps_gtk.pm_.c:386
+msgid "The following packages are going to be installed"
+msgstr "�� ������������� �� �������� ������"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "�� ���������� �� �������� ������ "
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "��� �������� �� ���������/������������ ���� �� ������"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "���� ����� ����������� ������, ��� ������ �� �����������"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "��� �������� �� ������������ ���� �� ������. ����� ��� �������������"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2604,45 +3372,88 @@ msgstr ""
 "���� �� ������ ������ �� ������������\n"
 "����� �������� ��� ������ �� �� ������������;"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "��� �������� �� ������������ ���� �� ������. ������ �� ������������"
 
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-"��� �������� �� ��������� ���� �� ������ ����� ��� ������� ������� �����"
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "�� �������� ������ �� �������������/����������"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "��� �������� �� ���������/������������ ���� �� ������"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "�����������"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "��������"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "�������� ����������, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "���������� ������ "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "��������� ������ "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "�������"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "������������ ������������"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d ������"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "����������� ������� %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "�������"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2656,189 +3467,391 @@ msgstr ""
 "�������� �������� �� Cd-Rom �� ����� \"%s\" ���� ����� ��� ��� ������� ��.\n"
 "��� ��� �� �����, ������� ������� ��� ������� ������������ ��� ���� �� CdRom."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "������"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "�� ��������;"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "���������� ������ ���� ��� ���������� ��� �������:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "���������� ������ ���� ��� ����������� ��� �������:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "���������� ������"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "�������� �������� ��� ������."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "������������"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "�������� �������� ���������� �������������."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr ""
 "�������� �� ��������� ��� ����� ������� ��� �� ����� ���������� ���� �� "
 "����� ��� ������������"
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Root Partition (������ ��������� ����������)"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "���� ����� � ������ ��������� (/) ��� ���������� ���;"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "���"
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "����� ������������"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "�� ���� ������������ ���������;"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Install/Update"
 msgstr "�����������/����������"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Is this an install or an update?"
 msgstr "��������� ��� ����������� � ��� ����������;"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "��������"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "�����������"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "�������������"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "��� ��������"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "����� �������� ��� ����� �������;\n"
-"�� ��� ���������� ������� ���� ����������� ��������!"
+"�� ��� ���������� ������� ���� ����������� ��������!\n"
+"�� ��� ������ ��������� ����: ``����� ������� ������������;'',\n"
+"����� ������� �� ���������� �� ������� ���������;"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+msgid "Update"
 msgstr "����������"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "��������"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "������� ��������"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "��������"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "������������ �������"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
 msgstr "��� �� ����� ����������� �� ������� ���;"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "�������� �������� ���� ���������."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "���� ���������"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr ""
 "�������� �������� �������� ���� ���� ����� ����� ����������� �� ������� ���."
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "������� ������ PCMCIA "
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "������� IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "��� �������� ���������� �����������"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "���� ��������� �� ��������������� �� ����� (/);"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "�������� ������ ��������"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"��� ����� �� ������� ��� ������ �����������, ����� ���� ������������� :(\n"
+"�� ���������� �� �������� ���������� ��� ����������� ����������� ��� ���\n"
+"�� �������� �� ������. � ���� ������� ��� ����� �� ��� ���������� ��� \n"
+"DrakX �� ������� ��� ������ �����������. �� ������ �����: %s\n"
+"\n"
+"���������� �� ���������� ���� �� �����������;\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"�� DiskDrake ������� �� �������� ����� ��� ������ �����������.\n"
+"��������� �� ���� ��� ������!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Root Partition (������ ��������� ����������)"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "���� ����� � ������ ��������� (/) ��� ���������� ���;"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "���������� ������������ ��� �� �������������� �� ������� ���� ������ "
 "�����������"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "�������� ����������� ���� �����������"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "������� ��� ��������� blocks;"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "����������� �����������"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "���������� ��� ����������� ������� %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "��� ������� ������ swap ��� ��� ���������� ��� ������������, �������� "
 "���������"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "����� ��� ��������� ������"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "������������� ������� ���� ����������"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
-"�� ������� ��� ��� ���� ������ ��������� ���� ��� ����������� � ����������"
+"�� ������� ��� ��� ���� ������ ��������� ���� ��� ����������� � ���������� "
+"(%d > %d)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "������ (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "�������� (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "����������� (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "�������������"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "�������� �� ������� ��� ������ �� �������������"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "������� ������ �������"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "������� ���������� �������"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2848,12 +3861,12 @@ msgstr ""
 "��� ��� ����� ������ ��� �� �������� CDs, ������� �������.\n"
 "��� ��� ����� ������ ��� ����, ����������� �� ��� ������� Ok."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom ������� \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2861,173 +3874,11 @@ msgstr ""
 "����������� ������� %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "��������� ���� ��� �����������"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "��������� ���������� ��������� IP"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "������������ ������� ����"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "�� ��� ��������� �� ������"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "��������� �������"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "� ������ �������� ����� ��� ����������. ������ ��:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "������ �� ��������� ��� ������ (LAN) �������� ��� ���������� ���;"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "��� ������� ������������ �������"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "������� modem"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "������ �� ��������� ��� �������� ��� ���������� ��� ���� modem;"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "������� �������� ������� %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"�������� �������� ��� IP ��������� ��� ���� �� �������.\n"
-"���� �������� ������ �� �������� �� IP ��������� �� ��������\n"
-"����� (����������: 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "�������� IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP ���������:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "����� �������:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "� IP ��������� ������ �� ����� �� ����� 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "������� �������"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"�������� �������� �� ����� ��� ����������.\n"
-"�� ����� ���� ������ �� ����� ��� ������ ����� ����������,\n"
-"���� �.�. ``mybox.mylab.myco.com''.\n"
-"�������� ������ �� �������� ��� ��� ��������� IP ��� ����� �������"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "������������ DNS:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "������� �����:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "���� �������:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "����� ����������:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "�� ���� ��� modem?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "�� ���� �������� ����� ����� ����������� �� modem ���;"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "�������� dialup"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "����� ��������"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "������� ���������"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Login ID"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "����������� ����������"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "����� script"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "����� ����������"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "����� �������"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "������ ������������ DNS"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "�������� ������������ DNS"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3092,90 +3943,94 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "�������� ���� ��� ��� ����� �� ����� � ���� �������"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "������� ��� ���� �������"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "�������� �������� �� ������ ��� ������ �� �������������"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
-msgstr "�������� ���� ����"
+msgstr "���� ����� � ���� ����;"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "�� ����� ��� ���������� ��� ����� ���������� �� GMT (��� ����������);"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "���� ������� ��������� ������ �� ���������������;"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "����� �����������"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "����� ������� shadow"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "����� ������������ MD5"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "����� NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "yellow pages"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 "���� �� ����������� ����� ���� ���� (������ �� ����� ����������� %d "
 "���������� �����)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "����������� NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "������� (domain) NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "������������ NIS"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "������� ������"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "�������� ������"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(�� %s ���� ��� ���������)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3185,61 +4040,88 @@ msgstr ""
 "�������� ������\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "���������� �����"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "������ �����"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "������ (shell)"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "���������"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "�� ����������� ����� ���� ����"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "�������� �������� ������ �����"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "�� ������ ����� ������ �� �������� ���� ���� ��������, ��������, `-' ��� `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "���� �� ������ ����� ������� ���"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"��� ������������� �������� ��������� ��� ����� ��� ���������� �� ����������\n"
+"�� ������� ��� ����� ��� ����� ��� ������������ ���������. ���� ����� "
+"������� ��� ��� ������\n"
+"�� ������������� �� SILO , ��� ������ ���� ����������� ����������� �� SILO\n"
+"� ��� �� ��������� ��� ��� ���������� �� ����� SILO. ���� � �������� ������\n"
+"������ �� �������������� �� ��������� �� ��� �������� �������� ��� "
+"Mandrake,\n"
+"�������� ���������� ��� ��������� ��� ���������� ���� ��� ������ �����.\n"
+"������ �� ������������� �������� ���������;"
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "������ ������ ��������"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "�������� ������ ��������"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "���������"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3263,64 +4145,32 @@ msgstr ""
 "�������� ���������� ��� ��������� ��� ���������� ���� ��� ������ �����.\n"
 "������ �� ������������� �������� ���������;"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "�������, ��� ������� ���������� ������ ���������"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "�������� ����� ��������� ��� ���������� ��������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "�������� �������� ���� ����� %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "���������� ������ ���������"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "� ����������� ��� LILO �������. ���������� �� �������� ������:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "������ �� ��������������� �� SILO;"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "������� �������� SILO"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"�������� �� ��������� �������� ��� SILO.\n"
-"�������� �� ���������� �� ����� � �� �������� ��� ����������."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "���������"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "���� � �������� ������� ���"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "� ����������� ��� SILO �������. ���������� �� �������� ������:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "������������ ������������ ���������"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "������ �� ��������������� �� aboot;"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3329,128 +4179,125 @@ msgstr ""
 "���������� ����������� ������������, ����� ��� �� ���� ���� ��� ���������� "
 "��� ���������� ��� ������ ����������;"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "��������� proxy"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "� proxy ������ �� ����� http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "� proxy ������ �� ����� ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr ""
+"� ����������� ��� ������������ ��������� �������. ���������� �� �������� "
+"������:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "����� ������ ����� Crackers"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "�����"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "�����"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "���������"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "�������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(������ �� ���������� ���������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "�� ������������� ���������������� ���� ������ �����;"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "�������� ������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "������� ��������� ������ �� ���������� (��� ��������� %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "�������� ������� ����������� ������� �����������"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "���������� /tmp �� ���� ��������"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "������������ ��������� profiles"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "������������ num lock ���� ��� ��������"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "�������� ������� ������ �� Mb"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "������� � ����� ��� supermount �� ����� ������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"�� DrakX �� ������������ ������ ��������� ��� XFree 3.3 ��� XFree 4.0.\n"
-"�� �������, ��������������� � ������ 3.3 ������ ����������� ������������ "
-"������.\n"
-"\n"
-"������ �� ��������������� �� XFree 4.0;"
+"�������: �� ���� �� ������� ���������, � ������� �� ROOT ��� ����������� \n"
+"��� ��� �������! ��� ������ �� ���������� �� root, ������ ����� �� "
+"����������\n"
+"�� ����� ������� ��� �� ��������������� ��� ������ \"su\". ������, ��� "
+"����������\n"
+"�� ��������������� �� ������� ��� ��� ���� ����� ����� ��� �����������."
+
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"�������, � ������������ ��� numlock ���� ��� ���������� ����� ������� �� \n"
+"������ ����� ���� ��� �������� (�.�. �������� `p' �������� `6')"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "�� �������� �������� ��������� �������� PCI;"
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "�� ������������� ��� ���������� ��������� ��� �� �11;"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 "������ �� ������������� ��� �������� ��������� ������������ ��� ����������� "
 "����� ��� ������������;"
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "�������� ����� �������� ���� ����� %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "������������ �������� ��������� ������������"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3460,7 +4307,7 @@ msgstr ""
 "\n"
 "������ ������� �� ������������� ����;"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3483,153 +4330,18 @@ msgstr ""
 "�������\n"
 "�������� ��� �������� ������ ������ ��� Linux-Mandrake."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "��������"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "����������� ������ ��� %s ����� %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(module %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "����� %s ����� �� ��������;"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"�� ������� �����������, � %s ������ ���������� �������� ����������� ���\n"
-"�� ������������ �����, ���' ��� ��� ������� ���������� ��� ����� �����.\n"
-"�� ������ �� ������ �������� �������� � �� ������� ��� ����� �� ��������\n"
-"�� ����� ��� ��� ��� ����������� ��� ����������; � ������� ���� ����\n"
-"���������� ������� ��� ����������, ���� ��� �� ���������� �����."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "�������� �������"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "������������� ����������"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "�������� ���� �� ������ ����������� ��� ��� ����� %s"
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"�������� ���� �� ������ ��� ����������� ��� ��� ����� %s.\n"
-"�� ���������� ����� ��� ����� ``�����=���� �����2=����2 ...''.\n"
-"��� ����������, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "���������� ������"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"� ������� ��� ������ %s �������.\n"
-"������ �� ���������� ���� �� ������������ �����������;"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "�� �������� �� �������� ������ PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "������� ������ PCMCIA "
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "�� �������� �������� ��������� �������� %s;"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "����� %s %s ������������"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "����� �����;"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "����� ������� ����������� %s;"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "���"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "���"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "������� ����������� ������"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "�������� �������"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "������� ����������� �������."
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "����������� Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> ������ ������     | <Space> ������� | <F12> ������� ��. "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"�������� ���� �� ����������� ��� ������ ����� %s\n"
-"���� ����������, ��� �������� �� ������������ �������� `w'"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "�������� ����������"
 
@@ -3639,7 +4351,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "�������� (%s), �������� ������������ ��������\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "���� �������, �������������\n"
 
@@ -3653,442 +4365,944 @@ msgstr " ; (��' ������� %s) "
 msgid "Your choice? (default %s) "
 msgstr "� ������� ���; (��' ������� %s)"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "� ������� ���; (��' ������� %s �������� `none' ��� ������) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "������ ��������� (UK)"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "�.�.�. (US)"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "�������� (�����)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "�������� (�����������)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "�������� (��������)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "������������ (��������)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "������������ (���������)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "������������"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "�����������"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "�������� (��������� ����������)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "�������� (������� ����������)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "��������� (����� ����� �������)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak (���)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (���������)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "������� (\"������\" ����������)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "������� (\"��������\" ����������)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "������ (��������)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "�������"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "�������� 106 ��������"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "��������� ��������"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "���������� AZERTY (�����)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "���������� AZERTY (���)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "���������� \"number row\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "���������� \"��������\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "�������� (���������� qwerty)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "�������� (���������� qwertz)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "������������"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "�������� (������)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "������ (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Thai"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "�������� (����������� \"F\" �������)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "�������� (�������� \"Q\" �������)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "US �������"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "������� \"numeric row\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "�������������� (�������� ����������)"
 
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - Mouse"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "������"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "������"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "�� ������"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "��������"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "������� ����� �� 2 �������"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "������� ����� �� 3 �������"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (��������, ������ C7 �����)"
+
+#: ../../mouse.pm_.c:64
+msgid "busmouse"
+msgstr "busmouse"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "��� ��������"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "����� ��������"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "������"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "����� �������"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "������� -�"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "�����;"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "��������� ���������� (Internet)"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "������ �� ���������� �� ���������� ��� ��������� ����;"
+
+#: ../../netconnect.pm_.c:101
+msgid "Testing your connection..."
+msgstr "������ ��������... "
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "���� �� ������ ��� ����� ������������ ��� ���������."
+
+#: ../../netconnect.pm_.c:107
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+"�� ������� ��� ��� �������� �� ����� ����������� ��� ���������.\n"
+"��������� �� �������������� ��� ������� ���."
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "��������� ISDN"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"�������� ��� ������� ���\n"
+" ��� ��� ����� ���� ��������, �������� Unlisted"
+
+#: ../../netconnect.pm_.c:158
+msgid "Connection Configuration"
+msgstr "��������� ���������"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "�������� ������� � ����������� �� �������� �����"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "IRQ ������"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "DMA ������"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "IO ������"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "IO_0 ������"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "IO_1 ������"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "���������� ������� ���������"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "����� ������� (�.�. provider.net)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "������� ��������� �������"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "DNS 1"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "DNS 2"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "������ ������"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "'����� ���������� (user name)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "����������� �����������"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "����������� ������������"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "������"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "������ (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "��������� ������"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "��������� ������ - ����� D-Channel (���������� �������)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "���� ���������� ������ �� ���������������;"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "��� ����"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "�� ����� �����;"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "��������"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "�������"
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
+"\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"��� ����� ISA �����, �� ����� ���� ������� ����� �� ������ �� ����� ������.\n"
 "\n"
+"��� ����� PCMCIA �����, ������ �� ������ �� irq ��� �� io ��� ������ ���.\n"
+
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "���� ����� � ISDN ����� ���;"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "����������� ����� ISDN:\n"
+
+#: ../../netconnect.pm_.c:287
+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 ��� ��� �������� �����."
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr "��� ������� ����� ISDN. �������� �������� ��� ��� ��� �������� �����."
+
+#: ../../netconnect.pm_.c:331
+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:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "�������� ������� �������"
+
+#: ../../netconnect.pm_.c:336
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
 msgstr ""
-"KALOS HRTHATE STON EPILOGEA LEITOURGIKOU SYSTHMATOS LILO!\n"
+"�������� �������� ���� ������� ������� ������ �� ��������������� ��� ��� "
+"������� ��� ���������"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "������� �������"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
-"GIA NA DEITE TIS DIATHESIMES EPILOGES, PATHSTE <TAB>.\n"
+"Do you agree?"
+msgstr ""
 "\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"
+"����������;"
+
+#: ../../netconnect.pm_.c:352
+msgid "I'm about to restart the network device:\n"
+msgstr "�� ������������ ��� �������� ������� �������:\n"
+
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "��������� ADSL"
+
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "������ �� ��������� ���� ��� ��������;"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "�� ���� ��� modem?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "�� ���� �������� ����� ����� ����������� �� modem ���;"
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "�������� dialup"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "����� ��������"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "������� ���������"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Login ID"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "����������� ����������"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "����� script"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "����� ����������"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "����� �������"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "������ ������������ DNS"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "�������� ������������ DNS"
+
+#: ../../netconnect.pm_.c:582
+msgid ""
 "\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr ""
+"\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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Welcome to GRUB the operating system chooser!"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr ""
+"\n"
+"�������� �� �������������� ��� ������� ���."
 
-#: ../../lilo.pm_.c:432
-#, 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."
+#: ../../netconnect.pm_.c:582
+msgid "You are not currently connected to Internet."
+msgstr "���� �� ������ ��� ����� ������������ ��� ���������."
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
+"\n"
+"�������� �� ������������� � �� �������������� ��� ������� ���."
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "commands before booting, or 'c' for a command-line."
+#: ../../netconnect.pm_.c:586
+msgid "You are currently connected to internet."
+msgstr "���� �� ������ ����� ������������ ��� ���������."
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "The highlighted entry will be booted automatically in %d seconds."
+#: ../../netconnect.pm_.c:590
+msgid "Connect to Internet"
+msgstr "������� ��� ��������� (internet)"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "��� ������� ������� ����� ��� /boot"
+#: ../../netconnect.pm_.c:592
+msgid "Disconnect from Internet"
+msgstr "���������� ��� �� ��������� (internet)"
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Desktop"
+#: ../../netconnect.pm_.c:594
+msgid "Configure network connection (LAN or Internet)"
+msgstr "������� �������� ��� ������ (������ � ���������)"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Start Menu"
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "������� ��� ������� ���������� (internet)"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - Mouse"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr "�� ������������ ��� ������� ������� $netc->{NET_DEVICE}. ����������;"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB Mouse"
+#: ../../netconnect.pm_.c:641
+msgid "Configure a normal modem connection"
+msgstr "������� ����� �������� �� modem"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB Mouse (2 �������)"
+#: ../../netconnect.pm_.c:661
+msgid "Configure an ISDN connection"
+msgstr "������� �������� ISDN"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB Mouse (3 � ����������� �������)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "��������� ����� ISDN"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB Mouse"
+#: ../../netconnect.pm_.c:668
+msgid "External ISDN modem"
+msgstr "��������� ISDN modem"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB Mouse (2 �������)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "������� ��� ���������"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB Mouse (3 � ����������� �������)"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "�� ������ ����� � ISDN ������� ���;"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "������� ����� (PS/2)"
+#: ../../netconnect.pm_.c:691
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "������� �������� DSL (� ADSL)"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "������"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "������� ����� �� 3 ������� (PS/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "����� �����"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "�� ���� ���� ���������;"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "Alcatel modem"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "ECI modem"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "��� �� adsl modem ��� ����� alcatel, �������� Alcatel. ������, ECI."
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "����� pppoe"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "�� ����� pppoe"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"� ��� ������ ������ �������� adsl ����� dhcp + pppoe.\n"
+"��������� ���� ��������� ������������� ���� dhcp.\n"
+"��� ��� ������, �������� pppoe"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:765
+msgid "Configure a cable connection"
+msgstr "������� ���������� ��������"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus Mouse"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"����� ������ dhcp ������ �� ���������������;\n"
+"� ���������� ����� dhcpd"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus Mouse"
+#: ../../netconnect.pm_.c:800
+msgid "Disable Internet Connection"
+msgstr "�������������� �������� ��� ���������"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus Mouse"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "������� ������� �������"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB Mouse"
+#: ../../netconnect.pm_.c:815
+msgid "Network configuration"
+msgstr "��������� �������"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB Mouse (3 � ����������� �������)"
+#: ../../netconnect.pm_.c:816
+msgid "Do you want to restart the network"
+msgstr "������ �� �������������� �� ������;"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "����� �������"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "�������������� �������"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A � ������� (��������)"
+#: ../../netconnect.pm_.c:834
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "������� �������� ��� ��������� / ������� ������� �������"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (��������)"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"� ������ �������� ����� ��� ����������. \n"
+"������ ��:"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (��������)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "��� ������ �� ���������� ��� ���������;"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (��������)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "��������� �������"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (��������)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
+"���� ��� � ������� ��� �� �� ��������� ����������, � ����������� ��� ������ "
+"\n"
+"�� ��������� ���� ���� �� ��� ���������� �� ������ �����������. ��������: \n"
+"���������� ���� ����������� ������� ���� ���� �� ������������� ��� ������ "
+"������ (LAN).\n"
+"\n"
+"������ �� ��������� ��� ����� ����� ��� �������� Internet;\n"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (��������)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "��� ������� ������������ �������"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (��������)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "������� �������"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (��������)"
+#: ../../network.pm_.c:274
+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''."
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (��������, ������ C7 �����)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "����� ����������"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (��������)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+"�������: ���� � ������� ����� ��� ���������� ��� �� ��������� �� ��  "
+"���������.\n"
+"���� ������� OK ��� �� ��������� ��� ���������� ���������.\n"
+"���������� �� �������� ����� �� �������� ��� ��������� �������."
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "������� ����� (��������)"
+#: ../../network.pm_.c:302
+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 ""
+"�������� �������� ��� IP ��������� ��� ���� �� �������.\n"
+"���� �������� ������ �� �������� �� IP ��������� �� ��������\n"
+"����� (����������: 1.2.3.4)."
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft ������� (��������)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "������� �������� ������� %s"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "������� ����� �� 3 ������� (��������)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "�������� IP"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (��������)"
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "��������� IP"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "�����;"
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "����� �������"
+
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "� IP ��������� ������ �� ����� �� ����� 1.2.3.4"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:341
+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 ""
+"�������� �������� �� ����� ��� ����������.\n"
+"�� ����� ���� ������ �� ����� ��� ������ ����� ����������,\n"
+"���� �.�. ``mybox.mylab.myco.com''.\n"
+"�������� ������ �� �������� ��� ��� ��������� IP ��� ����� �������"
+
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "������������ DNS"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "���� �������"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "������� �����"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "��������� proxies"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "� proxy ������ �� ����� http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "� proxy ������ �� ����� ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr "� ���������� ��������� ��� ������������� �� ����� ��� ���� ����������"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4098,21 +5312,21 @@ msgstr ""
 "� �������� ���� ����� �� ������������ ��� ����������� ����������� ��� ���� "
 "���� �� ���� �� ������ ����� ���� ���������� ���������"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "������ ���� ��� �������� ��� ������� %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "� ��������� ��� �� ������ %s �������: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "������������ �������� ������"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "������ �������� ��� ������ %s"
@@ -4146,42 +5360,51 @@ msgstr "����������"
 msgid "maybe"
 msgstr "����"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (���������)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (���� ����)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (����)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "�������� ���������"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "�������� ������������"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "������� ���������"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "���������������� lpd"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "���������������� ���������"
+
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "���������������� ������������ CUPS"
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "���������������� ������������ lpd"
+
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "��������� ������� (socket)"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "������� �������� URI"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "���������� ��������..."
@@ -4195,11 +5418,11 @@ msgstr "������ �����"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "���� ��������� ����� \"%s\" ����������� ��� "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "������� ������� ��������"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4207,15 +5430,15 @@ msgstr ""
 "�� ���� ������� ����� ������������ � ��������� ���;\n"
 "(��������: �� /dev/lp0 ����������� ��� LPT1:)\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "������� ��������"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "�������� ���������������� lpd ��������"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4226,19 +5449,19 @@ msgstr ""
 "����������, ����� ��� �� ����� ��� ����� ��� ����� �� \n"
 "��������������� �� ����� ��� �����������."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "��������������� �������� �����:"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "����� ���������������� �����"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "�������� �������� SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4253,27 +5476,27 @@ msgstr ""
 "��������, ����� ��� ����������� ���������� ���������� ���� ������� \n"
 "������, ����� ������ ��� ����� � ������ ��������."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "�������� ����� SMB �����������:"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP ��������� SMB �����������:"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "����� �����:"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "����� ��������:"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "�������� �������� NetWare"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4286,130 +5509,155 @@ msgstr ""
 "�� ����� ��� �������� ���� ����� ���������� ��������, ����� ���\n"
 "����������� ���������� ���������� ���� ������� ������ ��� ����� ������."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "������������ ����������"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "����� ����� ��������"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "�������� �������� socket"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"��� �� ���������� �� ���� �������� socket, ������ �� ������ �� \n"
+"�������� ����� ��� �������� ��� ����������� ��� ������ �����."
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "����� ��������"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "����"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+"�������� �� ������ ���������� �� URI ��� �������� ���� �������� ���� CUPS."
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "�� ����� �������� �����;"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "������ �� ���������� ��� ��������;"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "�������� ������������ �������..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"��� � ������������ ������������ ������� ��������� ���� ��������.\n"
+"������ �� ������� ������� ������ ����� � �������� �� ���������.\n"
+"��������� ���������:\n"
+"%s\n"
+"\n"
+"����� ����� � ��������"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"��� � ������������ ������������ ������� ��������� ���� ��������.\n"
+"������ �� ������� ������� ������ ����� � �������� �� ���������.\n"
+"����� ����� � ��������;"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "���, ������ ����������� ������ ASCII"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "���, ������ ����������� ������ PostScrip"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "���, ������ ��� ��� ��� ������������ �������"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "������� ��������"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "�� ����� �������� �����;"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "�������� ��������"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "������� �������"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "������� ������� �� �� ����� ��� ���������;"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "�������� ������ Uniprint"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "�������� ������ ��������"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "�������� �������� ��� PostScript;"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "���������� ����� �������;"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "�������� ��������-������;"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "������� ������� ��� ������� ������"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "��������/����� ��������� �� ������� (1/72 ��� ������)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "����/���� ��������� �� ������� (1/72 ��� ������)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "�������� �������� GhostScript"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "�������� �������� ��������"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "������ �� ���������� ��� ��������;"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "�������� ������������ �������..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"��� � ������������ ������������ ������� ��������� ���� ��������.\n"
-"������ �� ������� ������� ������ ����� � �������� �� ���������.\n"
-"��������� ���������:\n"
-"%s\n"
-"\n"
-"����� ����� � ��������"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"��� � ������������ ������������ ������� ��������� ���� ��������.\n"
-"������ �� ������� ������� ������ ����� � �������� �� ���������.\n"
-"����� ����� � ��������;"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "���������"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "�� ������ �� ��������� ���� ��������;"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4417,19 +5665,66 @@ msgstr ""
 "�������� �� ��������� ����� ���������.\n"
 "�������� �� ���������� �� ����� � �� �������� ��� ����������."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "�������� CUPS"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr "�������� ����� ������ CUPS"
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "������ �������� ��������"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "��� ����� ������������ � ��������� ���;"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "������ �������� ���������������� ��������"
+
+#: ../../printerdrake.pm_.c:388
+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\"."
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "�������� �����"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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"
+"����� �� ����� ��� �������� ��� ��� ����� ������������ � ���������;"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "����� ��������"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "���������"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "���������"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4440,45 +5735,45 @@ msgstr ""
 "��� ����� (����� lp) ��� ���� ��������. �� ����� ��� �������� �� \n"
 "����� �� ����� ��� ���� �������� ��� ��� ����� ������������ � ���������;"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "����� �����"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "���������"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "������ �������� ��������"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "��� ����� �� �������� ��������� ��� _�������������_ RAID md%d"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "��� ����� �� ���������� �� ������ $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "�������� mkraid"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "�������� mkraid (����� ����������� �� raidtools;)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "��� �������� ������� ����������� ��� RAID �������� %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, ��� ��������� ���������� ��������� �������."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4487,7 +5782,7 @@ msgstr ""
 "������ ������ �� �������������� ��� �� �������� �������� ��� ���������� �� \n"
 "��������� ������� �������� ��� ���������."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4495,7 +5790,7 @@ msgstr ""
 "������� ������� ����������������� ��� ��� ������ at ��� ������ �������\n"
 "���� � ������ ��� ���������� ����� ������ �������."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4508,7 +5803,7 @@ msgstr ""
 "�������� ����������� ��� ������������� �������� �������� ��� ��� ������� "
 "���������."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4519,7 +5814,7 @@ msgstr ""
 "�������� ��� ��������� ����������� �������� ��� ����������� �� ����� \n"
 "mouse ���� �������, ����� ��� ���������� ����������� menu."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4527,7 +5822,7 @@ msgstr ""
 "� Apache ����� ���� ������������ WWW. ������ �� ������������ ������\n"
 "HTML ��� CGI."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4543,7 +5838,7 @@ msgstr ""
 "����� ��� ��������� ������������� ������ ��� ��� ��������� ��� ��� ������\n"
 "����� ��������."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4553,7 +5848,7 @@ msgstr ""
 "�������� ��� /etc/sysconfig/keyboard. ���� ������ �� ��������� �� ��� \n"
 "����� ��� ��������� kbdconfig. ������ ������ ����� �� ����� ��������������."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4562,7 +5857,7 @@ msgstr ""
 "� ������ lpd. ����� ������ ���� ������������ ��� ������� �� ������ \n"
 "����� ���������."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4570,7 +5865,7 @@ msgstr ""
 "� named (BIND) ����� ���� Domain Name Server (DNS) ��� ���������������\n"
 "��� �� ���������� ������� �� ����������� IP."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4578,7 +5873,7 @@ msgstr ""
 "������� ��� ���������� ��� �� �������� ��������� ������� (NFS, \n"
 "SMB ��� NCP (Netware))."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4586,7 +5881,7 @@ msgstr ""
 "�����������/������������� ��� �� ������������ ������� ��� ����� \n"
 "��������� �� �������� ���� ��� ��������."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4596,7 +5891,7 @@ msgstr ""
 "������ TCP/IP. ���� � �������� ��������� ����������� �����������, � \n"
 "������ ���������� ��� �� ������ /etc/exports."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4604,7 +5899,7 @@ msgstr ""
 "�� NFS ����� ��� ��������� ��������� ��� ��� ����������� ������� �� \n"
 "������ TCP/IP. ���� � �������� ��������� ����������� ����������� �������."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4617,7 +5912,7 @@ msgstr ""
 "������, ����� ����� ������� �� ������������ �� ��������� ��� ��� �� "
 "�����������."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4628,7 +5923,7 @@ msgstr ""
 "��� ��������� ���� �� NFS ��� �� NIS. ������ �� ����� �������������� �� \n"
 "��������� ��� ����� �� ������������ ������� ����������."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4637,7 +5932,7 @@ msgstr ""
 "��������� ��� ��������� ��� ��� �������� ������������� ��� �� \n"
 "��� ������� ��� ����."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4645,7 +5940,7 @@ msgstr ""
 "���������� ��� ���������� ��� ���� ��������� ��� ���������� ��� \n"
 "��� ���������� ��������� ��������� ������� �������."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4656,7 +5951,7 @@ msgstr ""
 "\n"
 "����� ������, ���������� ������ �������� ������������� ���������."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4665,7 +5960,7 @@ msgstr ""
 "������� ��������� ��������� ��� ����������� ������� �� ���� \n"
 "�� ������."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4673,7 +5968,7 @@ msgstr ""
 "�� ��������� rusers ��������� ����� ������� ���� ������� �� \n"
 "������������� ���� ������������� ������� ����� ����������."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4681,7 +5976,7 @@ msgstr ""
 "�� ��������� rwho ��������� �� ����������������� ������� �� ���� ���� \n"
 "�������� ��� ������� ��� ���������� (�������� �� �� finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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."
@@ -4690,54 +5985,228 @@ msgstr ""
 "��� �� ������ �������� ��� ������ �������������� ���������� (log files)\n"
 "���������� � ������� ���������� ����� ��� ���������."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr "���� � ����� ������� ��������� �� �������� ���� ������� ��� usb mouse."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "�������� ��� ��������� ��� �������� ����������� ��������������."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "�������� ����� ��������� �� �������� �������� ���� ��� ��������"
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 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"
+"��� ����� �� ������� ��� ������ �����������, ����� ���� ������������� :(\n"
+"�� ���������� �� �������� ���������� ��� ����������� �����������"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "������� LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "���������� ��������� ���������"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "����������� ���������"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "�������"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "� ����������� ��� LILO �������. ���������� �� �������� ������:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "����������� �������� Internet ���������������"
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+"� ������� ��� ����������� �������� Internet ���� ��� �����.\n"
+"���� �� ������ ����� ������.\n"
+"\n"
+"�� ������ �� ������;"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "�������"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr "�����"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+msgid "reconfigure"
+msgstr "������������"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "����������� �������� Internet �����������������"
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+"� ������� ��� ����������� �������� Internet ���� ��� �����.\n"
+"���� �� ������ ����� ���������.\n"
+"\n"
+"�� ������ �� ������;"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+msgid "enable"
+msgstr "������������"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "�� ����������� ��� ������� ��������� ��� ������� �� ������������"
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "����������� �������� Internet"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+"� ����������� ��� ������ �� ��������� ���� ���� �� ���������� \n"
+"��� ������� �� �� ��������� �� ������ �����������.\n"
+"\n"
+"��������: ���������� ���� ����������� ������� ���� ���� �� ������������� ��� "
+"������ ������ (LAN).\n"
+"\n"
+"������ �� ��������� ��� ����� ����� ��� �������� Internet;"
+
+#: ../../standalone/drakgw_.c:177
+msgid "using module"
+msgstr "����� ����������"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "��� ������� ������������ ������� ��� ������� ���!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"��� ������� ������������ ������� Ethernet ��� ������� ���. �������� "
+"��������������� �� ��������� �������� ������."
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"������� ���� ���� ����������� ������������ ������� ��� ������� ���:\n"
+"\n"
+"$interface\n"
+"\n"
+"������ �� ��������� �� ������ ��� ������ ��������������� ����� ��� "
+"�����������;"
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"�������� �������� �� ������������ ������� �� ��������\n"
+"��� ������ ��� ������."
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"�������, � ������������ ������� ����� ��� �����������. ������ \n"
+"�� ��� ��������������;"
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+"������ ������������������ ��� ���������� LAN ���� �������� ������� ��� $_!\n"
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "����������� ������� firewall!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+"�������! ����������� ��������� ������� firewall. ���� ���������� "
+"���������\"������������\" ��������� ���� ��� �����������. �� ��������;"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "�������, ����������� ����������, �������� ������������..."
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring..."
+msgstr "�������..."
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "��� ����� �� ����������� �� ipchains RPM �� �� urpmi."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "��� ����� �� ����������� �� dhcp RPM �� �� urpmi."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "��� ����� �� ����������� �� linuxconf RPM �� �� urpmi."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "��� ����� �� ����������� �� bind RPM �� �� urpmi."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "��� ����� �� ����������� �� caching-nameserver RPM �� �� urpmi."
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "������������!"
+
+#: ../../standalone/drakgw_.c:513
+msgid ""
+"Everything has been configured.\n"
+"You may now share Internet connection with other computers on your Local "
+"Area Network, using automatic network configuration (DHCP)."
+msgstr ""
+"'��� ����� ���������.\n"
+"�������� ���� �� ���������� ��� ������� ��� ��� ��������� �� ������ "
+"����������� ��� ������ ��� ������, �� ��� ����� ��������� �������� ������� "
+"(DHCP)."
+
 #: ../../standalone/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4800,23 +6269,31 @@ msgstr "������� �������� ���������"
 msgid "Choose the tool you want to use"
 msgstr "�������� �� �������� ��� ������ �� ���������������"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "�� ���������� ������������� �����;"
+#: ../../standalone/livedrake_.c:23
+msgid "Change Cd-Rom"
+msgstr "������ 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 ""
+"�������� �������� �� CD ������������ ���� ����� ��� ��� ������� ��.\n"
+"��� ��� �� �����, ������� ������� ��� ������� ��������� �����������."
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "�� ���� ��������� �����;"
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "��� ������� serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "��������� ������ ��������;"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "�� ���� �������� ���� ����� ����������� �� ������� ���;"
 
@@ -5029,15 +6506,879 @@ msgstr "������ ������"
 msgid "Finding leaves takes some time"
 msgstr "� ������ ������ ���������� ������ �����"
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "����������� ������� ������������ (Gnome, IceWM)"
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "�� ���������� �������� KDE �� ��� ������� ������������ ���������"
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr "���������� ���������� ���������"
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr "�������� ��� ���������� ��� ������� CD"
+
+msgid "Internet Tools"
+msgstr "�������� ����������"
+
+msgid "Internet"
+msgstr "��������"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr "���������� ���������� ����������� ���������"
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, ���"
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr "����������� �������� ���� �� Gimp"
+
+msgid "Office"
+msgstr "�������"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr "������ ��������� (mysql ��� postgresql)"
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "�������� ��� Palm Pilot � Visor"
+
+msgid "Multimedia - Graphics"
+msgstr "�������� - �������"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr "����������� ������������ ��� ����������� video"
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "���������� (���������)"
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr "�������� ��������: ������������ ��������, ��������� ����� ���"
+
+# ../../share/compssUsers
+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
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "�������� ����: mp3 � midi players, ������ ���"
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+"�������� �������� ���������� ���� xchat, licq, gaim ��� ��������� �������"
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "������ ��� ������ ��� �� Linux ��� �� �������� ���������"
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ���"
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "������� ���������� �� ������ �������� ��� ���������"
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "�������� ��� ������������, ���, web, �������� ������� ��� ���������"
+
+msgid "Multimedia - Video"
+msgstr "�������� - Video"
+
+msgid "KDE"
+msgstr "KDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr "����������� ������������ ��� ����������� video ��� ����"
+
+msgid "Multimedia"
+msgstr "��������"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr "���� ������� ������������"
+
+msgid "Multimedia - Sound"
+msgstr "�������� - ����"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "����������"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "����������� ����������� �����������, ���� �� gnucash"
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr "���������� ��������"
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr "���������"
+
+msgid "Multimedia - CD Burning"
+msgstr "�������� - ������� CD"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr "�������� ������������"
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr "������ ���������"
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "�������� �� ������� ��� ������ �� �������������"
+
+#~ msgid "Total size: "
+#~ msgstr "�������� �������: "
+
+#~ msgid "��������������"
+#~ msgstr "�������"
+
+#~ msgid ""
+#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "� ����������� ��� ������ �� ��������� ���� ���� �� ���������� ��� \n"
+#~ "������� ��� �� �� Internet �� ������ �����������\n"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "����������� ���!\n"
+
+#~ msgid ""
+#~ "Time (secs) of inactivity after which\n"
+#~ "it hangs up. (leave blank to disable it)"
+#~ 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 "�� ���� ���������� ������;"
+
+#~ 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "�������� \"�����������\" ��� ��� ������� ���������� ����������� GNU/Linux\n"
+#~ "��� ������� ���, � ��� ������ �� ���������������� ��������� �������������.\n"
+#~ "\n"
+#~ "�������� \"�������\" ��� ������ �� ��������� ��� ���������\n"
+#~ "����������� ��� Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "��������:\n"
+#~ "\n"
+#~ "  - �����������: ��� ���� ����� � ����� ���� ��� ����������� GNU/Linux.\n"
+#~ "\n"
+#~ "  - �������������: ��� ����� ������������� �� �� GNU/Linux, �� ��������� �� "
+#~ "\n"
+#~ "    ��������� �� ������ ����� ��� ���������� ��� (��� �������� ��� "
+#~ "������������)\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "�� ���� �� ������, �������� �� ��������� ����� ����������� �� "
+#~ "���������������\n"
+#~ "��� ��� ����������� ��� Linux-Mandrake, �� ����� ����� ��� ������� (���\n"
+#~ "���������� ����������� GNU/Linux � ��� ������ �������� �����������).  "
+#~ "�����������,\n"
+#~ "�� ������ �� ������� �����������. ���� � ���������� ���������� ���� \n"
+#~ "������ ���������� ��� ����� ��� ������� ��� ������ �� ��������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������ �� ������������� ���� �����������, �������� \"��������\n"
+#~ "��������\" ��� �������� ���������� ��� ���������� �����������.\n"
+#~ "�������� �� ��������� �� ����� ������ ����� �� ������������� ��\n"
+#~ "����������� �������� ���� ��� \"hda\" ��� ��� ����� IDE �����, \n"
+#~ "��� \"hdb\" ��� ��� ������� IDE �����, ��� \"sda\" ��� ��� �����\n"
+#~ "SCSI ����� ���.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������������ ����������� �����: � ����� ��������� (/), � �����\n"
+#~ "����� �� ������ ������ ��� ��������� ��� ���������� ������� ��� �\n"
+#~ "/boot, � ����� �������� �� ���������� ��� ��� �������� ��� ����������\n"
+#~ "������.\n"
+#~ "\n"
+#~ "\n"
+#~ "������ �� ������������ ��� ����������� ���������� ����� ������� ��\n"
+#~ "�����������, � ���������� ���� ������ �� ����� ������� ��� ����\n"
+#~ "������ ������. �� DiskDrake ��� ��������� ��� ����� �������.\n"
+#~ "�������������� ��� ���������� ��� ��� ��������� ���� �������� ���.\n"
+#~ "\n"
+#~ "\n"
+#~ "�������� �� ���������� ��� �������� ��������������� �� ������������: \n"
+#~ "������������� ��������������� �� ������� Tab ��� �� ���� ��� ���� ����.\n"
+#~ "���� ��� ��������� ���� ��������, �������� �� ��������:\n"
+#~ "\n"
+#~ "- Ctrl-C ��� ���������� ���� ���������� (�� ����� ����)\n"
+#~ "\n"
+#~ "- Ctrl-d ��� �������� ����������\n"
+#~ "\n"
+#~ "- Ctrl-m ��� ������ ������� ��������\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."
+#~ msgstr ""
+#~ "���� �� ���� ����������� ������ �� ������������� ������ \n"
+#~ "��������������� (����������� ����� � ���������� ����������\n"
+#~ "�������). �� ���� �� ������, ���� �������� �� �������������\n"
+#~ "���� ��� ������� ���������� ����������� ��� �� ������� �������\n"
+#~ "�������� ��� ���� ���������. ��������: ��� ����� ���������� �� \n"
+#~ "������������������ ���������� �����������, ������ �� ���������\n"
+#~ "������ ��� �������� �� ����� �� ������ �� ���������. ������� \n"
+#~ "������������ �� ����������� /home ��� /usr/local."
+
+#~ 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."
+#~ msgstr ""
+#~ "�� ������ ��� ��������� �� ������������� ����. ���� � ����������\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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "��� �� DrakX ������� �� ������������ ��� ���� ��������� ���\n"
+#~ "��������������, � ��� ������ �� ����� �� ������� �����, �� ���\n"
+#~ "������������ � �������� ���������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ���������� �� ��� �������� ��� DrakX, ���� ������� 'Ok'\n"
+#~ "������, �������� ���� ���� ��������� ��� ���������\n"
+#~ "��� ����� ������������ ���� ���� ���.\n"
+#~ "\n"
+#~ "\n"
+#~ "���� ��������� ��������� ���������, �� ������ ������ �� ����� ���\n"
+#~ "DrakX �� ���� ���� ����� ����������� �� ������� ���."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "���� �� ������ ����� ��� ������� ������� ������� (LAN) � ���\n"
+#~ "modem.\n"
+#~ "\n"
+#~ "�������� \"������ ������\" ��� �� DrakX �� ����������� �� \n"
+#~ "��������� ��� ����� ������� Ethernet ��� ������� ���. �� ������\n"
+#~ "PCI �� ����������� ��� �� ������������� ��������. \n"
+#~ "�� ���� � ����� ��� ����� ����� ISA, � ��������� ���������� ��� \n"
+#~ "�� ������������ ��� �� ������ �� ��������� ���� ����� ��� ��� \n"
+#~ "�������� ��� �� ���������� ������ ����.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ����� ��� ������ SCSI, �������� �� ������� ��� ����� �� ���������\n"
+#~ "��� ����������� (�����) ��� ����� ����, ������ �� ������ �� ������\n"
+#~ "����� ��� �������� �����������, ��� ������ �� ���������� ��� ���\n"
+#~ "���������� ��� ������ ���.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ����������� �� Linux-Mandrake �� ����� ���� ��� ���������� �������,\n"
+#~ "� ������������ ��� ������� ��� �� ��� ���� ��� ����� ��� ����������� \n"
+#~ "����������� (��������� IP, �����, ����� �������). ��� ���������� ���\n"
+#~ "��� ������, ��� ���������� ��� �����, �� ������ �� ����������� �����\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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "�� GNU/Linux ������ �� ����������� �� ������� ������ ���������. �\n"
+#~ "������� ��� ������ ������� ������������ ���������. ��������� ���\n"
+#~ "�� ��������� ��������� ������������ �� 'lp' �� ��' ������� �����\n"
+#~ "��������, ����� ������ �� ����� ���������� ���� �������� �� ����\n"
+#~ "�� �����. �������� ���� �� ������ ����������� ��� ���� ������� ��\n"
+#~ "���� ��������, ������������� �� �� '|'. �����, ��� ��������� ��� ���\n"
+#~ "������ �����, ������ �� �� ������ �����, �.�. \"My Printer|lp\".\n"
+#~ "� ��������� ��� ���������� (���) \"lp\" �� ����� � ��' ������� ���������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� � ��������� ��� ����� ��' ������� ������������ ���� ����������\n"
+#~ "���, �������� \"������� ���������\". �� ������ ���� �� ������� \n"
+#~ "�� ���� ���� ����� ������������ � ��������� ��� ��� �� ���������\n"
+#~ "�� ��������� ������ (�����).\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������ �� ��������������� ���� �������� ����������� �� ������\n"
+#~ "��������������� Unix �������, �������� \"���������������� lpd\".\n"
+#~ "��� ���������� �� ������ ������ ������ ��� ������, ���� ������ �� ������\n"
+#~ "�� ����� ��� ����� ��� �������� ��� �� ���������������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������ �� ��������������� ���� �������� SMB (������ ���� ��������\n"
+#~ "����������� �� ������ ������� Windows 9x/NT), �� ������ �� ������\n"
+#~ "�� ����� SMB (�� ����� ��� ����� ����� TCP/IP) ��� ������� ��� ���\n"
+#~ "��������� IP, ����� ������ ��� ������ ������, ���� ������ ��� \n"
+#~ "����� ����� � ������ �������� ��� ������ �� ����� ��� ��������.\n"
+#~ "�� ���� ������� ��� ��� ��������� NetWare, �� ��� ������� ��� \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."
+#~ msgstr ""
+#~ "��� ���������� �� ���������� \"���\"! ��� ������ ��������\n"
+#~ "����������� ��� Windows, �� ������� ��� ����� ���������\n"
+#~ "(boot sector) ��� ����������. ��� �� �������� �� ����������\n"
+#~ "�� Linux, ����� ��� �� ����� ������������ �������� ���������\n"
+#~ "���� ����������� ���!"
+
+#~ msgid "Move your wheel!"
+#~ msgstr "������� �� ������!"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "������� �������;"
+
+#~ msgid "Host name:"
+#~ msgstr "����� ����������:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "�� ���� ��������� �����;"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "�������� ������� ���������"
+
+#~ 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"
+#~ msgstr ""
+#~ "�� �������� �������� ��������� ��� �� �������� ����� ����� ����������.\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?"
+#~ msgstr ""
+#~ "����� �� �������� �� ��� ��� ���������� ��������� (�� 800�600).\n"
+#~ "���� ���� ���� ���������� ������� ��� ����������.\n"
+#~ "������ �� ����������;"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "��� �������� ������� ���������� �����������\n"
+#~ "��������� ����������� ����� �������� � �����"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "�������� ������ ���������"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB Mouse"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB Mouse (2 �������)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB Mouse (3 � ����������� �������)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB Mouse"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB Mouse (2 �������)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB Mouse (3 � ����������� �������)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "������� �����"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus Mouse"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Bus Mouse"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech Bus Mouse"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB Mouse"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB Mouse (3 � ����������� �������)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A � ������� (��������)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (��������)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (��������)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (��������)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "������� ����� (��������)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsoft ������� (��������)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "������� ����� �� 3 ������� (��������)"
+
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse (��������)"
+
+#~ 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"
+#~ "\n"
+#~ "Do you want to keep XFree 3.3?"
+#~ 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 "curly"
+#~ msgstr "�������"
+
+#~ msgid "default"
+#~ msgstr "������� ��' �������"
+
+#~ msgid "tie"
+#~ msgstr "�������"
+
+#~ msgid "brunette"
+#~ msgstr "�������"
+
+#~ msgid "girl"
+#~ msgstr "�������"
+
+#~ msgid "woman-blond"
+#~ msgstr "������ �������"
+
+#~ msgid "automagic"
+#~ msgstr "����������"
+
+#~ msgid "Normal"
+#~ msgstr "��������"
+
+#~ msgid "Have you been provided with a hostname?"
+#~ msgstr "��� ����� ����������� ����� ������ (hostname);"
+
+#~ msgid "Local Area Network specification"
+#~ msgstr "������������� ������� �������"
+
+#~ msgid "You may now decide which class C network to use.\n"
+#~ msgstr "�������� �� ��������� ���� ������ ����� C �� ���������������\n"
+
+#~ msgid "Network:"
+#~ msgstr "������:"
+
+#~ msgid "Internet Connection Sharing - setup of $device"
+#~ msgstr "����������� �������� Internet - ������� ��� $device"
+
+#~ msgid ""
+#~ "The following interface is about to be configured:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+#~ msgstr ""
+#~ "��������� �� ��������� � �������� �������:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+
+#~ msgid "Everything configured!"
+#~ msgstr "����������� ���!"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "�� ���������� ������������� �����;"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "�� �������� �� �������� ������ PCMCIA"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "�� �������� �������� ��������� �������� %s;"
+
+#~ msgid "Small(%dMB)"
+#~ msgstr "�����(%dMB)"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "������� modem"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "������ �� ��������� ��� �������� ��� ���������� ��� ���� modem;"
+
+#~ msgid "Do you want to configure a ISDN connection for your system?"
+#~ msgstr "������ �� ��������� ��� ISDN �������� ��� ���������� ���;"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "�� �������� �������� ��������� �������� PCI;"
+
+#~ msgid "Searching root partition."
+#~ msgstr "������ ��� root partition."
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: ���� ��� ����� root partition, �������� �������� ��� ����."
+
+#~ msgid "No root partition found"
+#~ msgstr "��� ������� root partition"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "��� ����� �� ������������� broadcast ����� NIS domain"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "���� ��������� �� ��������������� �� ����� (/);"
+
+#~ msgid "You don't have any windows partitions!"
+#~ msgstr "��� ������� ����� ��������� windows!"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "��� ����� ������ ���� ��� �� Lnx4win!"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "��������"
+
+# 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"
+
+# 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 "SILO main options"
+#~ msgstr "������� �������� SILO"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "�������� �� ��������� �������� ��� SILO.\n"
+#~ "�������� �� ���������� �� ����� � �� �������� ��� ����������."
+
+#~ msgid "This label is already in use"
+#~ msgstr "���� � �������� ������� ���"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "� ����������� ��� SILO �������. ���������� �� �������� ������:"
+
+#~ 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."
+#~ 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"
+#~ "���� ����� ������������."
+
+#~ msgid "Shutting down"
+#~ msgstr "��������"
+
 #~ msgid "useless"
 #~ msgstr "�������"
 
 #~ msgid "garbage"
 #~ msgstr "��������"
 
-#~ msgid "Recommended"
-#~ 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"
@@ -5197,18 +7538,12 @@ msgstr "� ������ ������ ���������� ������ �����"
 #~ msgid "Hurt me plenty"
 #~ msgstr "����� �� �������"
 
-#~ msgid "Which usage do you want?"
-#~ msgstr "�� ������ ����� ���������;"
-
 #~ msgid "Which packages do you want to install"
 #~ msgstr "���� ������ ������ �� �������������"
 
 #~ msgid "Local LAN"
 #~ msgstr "������ ������"
 
-#~ msgid "Dialup with modem"
-#~ msgstr "����� modem"
-
 #~ msgid "Going to install %d MB. You can choose to install more programs"
 #~ msgstr ""
 #~ "�� ����������� %d MB. �������� �� ������������� ����������� �����������"
@@ -5243,9 +7578,6 @@ msgstr "� ������ ������ ���������� ������ �����"
 #~ msgid "Password:"
 #~ msgstr "���� ������:"
 
-#~ msgid "Local Printer Options"
-#~ msgstr "�������� ������� ��������"
-
 #~ msgid "server"
 #~ msgstr "������������"
 
diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po
index 5f0cd7bf4..b3c1e8971 100644
--- a/perl-install/share/po/eo.po
+++ b/perl-install/share/po/eo.po
@@ -1,51 +1,109 @@
+#
+# MESA�OJ DE DrakX
+# D. Dale Gulledge <dsplat@rochester.rr.com>, 2000
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
-"PO-Revision-Date: 2000-06-15 22:18-0500\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
+"PO-Revision-Date: 2000-09-25 22:18-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:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "Genera"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Grafika karto"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Elektu grafikan karton"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Elektu X servilon"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X servilo"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Kiun konfiguron de XFree vi deziras havi?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"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:234 ../../Xconfigurator.pm_.c:257
+#, 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:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s kun 3D aparata akcelado"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"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.\n"
+"XFree %s subtenas vian karton kiu eble havas pli bonan subtenon en 2D."
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"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:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s kun EKSPERIMENTA 3D aparata akcelado"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "XFree Konfigurado"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Elektu memorkapaciton de via grafika karto"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Elektu opciojn por servilo"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Elektu ekranon"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Ekrano"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -67,39 +125,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:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Horizontala sinkronrapido (horizontal sync rate)"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Vertikala refre�igrapido (vertical refresh rate)"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Ekrano ne estas konfigurata"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Grafika karto ne jam konfigurita"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Vi ne jam elektas distingivojn"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "�u vi deziras provi la konfigura�on?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr "Averto: provado estas dan�era je �i tiu grafika karto"
+#: ../../Xconfigurator.pm_.c:431
+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:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Provu konfigura�on"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -107,185 +165,173 @@ msgstr ""
 "\n"
 "penu �an�i iom da parametroj"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Eraro okazis:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Mi eliros post %d sekundoj"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "�u tio �i pravas?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Eraro okazis, penu �an�i iom da parametroj"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "A�tomataj distingivoj"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Por trovi haveblajn distingivojn, mi provos diversajn.\n"
-"Via ekrano flagros...\n"
-"Vi povas mal�alti �in se vi deziras; vi a�dos pepon kiam �i fini�os."
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Distingivo"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Elektu distingivon kaj kolorprofundon"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafika karto: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 servilo: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Montru tuton"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Distingivoj"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Mi povas provi trovi la haveblajn distingivojn (ekz-e, 800x600).\n"
-"Tamen, iam tio eble svenos la komputilon.\n"
-"�u vi deziras provi?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Neniuj validaj distingivoj trovataj.\n"
-"Provu kun alia grafika karto a� ekrano."
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klavara aran�o: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Speco de muso: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Musaparato: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Ekrano: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Ekrana horizontala sinkronrapido (horizontal sync rate): %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Ekrana vertikala refre�igrapido (vertical refresh rate): %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafika karto: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Graifka memoro: %s KB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "Kolorprofuneco: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Distingivo: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 servilo: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 pelilo: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Preparas X-Fenestran konfigura�on"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "�an�u Ekranon"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "�an�u Grafika karto"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "�an�u Servilajn opciojn"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "�an�u distingivon"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "A�tomata ser�o por distingivoj"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Montru informon"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Provu denove"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "�esu"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Kion vi deziras fari?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "�u mi devus forgesi la �an�ojn?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"�u vi deziras teni la �an�ojn?\n"
+"Nuna konfiguro estas:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, 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:1013
+#: ../../Xconfigurator.pm_.c:1123
 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:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X Fenestro �e komenco"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -293,229 +339,224 @@ msgstr ""
 "Mi povas konfiguri vian komputilon tiel ke �i a�tomate lan�os X kiam �i\n"
 "ekfunkcias.  �u vi deziras ke X a�tomate lan�os?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "A�tomata-enregistrado"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+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."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Elektu la defa�ltan uzulon:"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "Elektu la fenestro-administrilon por lan�i:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 koloroj (8 bitoj)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil koloroj (15 bitoj)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil koloroj (16 bitoj)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 milionoj koloroj (24 bitoj)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 miliardoj koloroj (32 bitoj)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 KB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 KB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB a� pli"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Normala VGA, 640x480 �e 60 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Supera VGA, 800x600 �e 56 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 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:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Altfrekvenca Supera VGA, 1024x768 �e 70 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Plurfrekvenca kiu povas fari 1024x768 �e 60 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Plurfrekvenca kiu povas fari 1280x1024 �e 74 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Plurfrekvenca kiu povas fari 1280x1024 �e 76 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Ekrano kiu povas fari 1600x1200 �e 70 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Ekrano kiu povas fari 1600x1200 �e 76 hercoj (Hz)"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "bukla"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "defa�lta"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "ligo"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "brunharulo"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "knabino"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "virino-blondhara"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "a�tomagia"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Unua sektoro de starta subdisko"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Unu sektoro de drajvo (�efStartRikordo)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "LILO/grub Instalado"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "SILO Instalado"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Kie vi deziras instali la start�argilon?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub Instalado"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Neniu"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Kiu(j)n start�argilo(j)n vi deziras uzi?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Start�argila instalado"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Starta aparato"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (ne funkcias kun malnovaj BIOSoj)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Kompakta"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "kompakta"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Prokrastoperiodo anta� starti defa�ltan sistemon"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Grafika re�imo"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Prokrastoperiodo anta� starti defa�ltan sistemon"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Pasvorto"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Pasvorto (denove)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Limigu komandliniajn opciojn"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "limigu"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Start�argilo �efaj opcioj"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Bonvole provu denove"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "La pasvortoj ne egalas"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -523,167 +564,342 @@ msgstr ""
 "Jen la diversaj enskriboj.\n"
 "Vi povas aldoni pli a� �an�i la ekzistantajn."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Aldonu"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Finata"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Kiun specon de enskribo vi deziras aldoni"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linukso"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Alia Mastruma Sistemo (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Alia Mastruma Sistemo (Vindozo...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Kiun specon de enskribo vi deziras aldoni"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Kerna bildo"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Radiko"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Alfiksu"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Lega-skriba"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Tabelo"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Dan�era"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Etikedo"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Defa�lta"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Jeso"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Forigu enskribon"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Malplena etikedo ne estas permesata"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "�i tiu etikedo estas jam uzata"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Trovis %s %s interfacojn"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "�u vi havas alian?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "�u vi havas iun %s interfacon?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Ne"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Jes"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Instalas pelilon por %s karto %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(modulo %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Kiun %s pelilon devus mi provi?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"Iuokaze, la %s pelilo bezonas havi aldonan informon por �uste funkcii,\n"
+"kvankam �i normale funkcias bone sen la informo.  �u vi deziras specifi\n"
+"aldonajn opciojn por �i a� permesi al la pelilo esplori vian komputilon\n"
+"por la informo �i bezonas?  Kelkfoje, esplori svenas komputilon, sed\n"
+"�i ne devus ka�zi difekton."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "A�tomate esploru"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Specifu opciojn"
+
+#: ../../any.pm_.c:551
+#, 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:557
+#, 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 ""
+"Nun vi povas provizi �iajn opciojn al modulo %s.\n"
+"Opcioj estas en la formo ``nomo=valoro nomo2=valoro2 ...''.\n"
+"Ekzemple, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Modulaj opcioj:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"�argado de modulo %s malsukcesis.\n"
+"�u vi deziras trovi denove kun aliaj parametroj?"
+
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Bonvenon al %s, la mastruma sistema elektilo!\n"
+"\n"
+"Por listigi la eblajn elektajxojn, premu <Tabo>.\n"
+"\n"
+"Por sxargi unu el ili, tajpu gxian nomon kaj premu <Enigu> aux atendu\n"
+"dum %d sekundoj por defauxlta sistemo.\n"
+"\n"
+
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Bonvenon al GRUB la elektilo por mastrumaj sistemoj!"
+
+#: ../../bootloader.pm_.c:597
+#, 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."
+
+#: ../../bootloader.pm_.c:598
+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"
+"redakti la"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "ordonoj antaux startado, aux 'c' por uzi komandan linion."
+
+#: ../../bootloader.pm_.c:600
+#, 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:604
+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
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Desktop"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Start Menu"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutoj"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 minuto"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekundoj"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Kreu"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Malmuntu"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Forigu"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Formatu"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Regrandecigu"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Surmetingo"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Skribu /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "�an�u al Spertula re�imo"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "�an�u al Normala re�imo"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Resta�ru de dosiero"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Konservu en dosiero"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "Sor�isto"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Resta�ru de disketo"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Konservu sur disketo"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Forvi�u �ion"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Formatu �ion"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "A�tomate disponigu"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "�iuj el la subdiskoj estas uzata"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Mi ne povas aldoni plu da subdiskoj"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -691,59 +907,63 @@ msgstr ""
 "Por havi plu da subdiskoj, bonvole forigu unu por povi krei etendigitan\n"
 "subdiskon"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Sava subdiskotabelo"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Malfaru"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Skribu subdiskotabelon"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Re�argu"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "retrokonekta"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Malplena"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "2a Etendata (Ext2)"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "Dosierlokigtabelo (FAT)"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Alia"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Inter�an�a"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Malplena"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Alia"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Specoj de dosiersistemoj:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Detaloj"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -751,21 +971,21 @@ msgid ""
 "(click on it, then click on \"Resize\")"
 msgstr ""
 "Vi havas unu grandan FAT subdiskon.\n"
-"(�enerale uzata de MicroSoft DOS/Windows).\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:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Bonvolu fari rezervan kopion de via dateno anta�e"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Legu zorge"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -775,77 +995,77 @@ msgstr ""
 "sufi�as)\n"
 "�e la komenco de la disko"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Zorgu: �i tiu operacio estas dan�era."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Eraro"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Surmetingo: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Aparato: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS-a diskingolitero: %s (nur konjekto)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Speco: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Komenco: sektoro %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Grandeco: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektoroj"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "De cilindro %d al cilindro %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Formatita\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Ne formatita\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Muntita\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID (Redundanca Aro de Malmultekostaj Diskoj) md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Retrokonekta(j) dosiero(j): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -853,79 +1073,79 @@ msgstr ""
 "Subdisko startata defa�lte\n"
 "    (por MS-DOS starto, ne por \"lilo\")\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Nivelo %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Grandeco de pecoj %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-aj (Redundanca Aro de Malmultekostaj Diskoj) diskoj %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Retrokonekta dosieronomo: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Bonvolu klaki sur subdiskon"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Grandeco: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometrio: %s cilindroj, %s kapoj, %s sektoroj\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Subdiskotabelospeco: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "�e buso %d identiga�o %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Muntu"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Aktiva"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Aldonu al RAID (Redundanca Aro de Malmultekostaj Diskoj)"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Forigu de RAID (Redundanca Aro de Malmultekostaj Diskoj)"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "�an�u RAID (Redundanca Aro de Malmultekostaj Diskoj)"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Uzu por retrokonektado"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Elektu agon"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -937,7 +1157,7 @@ msgstr ""
 "A� vi uzos LILO kaj �i ne funkcios, a� vi ne uzos LILO kaj vi ne bezonas\n"
 "/boot."
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -949,26 +1169,26 @@ msgstr ""
 "subdiskon.  Se vi intencas uzi la LILO startadministranto, zorgu aldoni\n"
 "/boot subdiskon."
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "Vi elektis softvaran RAID-an subdiskon por la radika dosiersistemo (/).\n"
 "Neniu start�argilo povas trakti tiun sen /boot subdisko.\n"
-"Do zorgu aldoni /boot subdiskon se vi deziras uzi \"LILO\" a� \"grub\"."
+"Do zorgu aldoni /boot subdiskon."
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Uzu ``%s'' anstata�e"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Uzu ``Malmuntu'' anta�e"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -977,41 +1197,42 @@ msgstr ""
 "estos\n"
 "perdata"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "�u mi devus da�ri malgra�e?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "�u eliru sen konservi"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "�u eliru sen skribi la subdisktabelon?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "�an�u subdiskspecon"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Kiun subdiskspecon deziras vi?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "Kiun printsistemo vi deziras uzi?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 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:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Kie vi deziras munti retrokonektan dosieron %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Kie vi deziras munti aparato %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1019,142 +1240,147 @@ msgstr ""
 "Ne povas malfiksi surmetingon �ar �i tiu subdisko estas uzata por\n"
 "retrokonektado.  Unue forigu la retrokonektadon."
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, 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:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Formatas"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formatas retrokonektan dosieron %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formatas subdiskon %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Post formatado de �iuj subdisko,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "�iuj datenoj sur tiuj subdisko estos perdata"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Movu"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Al kiu disko vi deziras movi?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sektoro"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Al kiu sektoro vi deziras movi?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Movante"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Movas subdisko..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, 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!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 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:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Kalkulas FAT dosiersistemajn limojn"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Regrandecigas"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Kiun subdiskon vi deziras regrandecigi?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "�iuj datenoj en �i tiu subdisko devus esti rezervata"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, 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.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Elektu la novan grandecon"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Kreu novan subdiskon"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Komenca sektoro: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Grandeco en MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Speco de dosiersistemo: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Prefero: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Vi ne povas uzi �i tiun subdiskon por retrokonektado"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Retrokonektado"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Retrokonekta dosieronomo: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "Alia retrokonektado jam uzas tiun dosieron, elektu alian"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "Dosiero jam ekzistas.  �u vi deziras uzi �in?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Elektu dosieron"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1162,11 +1388,11 @@ msgstr ""
 "La rezerva subdisktabelo ne estas la sama grandeco\n"
 "�u da�ras tamen?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Averto"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1174,79 +1400,79 @@ msgstr ""
 "En�ovu disketon en drajvo\n"
 "�iuj datenoj sur tiu disketo estos perdata"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Provas savi subdisktabelon"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "aparato"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "nivelo"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "grandeco de pecoj"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr ""
 "Elektu ekzistantan RAID (Redundanca Aro de Malmultekostaj Diskoj) por\n"
 "aldoni al"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "nova"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formatado de %s malsukcesis"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, 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:186
-msgid "nfs mount failed"
-msgstr "Muntado de NFS (retdosiersistemo) malsukcesis"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "muntado malsukcesis: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "eraro dum malmunti %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Surmetingoj devas komenci kun anta�a /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, 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:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Cirklaj surmetingoj %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr "�i tiu dosierujo devus resti interne de la radika dosierosistemo (/)"
+
+#: ../../fsedit.pm_.c:259
 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:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Eraro dum malfermado de %s por skribi: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1255,75 +1481,81 @@ msgstr ""
 "novajn dosiersistemojn.  Bonvolu kontroli vian ekipa�on por la ka�zo de �i "
 "tiu problemo."
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Vi ne havas iujn ajn subdiskojn!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "Elektu preferatan lingvon por instalado kaj sistema uzado."
 
-#: ../../help.pm_.c:10
-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:13
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "Elektu la aran�on de via klavaro el la listo supre"
+
+#: ../../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
+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"
-"  - 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"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\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"
-msgstr ""
-"Elektu \"Instalu\" se vi ne havas anta�an version de Linukso instalita,\n"
-"a� se vi deziras uzi plurajn distribua�ojn a� versiojn.\n"
 "\n"
-"Elektu \"Promociu\" se vi deziras �isdatigi anta�an version de Mandrejka\n"
-"Linukso: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000 a� 7.0 (Air).\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* Recommanded: 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"
-"Elektu:\n"
 "\n"
-"  - A�tomaciata (rekomendata): Se vi ne jam instalis Linukson elektu �i "
-"tion.\n"
-"    RIMARKU: retumado ne konfiguros dum instalado, uzu LinuxConf por "
-"konfiguri\n"
-"    �in post kiam la instalado fini�os.\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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"
-"  - 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!\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1331,55 +1563,49 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Elektu:\n"
 "\n"
-"  - A�tomaciata (rekomendata): Se vi ne jam instalis Linukson elektu �i "
-"tion.\n"
-"    RIMARKU: retumado ne konfiguros dum instalado, uzu LinuxConf por "
-"konfiguri\n"
-"    �in post kiam la instalado fini�os.\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"
+"\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!\n"
+"    Sed bonvolege, NE ELEKTU �I TION KROM SE VI SCIAS KION VI FARAS!"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "Vi povas elekti la uzadon por via komputilo se vi elektis a� \"Akomodata\" "
 "a�\n"
@@ -1401,162 +1627,368 @@ msgstr ""
 "    (NIS), a� datumbaza servilo, ktp.  Kiel tia, ne atendu umojn (KDE,\n"
 "    GNOME...).\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
+#, 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"
+"\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 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"
+"\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)."
+
+#: ../../help.pm_.c:108
 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"
+"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"
-"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"
+"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"
-"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"
+"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"
-"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."
+"\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."
 msgstr ""
-"DrakX unue provos ser�i unu a� pli PCI-a SCSI-a adaptilo(j)n.  Se �i trovas\n"
-"�in (a� ilin) kaj scias kiu(j)n pelilo(j)n uzi, �i en�ovos �in (ilin)\n"
-"a�tomate.\n"
+
+#: ../../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"
+"\n"
 "\n"
+"To partition the selected hard drive, you can use these options:\n"
 "\n"
-"Se via SCSI-a adaptilo estas ISA-a karto, a� �i estas PCI-a karto sed DrakX\n"
-"ne scias kiun pelilon uzi por tiu karto, a� se vi havas neniujn SCSI-ajn\n"
-"adaptilojn, DrakX instigos vin �u vi havas unu.  Se mankas al vi, respondu\n"
-"\"Ne\".  Se vi havas unu a� pli, respondu \"Jes\".  Sekve DrakX montros "
-"liston de\n"
-"peliloj, de kiu vi devas elekti unu.\n"
+"   * Clear all: this option deletes all partitions available on the selected "
+"hard drive.\n"
 "\n"
 "\n"
-"Post vi elektos la pelilon, DrakX demandos al vi se vi deziras elekti "
-"opciojn\n"
-"por �i.  Unue, provu lasi la pelilon esplori por la karton: tio �i kutime\n"
-"sukcesas.\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"
-"Se ne, ne forgesu la informon pri via aparataro kiu vi povus trovi en la\n"
-"dokumentaro a� de Vindozo (se vi havas �in �e via komputilo), kiel "
-"sugestata\n"
-"de la instalgvidlibro.  �i tiuj estas opcioj vi bezonos doni al la pelilo."
+"   * 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"
+msgstr ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:218
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"For information, each partition is listed as follows: \"Name\", "
+"\"Capacity\".\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"
+"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\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"
+"\"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"
-"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"
+"\"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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\n"
+"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
+"\"secondary hard drive\", etc..."
+msgstr ""
+
+#: ../../help.pm_.c:252
+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 ""
-"�i tiam, vi povas elekti kiu(j)n subdisko(j)n vi deziras uzi por instali\n"
-"vian Linuks-Mandrejkan sistemon se ili estas jam difinita (de anta�a\n"
-"instalado de Linukso a� de alia dispartigilo).  Aliokaze, vi devus difini\n"
-"drajvajn subdiskojn.  �i tiu operacio konsistas el logike dispartigi la\n"
-"drajvon de la komputilo je apartaj lokoj por uzado.\n"
+
+#: ../../help.pm_.c:257
+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 ""
+
+#: ../../help.pm_.c:267
+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"
-"Se vi devus krei novajn subdiskojn, uzu \"A�todisponigu\" por a�tomate krei\n"
-"subdiskojn por Linukso.  Vi povas elekti la drajvon por dispartigado per\n"
-"klaki sur \"hda\" por la unua IDE drajvo, \"hdb\" por la dua a� \"sda\" por "
-"la\n"
-"unua SCSI drajvo ktp.\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"
-"Du oftaj subdiskoj estas: la radika subdisko (/), kiu estas la "
-"komencopunkto\n"
-"de la dosierujhierarkio de la dosiersistemo, kaj /boot, kiu enhavas �iujn\n"
-"dosierojn bezonatajn por starti la mastruman sistemon kiam vi unue �altas\n"
-"la komputilon.\n"
 "\n"
-"�ar la efikoj de �i tiu procezo estas kutime neinversigeblaj, dispartigado\n"
-"povas esti timiga kaj stresiga por la nesperta uzulo.  DiskDrake simpligas\n"
-"la procezon por ke �i ne devu esti.  Konsultu la dokumentaron kaj malrapidu\n"
-"anta� vi anta�eniras.\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"
-"Vi povas atingi �iun ajn opcion per uzi la klavaron: navigu tra la "
-"subdiskoj\n"
-"per Tab kaj la Supren/Suben sagoj.  Kiam subdisko estas elektata, vi povas\n"
-"uzi:\n"
+"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-c  por krei novan subdiskon (kiam malplena subdisko estas elektata)\n"
+"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"- Ctrl-d  por forstreki subdiskon\n"
+"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"- Ctrl-m  por fiksi surmetingon\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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
+
+#: ../../help.pm_.c:303
 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."
+"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 ""
-"Iuj subdiskoj kiuj estas lastatempe kreita devas esti formatata por uzi\n"
-"(formatado estas la kreado de dosiersistemo �e la subdisko).  Nune, vi eble\n"
-"deziras reformati iom da subdiskojn kiuj jam ekzistas por forvi�i la "
-"datenojn\n"
-"kiujn ili enhavas.  Notu: ne estas necesa reformati anta�ekzistitajn\n"
-"subdiskojn, precipe se ili enhavas dosierojn a� datenojn kiuj vi deziras\n"
-"konservi.  Kutime konservata estas �ome kaj /usr/local."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
+#, 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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"
@@ -1567,137 +1999,155 @@ msgstr ""
 "povas elekti la opcion \"Elektado de apartaj paka�oj\"; �iokaze vi devus\n"
 "foliumi tra pli ol 1000 paka�oj..."
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:358
+#, 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 ""
 "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:155
+#: ../../help.pm_.c:363
 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."
+"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 ""
-"La elektitaj paka�oj nun estas instalata.  �i tiu operacio devus da�ri\n"
-"kelkajn minutojn krom se vi elektis promocii ekzistan sistemon.  Tiuokaze\n"
-"�i eble da�ras pli da tempo anta� la promocio komencos."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:371
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"Se DrakX malsukcesis trovi vian muson, a� se vi deziras kontroli kion �i\n"
-"faris, liston de musospecoj prezentos al vi supre.\n"
-"\n"
-"\n"
-"Se vi konsentas kun la opcioj ke DrakX elektis, simple saltu al la sekcio\n"
-"vi deziras per klaki sur �in en la menuo �e la maldekstra.  Aliokaze, "
-"elektu\n"
-"specon de muso el la menuo kiun vi pensas estas la plej proksima egala�o\n"
-"de via muso.\n"
-"\n"
-"\n"
-"Okaze de seria muso, vi anka� devas diri al DrakX al kiu seria pordo �i\n"
-"estas konektata."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
 "Bonvolu elekti la �ustan pordon.  Ekzemple, la COM1-a pordo sub MS Vindozo\n"
-"estas nomata ttyS0 sub Linukso."
+"estas nomata ttyS0 sub GNU/Linukso."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
+"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"
-"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"
-"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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"�i tiu sekcio estas dedi�ita al la konfigurado de loka reto a� modemo.\n"
-"\n"
-"Elektu \"Loka Reto\" kaj DrakX provos trovi Eterretan adaptilon �e via\n"
-"komputilo.  PCI-aj adaptiloj devus esti trovataj kaj initataj a�tomate.\n"
-"Tamen, se via periferio estas ISA-a, a�tomata detektado ne funckios, kaj\n"
-"vi devos elekti pelilon el la listo kiu aperos tiam.\n"
-"\n"
-"\n"
-"Por SCSI-aj adaptiloj, vi povas lasi ke la pelilo esploros por la adaptilo\n"
-"unuafoje, aliokaze vi devas difini la opciojn al la pelilo kiuj vi havigas "
-"de\n"
-"la dokumentaro de via adaptilo.\n"
-"\n"
-"\n"
-"Se vi instalas Linuks-Mandrejkan sistemon kiu estas parto de jam ekzistanta\n"
-"reto, la retadministranto estos donintan al vi �iuj el la necesa informo\n"
-"(IP-adreso, reta submasko a� retmasko mallonge, kaj po�tejo).  Se vi "
-"establas\n"
-"privatan reton hejme ekzemple, vi devus elekti adresojn.\n"
-"\n"
-"\n"
-"Elektu \"Telefona konekto kun modemo\" kaj la Interreta konekto kun modemo\n"
-"estos konfigurata.  DrakX provos trovi vian modemon.  Se �i malsukcesas vi\n"
-"devos elekti la �ustan serian pordon kie via modemo estas konektata."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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"
@@ -1705,14 +2155,30 @@ msgstr ""
 "\n"
 "\n"
 "  - Retmaskon: \"255.255.255.0\" �enerale estas bona elekta�o.  Se vi ne\n"
-"estas certa, demandu al via retadministranto.\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"
+"  - 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"
+"\"IP-adreson\".  Se vi ne estas certa, demandu al via retadministranto\n"
+"a� interretprovizanto.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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:441
+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:445
 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."
@@ -1721,7 +2187,7 @@ msgstr ""
 "enigi,\n"
 "vi povas havigi la �ustan informon de via interretprovizanto."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1730,13 +2196,15 @@ msgstr ""
 "scias �u vi uzos prokurajn servilojn, demandu al via retadministranto a�\n"
 "interretprovizanto."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1749,109 +2217,204 @@ msgstr ""
 "le�donoj\n"
 "de via lando."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "Nun vi povas elekti vian horzonon la� kie vi lo�as.\n"
 "\n"
 "\n"
-"Linukso administras tempon en GMT a� \"Grenvi�a Meza Tempo\" kaj tradukas "
-"�in\n"
+"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:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 la servojn kiujn vi deziras starti kiam vi startas\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 rolo de la servo.\n"
+"ekaperas por helpi vin.  �i priskribas la rolon de la servo.\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:257
+#: ../../help.pm_.c:486
+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:490
 msgid ""
-"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"
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"Linukso povas pritrakti multajn specojn de printiloj.  �iu el tiuj specoj\n"
-"bezonas malsaman aran�on.  Notu tamen ke la printvicilo uzas 'lp' kiel\n"
-"la defa�lta printilonomo; do vi devas havi unu printilon nomatan 'lp';\n"
-"sed vi povas doni multajn nomojn, apartigataj per '|' signoj, al printilo.\n"
-"Do, se vi preferas havi pli signifoplenan nomon, vi simple devas meti\n"
-"�in anta�e, ekz-e: \"My Printer|lp\".\n"
-"La printilo kiu havas \"lp\" en �ia(j) nomo(j) estos la defa�lta printilo.\n"
+
+#: ../../help.pm_.c:505
+msgid ""
+"GNU/Linux can deal with many types of printer. Each of these types requires\n"
+"a different setup.\n"
 "\n"
 "\n"
-"Se via printilo estas rekte konektita al via komputilo, elektu \"Loka\n"
-"printilo\".  Tiam vi devos elekti la pordon al kiu via printilo estas\n"
-"konektita, kaj ta�gan filtrilon.\n"
+"If your printer is physically connected to your computer, select \"Local\n"
+"printer\".\n"
 "\n"
-"Se vi deziras atingi printilon �e fora Uniksa komputilo, vi devos elekti\n"
-"\"Fora lpd\".  Por funkciigi �in, uzulnomo kaj pasvorto ne estas "
-"postulataj,\n"
-"sed vi devos scii la printviconomon �e �i tiu servilo.\n"
 "\n"
-"Se vi deziras atingi SMB-an printilon (kiu signifas, printilo �e fora\n"
-"Vindoza 9x/NT kompuilo), vi devos specifi �ian SMB-an nomon (kiu ne estas\n"
-"�ia TCP/IP nomo), kaj eble �ian IP adreson, kaj la uzulnomon, laborgrupon\n"
-"kaj pasvorton bezonatajn por atingi la printilon, kaj kompreneble la nomo\n"
-"de la printilo.  NetWare printilo samas, krom vi ne bezonas laborgrupan\n"
-"informon."
+"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 ""
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:521
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"Please turn on your printer before continuing to let DrakX detect it.\n"
 "\n"
+"You have to enter some informations here.\n"
 "\n"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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 ""
+
+#: ../../help.pm_.c:542
+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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
+"\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"
@@ -1868,15 +2431,15 @@ msgstr ""
 "longan a� komplikan pasvorton: vi devas povi memori �in sen tro multe da\n"
 "peno."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 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 \"\" kaj\n"
+"Por ebligi pli sekuran sistemon, vi devus elekti \"ombran dosieron\" kaj\n"
 "\"Uzu MD5-ajn pasvortojn\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1884,7 +2447,7 @@ msgstr ""
 "Se via reto uzas NIS, elektu \"Uzu NIS\".  Se vi ne scias, demandu al via\n"
 "retadministranto."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1924,34 +2487,30 @@ msgstr ""
 "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:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Bonvolege respondu \"Jes\" �i tie!  Se via instalos Vindozon estontece,\n"
-"�i superskribos la startigan sektoron.  Krom se vi faris startigan diskon\n"
-"kiel sugestata, vi ne plu eblas starti Linukson!"
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
 "Vi bezonas indiki kie vi deziras meti la informon postulata\n"
-"por starti Linukson.\n"
+"por starti GNU/Linukson.\n"
 "\n"
 "\n"
 "Krom se vi scias precize kion vi faras, elektu \"Unua sektoro de\n"
 "drajvo (MBR)\""
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1959,10 +2518,10 @@ 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:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1973,7 +2532,7 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 "LILO (la Linuksa �argilo) kaj Grub estas start�argiloj: ili povas starti\n"
-"a� Linukson a� iun ajn mastruman sistemon �eestanta �e via komputilo.\n"
+"a� GNU/Linukson a� iun ajn mastruman sistemon �eestanta �e via komputilo.\n"
 "Normale, �i tiuj aliaj mastrumaj sistemoj estas �uste detektata kaj\n"
 "instalada.  Se tiel ne estas, vi povas aldoni enskribon mane per �i tiu\n"
 "ekrano.  Zorgu elekti la �ustajn parametrojn.\n"
@@ -1983,7 +2542,8 @@ msgstr ""
 "al iu ajn.  �iokaze vi povas forstreki la respondajn enskribojn.  Sed\n"
 "�iokaze, vi bezonos startdiskon por starti ilin!"
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -2000,7 +2560,9 @@ msgid ""
 "\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."
 msgstr ""
 "LILO kaj Grub �efaj opcioj estas:\n"
@@ -2022,10 +2584,60 @@ msgstr ""
 "    * normala: elektu normalan 80 per 25 tekstan re�imon.\n"
 "    * <numero>: uzu la respondan tekstan re�imon."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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!"
+
+#: ../../help.pm_.c:692
+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."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2037,7 +2649,7 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 "Nun estas tempo por konfiguri la X Fenestra Sistemo, kiu estas la kerno\n"
-"de la Linuksa GUI (Grafika UzulInterfaco).  Por tiu celo, vi devas\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"
@@ -2048,7 +2660,7 @@ msgstr ""
 "ta�gas por vi.  Se ne, vi povas reveni kaj �an�i ilin, tiom da tempoj kiom\n"
 "estas necesa."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2056,7 +2668,7 @@ 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:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2064,65 +2676,67 @@ msgstr ""
 "Se vi preferas uzi grafikan saluton, elektu \"Jes\".  Aliokaze, elektu "
 "\"Ne\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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."
 msgstr ""
 "Nun vi povas elekti kelkajn diversajn opciojn por via sistemo.\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 �oparoj, sed se via deziras\n"
+"    enkonstruitan nigran liston de drajvoj kaj �iparoj, sed se via deziras\n"
 "    eviti malbonajn surprizojn, lasu �i tiun opcion ne elektatan\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 \"Paranoja\", sed zorgu: JE �I TIU NIVELO, SALUTADO KIEL \"ROOT\" "
-"�E\n"
-"    LA KONZOLO ESTAS MALPERMESATA!  Se vi deziras esti \"root\", vi devas\n"
-"    saluti kiel uzulo kaj poste uzu \"su\".  Pli �enerale, ne anticipu uzi\n"
-"    vian komputilon por io ajn escepte de servilo.  Ni avertis vin.\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"
-"    Linukso eble malsukcesas detekti vian kvanton da memoro �uste.  Se tiel\n"
-"    estas, vi povas specifi la �ustan kvanton da memoro �i tie.  Notu ke\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"
 "\n"
 "  - A�tomata muntado de demetebla medio: se vi preferus ne mane munti\n"
@@ -2133,7 +2747,7 @@ msgstr ""
 "    post startado, elektu �i tiun opcion (Notu: NumLock eble funkcias a�\n"
 "    ne funkcias sub X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2148,96 +2762,119 @@ msgstr ""
 "deziras starti en alian ekzistanta mastruman sistemon, bonvole legu la\n"
 "pluan instrukcion."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Elektu vian lingvon"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Elektu instalklason"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Detektado de fiksdisko(j)"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Konfiguru muson"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Elektu vian klavaron"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Diversaj"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Dosiersistemo konfiguro"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Formatu subdiskojn"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Elektu paka�ojn"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Instalu sistemon"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Konfiguru retumon"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Kripografia"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Konfiguru horzonon"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Konfiguru servojn"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Konfiguru printilon"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Difinu pasvorton de root"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Aldonu uzulon"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Kreu pra�argdisketon"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Instalu restart-�argilon"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Konfiguru X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "A�toinstala disketo"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Eliru instalprogramon"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Eraro dum legi dosiero $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "Bonvole, provu la muson"
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Bonvole, provu la muson"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+"Iuj aparatoj sur via komputilo bezonas \"proprietajn\" pelilojn por "
+"funkcii.\n"
+"Vi povas trovi iun informon pri ili �e: %s"
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2247,234 +2884,254 @@ msgstr ""
 "Por �i tiu, kreu subdiskon (a� klaku estantan).\n"
 "Sekve elektu la agon \"Surmetingo\" kaj faru �in '/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Mi ne povas legi vian subdisktabelon, �i estas tro difektita por mi :(\n"
-"Mi penos da�ri per blankigi difektitajn subdiskojn"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "Vi devas havi inter�an�an subdiskon"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake malsukcesis �uste legi la subdisktabelon.\n"
-"Da�ri je via propra risko!"
+"Vi ne havas inter�an�an subdiskon\n"
+"\n"
+"�u vi deziras da�ri tamen?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Ser�as la radikan subdiskon."
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Uzu liberan spacon"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Informo"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "Mankas sufi�an da libera spaco por disponigi novajn subdiskojn"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: �i tiu ne estas radika subdisko, bonvole elektu alian."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "Uzu ekzistantajn subdiskojn"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Ne trovis radikosubdiskon"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "Ne ekzistas subdiskojn por uzi"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Ne povas uzi dissendadon sen NIS-a domajno"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Uzu la Vindoza subdiskon por retrokonektado"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Eraro dum legi dosiero $f"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Kiun subdiskon vi deziras uzi por meti Linux4Win?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Eraro okazis, sed mi ne scias kiel trakti �in bone.\n"
-"Da�ri je via propra risko."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Elektu la grandecojn"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Duobla surmetingo %s"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Radikosubdiska grandeco en MB: "
 
-#: ../../install_steps.pm_.c:323
-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 ""
-"Iuj gravaj paka�oj ne estis ta�ge instalata.\n"
-"A� via KDROM drajvo a� via KDROM disko estas difektita.\n"
-"Kontrolu la KDROM sur instalata komputilo per\n"
-"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Inter�an�a subdiska grandeco en MB: "
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Bonvenon al %s"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "Uzu la liberan spacon sur la Vindoza subdisko"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Neniu disketilo havebla"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Kiun subdiskon vi deziras regrandecigi?"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "Kalkulas Vindozajn dosiersistemajn limojn"
+
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "Eniras pa�on `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"La regrandecigilo por la FAT (Dosiero-Atingo-Tablo) ne povas trakti\n"
+"vian subdiskon, la sekvanta eraro okazis: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "Vi devas havi inter�an�an subdiskon"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
+"Via Vindoza subdisko estas tro fragmentigata, bonvole uzu ``defrag'' anta�e"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"Vi ne havas inter�an�an subdiskon\n"
+"AVERTO!\n"
 "\n"
-"�u vi deziras da�ri tamen?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Elektu la grandecon kiu vi deziras instali"
+"DrakX nun regrandecigas vian Vindozan subdiskon.  Zorgu: �i tiu operacio "
+"estas\n"
+"dan�era.  Se vi ne jam faris �in, vi devus anta�e eliru el la instalado, "
+"uzi\n"
+"\"scandisk\" sub Vindozo (kaj la�vole \"defrag\"), kaj sekve relan�u la\n"
+"instaladon.  Anka� vi devus fari rezervan kopion de via dateno.\n"
+"Kiam vi estas certa, klaku \"Jeso\"."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Tuta grandeco: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "Kiun grandecon vi deziras teni por Vindozo?"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "Versio: %s\n"
+msgid "partition %s"
+msgstr "subdisko: %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "Grandeco: %d KB\n"
+msgid "FAT resizing failed: %s"
+msgstr "Regrandeci�o de FAT malsukcesis: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Elektu la paka�ojn kiuj vi deziras instali"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+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_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Informo"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "Forvi�u la tutan diskon"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Instalu"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Forigu Vindozon"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Instalanta"
+#: ../../install_interactive.pm_.c:153
+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_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Bonvolu atendi"
+#: ../../install_interactive.pm_.c:156
+#, 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_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Tempo restanta "
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "Spertula modalo"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Tuta tempo "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "Uzu diskdrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Preparas instaladon"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "Uzu fdisk"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "Instalanta paka�o %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Nun vi povas dispartigi %s.\n"
+"Kiam vi fini�os, ne forgesu savi kun `w'."
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "�u vi deziras da�ri tamen?"
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Uzu la liberan spacon sur la Vindoza subdisko"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Estis eraro ordigi paka�ojn:"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Mi ne povas aldoni plu da subdiskoj"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Uzu ekzistantan konfiguron de X11 (X-fenestroj)?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "La Dispartigsor�ilo de DrakX trovis �i tiujn solvojn:"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Bonvole, elektu unu el la sekvantaj specoj de instalado:"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Dispartigado malsukcesis: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Vi ne havas iujn ajn Vindozajn subdiskojn!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Startado de la reto"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Vi ne havas sufi�e da spaco por Lnx4win"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Haltas de la reto"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"AVERTO!\n"
-"\n"
-"DrakX nun bezonas regrandecigi vian Vindozan subdiskon.  Zorgu: �i tiu\n"
-"operacio estas dan�era.  Se vi ne jam faris �in, vi devus anta�e uzi\n"
-"\"scandisk\" (kaj la�vole \"defrag\") kontra� �i tiu subdisko kaj fari "
-"rezervan\n"
-"kopion de via dateno.\n"
-"Kiam vi estas certa, klaku \"Jeso\"."
+"Eraro okazis, sed mi ne scias kiel trakti �in bone.\n"
+"Da�ri je via propra risko."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "A�tomata regrandeci�o malsukcesis"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Duobla surmetingo %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Kiun subdiskon vi deziras uzi por meti Linux4Win?"
+#: ../../install_steps.pm_.c:375
+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 ""
+"Iuj gravaj paka�oj ne estis ta�ge instalata.\n"
+"A� via KDROM drajvo a� via KDROM disko estas difektita.\n"
+"Kontrolu la KDROM sur instalata komputilo per\n"
+"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Elektu la grandecojn"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Bonvenon al %s"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Radikosubdiska grandeco en MB: "
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Neniu disketilo havebla"
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Inter�an�a subdiska grandeco en MB: "
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Eniras pa�on `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"Via sistemo havas malmulte da risurcoj.  Eble vi havos problemojn pri\n"
+"instali Linuks-Mandrejkon.  Se tio okazos, vi povos anstata� provi tekstan\n"
+"instaladon.  Por �i tio, premu `F1' kiam vi startas de KDROM, kaj sekve\n"
+"tajpu `text'."
+
+#: ../../install_steps_gtk.pm_.c:150
+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:320
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2488,7 +3145,7 @@ msgstr ""
 "Malalta procento instalos nur la plej gravajn paka�ojn;\n"
 "100%% instalos �iujn paka�ojn."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2504,58 +3161,100 @@ msgstr ""
 "Malalta procento instalos nur la plej gravajn paka�ojn;\n"
 "%d%% instalos tiom paka�ojn kiom eblajn."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 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:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Procento da paka�oj por instali"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Elektu la paka�ojn kiuj vi deziras instali"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Informo"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Instalu"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "A�tomaciataj dependa�oj"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Etendu Arbon"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Maletendu Arbon"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "�an�u inter ebena kaj ordigita je grupoj"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Malbona paka�o"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nomo: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versio: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Grandeco: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Graveco: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Tuta grandeco: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+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:386
+msgid "The following packages are going to be installed"
+msgstr "La sekvaj paka�oj estos instalataj"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "La sekvaj paka�oj estos malinstalataj"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Vi ne povas elektu/malelektu �i tiun paka�on"
+
+#: ../../install_steps_gtk.pm_.c:416
 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:473
+#: ../../install_steps_gtk.pm_.c:418
 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:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2563,46 +3262,88 @@ msgstr ""
 "�i tiu paka�o devus esti promociata.\n"
 "�u vi certas ke vi deziras malelekti �in?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 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:493
-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:496
-msgid "The following packages are going to be installed/removed"
-msgstr "La sekvaj paka�oj estos instalataj/malinstalataj"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "Vi ne povas elektu/malelektu �i tiun paka�on"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Instalanta"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Taksas"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Bonvolu atendi"
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Tempo restanta "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Tuta tempo "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Nuligu"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Preparas instaladon"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d paka�oj"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Instalanta paka�o %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "Akceptu"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2618,182 +3359,387 @@ 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:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "Malakceptu"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "�u vi deziras da�ri tamen?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Estis eraro ordigi paka�ojn:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Estis eraro dum instalado de paka�oj:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Eraro okazis"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Bonvole, elektu lingvon por uzi."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Klavaro"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Bonvole, elektu vian klavaran aran�on."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 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:91
-msgid "Root Partition"
-msgstr "Radikosubdisko"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Kiu estas la radikosubdisko (/) �e via sistemo?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "�iuj"
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Instalklaso"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Kiun instalklaso deziras vi?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
-msgstr "Instalu/Promociu"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
+msgstr "Instalu"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr "�u tiu �i estas instalado a� promociado?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
+msgstr "�u tiu �i estas instalado a� savado?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "A�tomaciata"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Rekomendata"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Akomodata"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Spertulo"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "�u vi certas ke vi estas spertulo?\n"
-"�i tio permesos al vi fari potencajn sed dan�erajn agojn."
+"�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?\""
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
-msgstr "Promociu"
+#: ../../install_steps_interactive.pm_.c:216
+msgid "Update"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Normala"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "Laborstacio"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Programisto"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Servilo"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
 msgstr "Por kio vi uzos vian komputilon?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Bonvole, elektu la specon de via muso."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Muspordo"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 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:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Konfiguras PCMCIA kartojn..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "Konfiguras IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "neniuj haveblaj subdiskoj"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Bonvole, elekti subdiskon por uzi kiel via radika subdisko."
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Elektu surmetingojn"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Mi ne povas legi vian subdisktabelon, �i estas tro difektita por mi :(\n"
+"Mi povas peni da�ri per blankigi difektitajn subdiskojn (�IOM DA DATUMO\n"
+"pereos!).  La alia solvo estas malpermesi al DrakX �an�i la subdisktabelon.\n"
+"(la eraro estas %s)\n"
+"\n"
+"�u vi konsentas perdi �iujn subdiskojn?\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake malsukcesis �uste legi la subdisktabelon.\n"
+"Da�ri je via propra risko!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Radikosubdisko"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Kiu estas la radikosubdisko (/) �e via sistemo?"
+
+#: ../../install_steps_interactive.pm_.c:352
 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:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Elektu la subdiskoj kiuj vi deziras formati"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "�u kontrolas malbonajn blokojn?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Formatas subdiskojn"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Kreas kaj formatas dosieron %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 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:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Ser�as haveblajn paka�ojn"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Trovadas paka�ojn por promocii"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr "Via komputilo ne havas sufi�e da spaco por instalado a� promocio."
+#: ../../install_steps_interactive.pm_.c:433
+#, 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:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "Kompleta (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "Minimuma (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Rekomendata (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "Akomodata"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "Elektu la grandecon kiu vi deziras instali"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Elektado de Paka�aj Grupoj"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Elektado de individuaj paka�oj"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2804,12 +3750,12 @@ msgstr ""
 "Se vi mankas nur iujn de la KDROM-oj, malelektu ilin, kaj poste klaku "
 "\"Jes\"."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "KDROM etikedata \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2817,175 +3763,11 @@ msgstr ""
 "Instalas paka�o %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Post-instala konfigurado"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Retenu la nunan IP-an konfigura�on"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Rekonfiguru reton nun"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Ne konfiguru reton"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Reta Konfigura�o"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Loka Reto jam estas konfigurita.  �u vi deziras:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "�u vi deziras konfiguri lokan reton por via komputilo?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "Neniu retkarto trovita"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Modemo Konfigura�o"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr ""
-"�u vi volas konfiguri konekton per komputebla lineo uzada la modemo\n"
-"de via komputilo?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Konfiguras retan aparaton %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Bonvole enigu la IP-an konfigur�jon por �i tiu komputilo.\n"
-"�iu ero devus esti enigata kiel IP-adreson en punktita-decimala notacio\n"
-"(ekzemple, 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "A�tomata IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP-adreso:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Retmasko:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP-adreso devus esti en la notacio 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Konfiguras reto"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Bonvole enigu vian po�tejon.\n"
-"Via po�tejo devus esti plene specifita po�tejo,\n"
-"ekzemple ``miakomputilo.mialaborejo.miafirmao.com''.\n"
-"Vi anka� povas enigi la IP-adreson de la prokura kluzo se via havas unu."
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNA servilo:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Prokura kluzaparato:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Kluzo:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Po�tejo:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Provu trovi modemon?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Bonvole, elektu al kiu seria pordo estas via modemo konektata?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Telefon-konektaj opcioj"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Nomo de konekto"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Telefonnumero"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Salutnomo"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "A�tentikigado"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP (Postula Manprema A�tentikigada Protokolo)"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP (Pasvorta A�tentikigada Protokolo)"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Programeto-bazata"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Finaparato-bazata"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Domajna nomo"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Unu DNA-a Servilo"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Dua DNA Servilo"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3052,89 +3834,93 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Elektu spegulon de kiu havigi la paka�ojn"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 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:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Bonvole, elektu la paka�ojn kiujn vi deziras instali."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
-msgstr "Kiu horzono estas via?"
+msgstr "kio estas vian horzonon?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "�u via hardvara horlo�o estas �ustigata en GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "Kiun printsistemo vi deziras uzi?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Neniu pasvorto"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Uzu ombran dosieron"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "ombro"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Uzu MD5-ajn pasvortojn"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Uzu NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "flavaj pa�oj"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, 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:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "A�tentikigado NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS Domajno"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS Servilo"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Akceptu uzanto"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Aldonu uzanto"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(jam aldonis %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3144,60 +3930,88 @@ msgstr ""
 "Enigu uzanton\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Vera nomo"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Salutnomo"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "�elo"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Piktogramo"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "�i tiu pasvorto estas tro simpla"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Bonvole donu salutnomon"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Salutnomo devas enhavi nur minusklojn, ciferojn, `-' kaj `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "�i tiu salutnomo estas jam aldonita"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Akomodita startdisketo provizas manieron de starti via Linuksa sistemo\n"
+"sendepende de la normala start�argilo.  �i tiu estas utila se vi ne deziras\n"
+"instali SILO sur via sistemo, a� alia mastruma sistemo forigas SILO,\n"
+"a� SILO ne funkcias kun via aparato-konfigura�o.  Akomodita startdisketo "
+"anka�\n"
+"povas esti uzata kun la Mandrejka savdisko, kiu plifaciligas resani�i de\n"
+"severaj sistemaj paneoj.\n"
+"\n"
+"Se vi deziras krei startdisketon por via sistemo, en�ovu disketon en la\n"
+"unua drajvo kaj klaku \"JES\"."
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Unua disketa drajvo"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Dua disketa drajvo"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Ellasu"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3218,64 +4032,32 @@ 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:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Beda�rinde, neniu disketdrajvo havebla"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 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:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "En�ovu disketon en drajvo %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Kreas startdisketon"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "Instalado de LILO malsukcesis.  La sekvanta eraro okazis:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "�u vi deziras uzi SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "SILO �efaj opcioj"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Jen la sekvantaj enskriboj en SILO.\n"
-"Vi povas aldoni pli a� �an�i la ekzistantajn."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Subdisko"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "�i tiu etikedo estas jam uzata"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "Instalado de SILO malsukcesis.  La sekvanta eraro okazis:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Preparas start�argilon"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
-msgstr "�u vi deziras uzi aboot?"
+msgstr "�u vi deziras uzi aboot-on?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3283,136 +4065,128 @@ 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:930
-msgid "Proxies configuration"
-msgstr "Konfigurado de prokuraj serviloj"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP prokura servilo"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP prokura servilo"
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "Instalado de start�argilo malsukcesis.  La sekvanta eraro okazis:"
 
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Prokura servilo devus esti http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Prokura servilo devus esti ftp://..."
-
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Bonvenon Al Rompistoj"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Malbona"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Malalta"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Meza"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Alta"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoja"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Diversaj demandoj"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(eble ka�zos koruptadon de dateno)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Uzu drajvajn optimumiga�ojn?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Elektu sekurnivelon?"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Preciza kvanto de memoro se bezonata (trovis %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "A�tomata muntado de demetebla medio"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Purigu /tmp dum �iuj startadoj"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Ebligu multoblajn profilojn"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Ebligu la \"Num Lock\"-an klavon je startado"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Donu kvanton de memoro en MB"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Ne povas uzi \"supermount\" en alta sekurnivelo"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX generos konfigurdosierojn por kaj XFree 3.3 kaj XFree 4.0.\n"
-"Defa�lte, ni uzos la 3.3 servilon �ar �i funkcias kun pli da grafikaj "
-"kartoj.\n"
-"\n"
-"�u vi volas provi XFree 4.0?"
+"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."
+
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"Zorgu, kapabligi \"NumLock\" ka�zas multe da klavopremoj produkti ciferojn\n"
+"anstata� normaj literoj (ekzemple: premi `p' produktas `6')"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Provu trovi PCI-ajn drajvojn?"
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Uzu ekzistantan konfiguron de X11 (X-fenestroj)?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 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:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "En�ovu malplenan disketon en drajvo %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Kreas a�toinstalan disketon"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
-"Iuj pa�oj ne estas finitaj.\n"
-"\n"
-"�u vi vere deziras eliri nun?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3424,161 +4198,18 @@ msgid ""
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
-"Gratulojn, instalado estas finita.\n"
-"Forigu la startdisketon kaj premu la Eniga klavo por restarti.\n"
-"\n"
-"Por informo pri riparoj kiuj estas havebla por �i tiu versio de Linuks-\n"
-"Mandrejko, konsultu la erar-listo havebla de //www.linux-mandrake.com/.\n"
-"\n"
-"Informo pri konfiguri vian sistemon estas havebla en la post-instalada\n"
-"�apitro de la Oficiala Linuks-Mandrejka Uzanta Gvidlibro."
-
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Haltas"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Instalas pelilon por %s karto %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(modulo %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Kiun %s pelilon devus mi provi?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"Iuokaze, la %s pelilo bezonas havi aldonan informon por �uste funkcii,\n"
-"kvankam �i normale funkcias bone sen la informo.  �u vi deziras specifi\n"
-"aldonajn opciojn por �i a� permesi al la pelilo esplori vian komputilon\n"
-"por la informo �i bezonas?  Kelkfoje, esplori svenas komputilon, sed\n"
-"�i ne devus ka�zi difekton."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "A�tomate esploru"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Specifu opciojn"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Nun vi povas provizi �iajn opciojn al modulo %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Nun vi povas provizi �iajn opciojn al modulo %s.\n"
-"Opcioj estas en la formo ``nomo=valoro nomo2=valoro2 ...''.\n"
-"Ekzemple, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Modulaj opcioj:"
 
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"�argado de modulo %s malsukcesis.\n"
-"�u vi deziras trovi denove kun aliaj parametroj?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "�u vi deziras provi trovi PCMCIA kartojn?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Konfiguras PCMCIA kartojn..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Provu trovi %s aparatojn?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Trovis %s %s interfacojn"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "�u vi havas alian?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "�u vi havas iun %s interfacon?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Ne"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Jes"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Vidu hardvaran informon"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Startado de la reto"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Haltas de la reto"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linuks-Mandrejka Instalado %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr "  <Tabo>/<Alt-Tabo> inter eroj | <Spaco> elektas | <F12> sekva ekrano "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"Nun vi povas dispartigi vian %s durdrajvon.\n"
-"Kiam vi fini�os, ne forgesu savi kun `w'."
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Bonvole atendu"
 
@@ -3588,7 +4219,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Ambigueco (%s), esti pli preciza\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Malbona elekta�o, provu denove\n"
 
@@ -3602,437 +4233,961 @@ msgstr " ? (defa�lto estas %s) "
 msgid "Your choice? (default %s) "
 msgstr "Via elekta�o? (defa�lo estas %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 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:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "�e�a"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Germana"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak-a"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Hispana"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Finna"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Franca"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norvega"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Pola"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Rusa"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Unui�inta Regna klavaro"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "Usona klavaro"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armena (malnova)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armena (skribma�ina)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armena (fonetika)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "Azerbaj�ana (latina)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "Azerbaj�ana (cirila)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulgara"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazila"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "Belarusa"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Svisa (germana aran�o)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Svisa (franca aran�o)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Germana (neniom da mortaj klavoj)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Dana"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak-a (US)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak-a (Norvega)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Estona"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Kartvela (\"Rusa\" aran�o)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Kartvela (\"Latina\" aran�o)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Greka"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Hungara"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Kroata"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Israela"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Israela (fonetika)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Irana"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islanda"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Itala"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "Japana 106 klavoj"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Latinamerika"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Nederlanda"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litova AZERTY-a (malnova)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litova AZERTY-a (nova)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litova \"numero-vica\" QWERTY-a"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litova \"fonetika\" QWERTY-a"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Pola (qwerty aran�o)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Pola (qwertz aran�o)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanada (Kebeka)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Rusa (Yawerty-a)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Sveda"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Slovena"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slovaka"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Taja klavaro"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turka (tradicia \"F\" modelo)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turka (moderna \"Q\" modelo)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukrajna"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "Usona klavaro (internacia)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vjetnama \"numero-vica\" QWERTY-a"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Jugoslava (Latina aran�o)"
 
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - Muso"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "La�norma"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Lo�iteka MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Mikrosofta IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Genera"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "Rado"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "seria"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Nespecifa 2 Butona Muso"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Nespecifa 3 Butona Muso"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Lo�iteka MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Lo�iteka CC serio"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Lo�iteka MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Serio"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Lo�iteka Muso (seria, malnova C7 speco)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Neniu Muso"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2 butonoj"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3 butonoj"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "neniu"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Neniu Muso"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "Sekvanta ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "�u tio �i pravas?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Interreta Konfigurado"
+
+#: ../../netconnect.pm_.c:94
+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:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Konfiguru interretan konekta�on"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Kiel vi deziras konekti al la Interreto?"
+
+#: ../../netconnect.pm_.c:107
+#, 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"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "ISDN-a Konfigura�on"
+
+#: ../../netconnect.pm_.c:141
+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:158
+msgid "Connection Configuration"
+msgstr "Konfigurado de Konekto"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "Bonvole plenigu a� marku la suban kampon"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "IRQ de Karto"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "Memoro de Karto (DMA)"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "I/O (Eneligo) de Karto"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "I/O 0 (Eneligo 0) de Karto"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "I/O 1 (Eneligo 1) de Karto"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "Via persona telefonnumero"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "Nomo de interretprovizanto (ekz-e provizanto.net)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Telefonnumero de interretprovizanto"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "Provizanto DNS 1"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "Provizanto DNS 2"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "Diskuma modalo"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "Konta Salutnomo (uzula nomo)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Konta Pasvorto"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Konfirmu Pasvorton"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "E�ropo"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "E�ropo (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "La cetero de la mondo"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "La cetero de la mondo - neniom da D-Kanelo (lukontraktataj lineoj)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "Kiun protokolon vi deziras uzi?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "Mi ne scias"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "Kiun specon de karto vi havas?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "�u mi devus da�ri?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "�esigu"
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
+"\n"
+"Se via havas ISA-an karton, la valoro sur la sekvanta ekrano devus esti "
+"�usta.\n"
 "\n"
+"Se vi havas PCMCIA-an karton, vi bezonas scii la IRQ-o kaj I/O (Eneligo)\n"
+"por via karto.\n"
+
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "Kiu estas via ISDN-a karto?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "Mi trovis ISDN-an Karton:\n"
+
+#: ../../netconnect.pm_.c:287
+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 ""
+"Mi detektis ISDN-an PCI-an Karton, sed mi ne scias la specon.  Bonvole "
+"elektu\n"
+"unu el la PCI-aj kartojn sur la sekvanta ekrano."
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
-"Bonvenon al LILO, la mastruma sistema elektilo!\n"
+"Neniu ISDN-a PCI-a karto trovata.  Bonvole elektu unu el la PCI-aj kartojn "
+"sur\n"
+"la sekvanta ekrano."
+
+#: ../../netconnect.pm_.c:331
+#, 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:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Elektu la retan interfacon"
+
+#: ../../netconnect.pm_.c:336
+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:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "Reta interfaco"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
-"Por listigi la eblajn elektajxojn, premu <Tabo>.\n"
+"Do you agree?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "�u vi deziras provi la konfigura�on?"
+
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "ADSL Konfigura�o"
+
+#: ../../netconnect.pm_.c:469
+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:529
+msgid "Try to find a modem?"
+msgstr "Provu trovi modemon?"
+
+#: ../../netconnect.pm_.c:539
+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:544
+msgid "Dialup options"
+msgstr "Telefon-konektaj opcioj"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Nomo de konekto"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "Telefonnumero"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Salutnomo"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "A�tentikigado"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP (Pasvorta A�tentikigada Protokolo)"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Programeto-bazata"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Finaparato-bazata"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Domajna nomo"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Unu DNA-a Servilo"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Dua DNA Servilo"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
 "\n"
-"Por sxargi unu el ili, tajpu gxian nomon kaj premu <Enigu> aux atendu\n"
-"dum %d sekundoj por defauxlta sistemo.\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Konektu al la Interreto / Konfiguru lokan Reton"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
 "\n"
+"You can reconfigure your connection."
+msgstr "Konfiguru interretan konekta�on"
 
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Bonvenon al GRUB la elektilo por mastrumaj sistemoj!"
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Kiel vi deziras konekti al la Interreto?"
 
-#: ../../lilo.pm_.c:432
-#, 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."
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Kiel vi deziras konekti al la Interreto?"
+
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Konekti al la interreto"
+
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Malkonekti el la interreto"
+
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Konfiguru interretan konekta�on"
+
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "Interreta konekta�o kaj konfiguro"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
-"Premu la enenklavon por starti la elektatan mastruman sistemon, 'e' por\n"
-"redakti la"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "ordonoj anta� startado, a� 'c' por uzi komandan linion."
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Konfiguru interretan konekta�on"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "La emfazata enskribo startos a�tomate post %d sekundoj."
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Konfiguru interretan konekta�on"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "mankas sufi�e da spaco en /boot"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Interna ISDN-karto"
 
-# MS-Windows doesn't exist in Esperanto; so use English
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Desktop"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Interna ISDN-karto"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Start Menu"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "Konektu al la Interreto"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - Muso"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "Kia estas via ISDN-a konekta�o?"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB Muso"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Konfiguru interretan konekta�on"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB Muso (2 butonoj)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "Francujo"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB Muso (3 butonoj a� pli)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "Aliaj landoj"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB Muso"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "En kiu lando vi estas?"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB Muso (2 butonoj)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "Alcatel modemo"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB Muso (3 butonoj a� pli)"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "ECI modemo"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Nespecifa Mouse (PS/2-a interfaco)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
+"Se via ADSL modemo estas Alcatel-a, elektu \"Alcatel\".  Aliokaze, elektu "
+"\"ECI\"."
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Lo�iteka MouseMan/FirstMouse (PS/2-a interfaco)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "uzu pppoe"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Nespecifa 3 Butona Muso (PS/2-a interfaco)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "ne uzu pppoe"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2-a interfaco)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only 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'"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Lo�iteka MouseMan+/FirstMouse+ (PS/2-a interfaco)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Konfiguru interretan konekta�on"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2-a interfaco)"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"Kiun dhcp-an klienton vi deziras uzi?\n"
+"La defa�lto estas dhcpd"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "Askia MieMouse (PS/2-a interfaco)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Konfiguru interretan konekta�on"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2-a interfaco)"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "Konfiguru lokan reton"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2-a interfaco)"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "ISDN-a Konfigura�on"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2-a interfaco)"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "�u vi deziras provi la konfigura�on?"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Mikrosofta IntelliMouse (PS/2-a interfaco)"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "Malkapabligu retumon"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Busa Muso"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Konektu al la Interreto / Konfiguru lokan Reton"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Mikrosofta Busa Muso"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"Loka Reto jam estas konfigurita.\n"
+"�u vi deziras:"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Lo�iteka Busa Muso"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "Kiel vi deziras konekti al la Interreto?"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB Muso"
+#: ../../netconnect.pm_.c:858
+#, fuzzy
+msgid "Network Configuration"
+msgstr "ISDN-a Konfigura�on"
+
+#: ../../netconnect.pm_.c:859
+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"
+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"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB Muso (3 butonoj a� pli)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "neniu retkarto trovita"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Neniu Muso"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Konfiguras reto"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Mikrosofta Versia 2.1A a� pli alta (seria)"
+#: ../../network.pm_.c:274
+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''."
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Lo�iteka CC serio (seria)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "Po�tejo"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Lo�iteka MouseMan+/FirstMouse+ (seria)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+"AVERTO: �i tiu aparato estis anta�e konfigurata por konekti al la "
+"Interreto.\n"
+"Simple klaki JES por teni la konfiguron de �i tiu aparato.\n"
+"Se vi modifos la subajn kampojn, vi �an�os �i tiun konfiguron."
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "Askia MieMouse (seria)"
+#: ../../network.pm_.c:302
+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 ""
+"Bonvole enigu la IP-an konfigur�jon por �i tiu komputilo.\n"
+"�iu ero devus esti enigata kiel IP-adreson en punktita-decimala notacio\n"
+"(ekzemple, 1.2.3.4)."
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (seria)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Konfiguras retan aparaton %s"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Mikrosofta IntelliMouse (seria)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "A�tomata IP"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Serio (seria)"
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "IP-adreso"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (seria)"
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "Retmasko"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Lo�iteka Muso (seria, malnova C7 speco)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Lo�iteka MouseMan/FirstMouse (seria)"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP-adreso devus esti en la notacio 1.2.3.4"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Nespecifa Muso (seria)"
+#: ../../network.pm_.c:341
+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 ""
+"Bonvole enigu vian po�tejon.\n"
+"Via po�tejo devus esti plene specifita po�tejo,\n"
+"ekzemple ``miakomputilo.mialaborejo.miafirmao.com''.\n"
+"Vi anka� povas enigi la IP-adreson de la prokura kluzo se via havas unu."
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Mikrosoft-kongrua (seria)"
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "DNA servilo"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Nespecifa 3 Butona Muso (seria)"
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "Kluzo"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (seria)"
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "Prokura kluzaparato"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "�u tio �i pravas?"
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "Konfigurado de prokuraj serviloj"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP prokura servilo"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP prokura servilo"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Prokura servilo devus esti http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Prokura servilo devus esti ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr "�i tiu platformo ne subtenas etendatajn subdiskojn"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4042,21 +5197,21 @@ msgstr ""
 "La sola solvo estas movi viajn �efajn subdiskojn por situigi la truon\n"
 "apud la etendataj subdiskoj."
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Eraro legante dosiero %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Resta�ris el dosiero %s malsukcesis: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Malbona rezerva dosiero"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Eraro skribante al dosiero %s"
@@ -4090,42 +5245,51 @@ msgstr "interesa(j)"
 msgid "maybe"
 msgstr "elbe"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (grava(j))"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (tre agrabla(j))"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (agrabla(j))"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Montru malpli"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Montru pli"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Loka printilo"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "Malproksima lpd"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "Malproksima printilo"
+
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "Malproksima CUPS-a servilo"
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "Malproksimaj lpd servilo"
+
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "Reta Printilo (ingo)"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Vindozo 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "Printila Aparato URI"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Detektas aparatojn..."
@@ -4139,11 +5303,11 @@ msgstr "Provu pordojn"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Printilo, tipo \"%s\", estas detektita �e "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Loka Printila Aparato"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4151,15 +5315,15 @@ msgstr ""
 "Al kiu aparato estas via printilo konektata\n"
 "(notu ke /dev/lp0 egalas LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Printila Aparato"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Malproksimaj lpd Printilaj Opcioj"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4169,19 +5333,19 @@ msgstr ""
 "printservilo kaj la printviconomon �e tiu servilo en kiun taskoj devus\n"
 "esti metata."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Malproksima po�tejo"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Malproksima printvico"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Vindozo 9x/NT) Printilaj Opcioj"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4196,27 +5360,27 @@ 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:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "Po�tejo de SMB servilo"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP de SMB servilo"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Opuza nomo"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Laborgrupo"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "NetWare Printilaj Opcioj"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4228,131 +5392,155 @@ msgstr ""
 "printvican nomon por la printilo vi deziras atingi kaj iun ajn ta�gan\n"
 "salutnomon kaj pasvorton."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Printservilo"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Printvica Nomo"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "Ing-Printilaj Opcioj"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"Por printi al inga printilo, vi bezonas provizi la\n"
+"po�tejon de la printilo kaj opcie la pordnumeron."
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "Printilaj Po�tejo"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "Pordo"
+
+#: ../../printerdrake.pm_.c:155
+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:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Kiun specon de printilo vi havas?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "�u vi deziras provi printado?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Printas provpa�o(j)n..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\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"
+"Printada stato:\n"
+"%s\n"
+"\n"
+"�u �i �uste funkcias?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+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:230
 msgid "Yes, print ASCII test page"
 msgstr "Jes, printu Askian provpa�on"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Jes, printu PostSkriban provpa�on"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Jes, printu amba� de la provpa�ojn"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Konfiguru Printilon"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Kiun specon de printilo vi havas?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Printilaj opcioj"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Papergrandeco"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "El�etu pa�on post tasko?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Uniprint-aj pelilaj opcioj"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Kolorprofunecaj opcioj"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Printu tekston kiel PostScripto?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Inversigu ordon de pa�oj"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Riparu �tuparan tekston?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Nombro de pa�oj en eliga pa�o"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr ""
 "Dekstra/Maldrekstra mar�enoj en punktoj (1/72 de colo, proksimume 1/3 mm)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 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:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Aldonaj GhostScript-aj opcioj"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Aldonaj Tekstaj opcioj"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "�u vi deziras provi printado?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Printas provpa�o(j)n..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\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"
-"Printada stato:\n"
-"%s\n"
-"\n"
-"�u �i �uste funkcias?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-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:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Printilo"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "�u vi deziras konfiguri printilon?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4360,19 +5548,66 @@ msgstr ""
 "Jen la sekvantaj printvicoj.\n"
 "Vi povas aldoni pli a� �an�i la ekzistantajn."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "CUPS startas"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr "Legas datumbason de CUPS peliloj..."
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Elektu Printilan Konekton"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Kiel estas la printilo konektata?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "Elektu Malproksiman Printilan Konekton"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+"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:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Malinstalu printvicon"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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?"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "Nomo de printilo"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "Priskribo"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "Loko"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4383,45 +5618,45 @@ msgstr ""
 "(ofte lp) kaj fonan eneligan dosierujon asociata kun �i.  Kiu nomo kaj\n"
 "dosierujo devus uzata por �i tiu printvico?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Nomo de printvico"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Fona eneliga dosierujo"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Printilan Konekton"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, 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:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Ne povas skribi dosieron $file."
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid malsukcesis"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid malsukcesis (eble raidtools mankas)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, 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:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, perioda ordonvicigilo."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4430,7 +5665,7 @@ msgstr ""
 "sistemlogdosiero (syslog).  Vi anka� povas uzi �in por halti la komputilon\n"
 "kiam la baterio�argo estas malgranda."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4439,7 +5674,7 @@ msgstr ""
 "'at' estis uzata, kaj lan�as ba�ajn ordonojn kiam la �argmezo estas\n"
 "sufi�e malgranda."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4451,7 +5686,7 @@ msgstr ""
 "baza Uniksa cron, inkluzive de pli bona sekureco kaj pli fortaj\n"
 "konfiguraj opcioj."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4462,7 +5697,7 @@ 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:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4470,7 +5705,7 @@ msgstr ""
 "Apache estas Tut-Tera Teksa�a servilo.  �i liveras HTML-ajn dosierojn\n"
 "kaj CGI (komuna\tkluza interfaco)."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4484,7 +5719,7 @@ 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:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4494,7 +5729,7 @@ msgstr ""
 "Vi povas elekti �i tion per la kbdconfig utilprogramo.  Vi lasus �i tion\n"
 "ebligatan por la plejmulto da sistemoj."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4502,7 +5737,7 @@ 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:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4510,7 +5745,7 @@ msgstr ""
 "'named' (BIND) estas Domajna NomServilo (DNS) kiun vi uzas por trovi\n"
 "po�tejojn de IP adresoj."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4518,7 +5753,7 @@ msgstr ""
 "Muntas kaj malmuntas �iujn RetDosierSistemajn (NFS), SMB (Lan\n"
 "Manager/Vindozaj), kaj NCP (NetWare) surmetingojn."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4526,7 +5761,7 @@ msgstr ""
 "�altas/Mal�altas �iujn retajn interfacojn konfiguratajn por lan�i\n"
 "dum sistemstartado."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4536,7 +5771,7 @@ msgstr ""
 "�i tiu servo provizas NFS dosier�losado, kiun vi konfiguras per la\n"
 "/etc/exports dosiero."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4544,7 +5779,7 @@ msgstr ""
 "NFS estas populara protokolo por dosierdistribuado tra TCP/IP retoj.\n"
 "�i tiu servo provizas NFS dosier�losado."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4555,7 +5790,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:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4567,7 +5802,7 @@ msgstr ""
 "La pordmapservilo devas esti uzata �e komputiloj kiuj agas kiel serviloj\n"
 "por protokoloj kiuj uzas la RPC mekanismon."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4575,7 +5810,7 @@ msgstr ""
 "\"Postfix\" estas Po�tTransportPerilo, kiu estas la programo kiu movas\n"
 "retpo�ton de unu komputilo al alia."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4583,7 +5818,7 @@ msgstr ""
 "Savas kaj resta�ras sisteman entropikomuna�on por pli altkvalita\n"
 "generado de aleatoraj nombroj."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4593,7 +5828,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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4601,7 +5836,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:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4609,7 +5844,7 @@ msgstr ""
 "La ruser protokolo permesas al uzuloj sur reto identigi kiujn estas\n"
 "konektataj �e aliaj respondantaj komputiloj."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4617,7 +5852,7 @@ 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:66
+#: ../../services.pm_.c:67
 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."
@@ -4626,55 +5861,226 @@ msgstr ""
 "mesa�ojn al diversaj sistemlogdosieroj.  �i estas bona ideo �iam uzi\n"
 "syslog."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr ""
 "�i tiu starta komandodosiero provas �argi viajn modulojn por via USB muso."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
 "Startas kaj �esigas la X Tiparan Servilon je starttempo kaj �esiga tempo."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Elektu kiujn servojn devus a�tomate startata �e starta tempo"
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Bonvenon al SILO, la mastruma sistema elektilo!\n"
-"\n"
-"Por listigi la eblajn elektajxojn, premu <Tabo>.\n"
-"\n"
-"Por sxargi unu el ili, tajpu gxian nomon kaj premu <Enigu> aux atendu\n"
-"dum %d sekundoj por defauxlta sistemo.\n"
-"\n"
+"Mi ne povas legi vian subdisktabelon, �i estas tro difektita por mi :(\n"
+"Mi penos da�ri per blankigi difektitajn subdiskojn"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Konfiguru LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Kreu pra�argdisketon"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Formatu disketon"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Elekto"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "Instalado de LILO malsukcesis.  La sekvanta eraro okazis:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Disdividado de Interreta Konekto nuntempe kapabligata"
+
+#: ../../standalone/drakgw_.c:104
+#, fuzzy
+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 ""
+"La konfigurado de la disdividado de la Interreta konekto jam estas farita.\n"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Tabelo"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Konfiguru X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Disdividado de Interreta Konekto nuntempe malkapabligata"
+
+#: ../../standalone/drakgw_.c:123
+#, fuzzy
+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 ""
+"La konfigurado de la disdividado de la Interreta konekto jam estas farita.\n"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Tabelo"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "Mi ne povas kompreni la enhavon de la konfigurodosiero."
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "Disdividado de Interreta Konekto"
+
+#: ../../standalone/drakgw_.c:152
+#, fuzzy
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+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"
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Diskuma modalo"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "Via komputilo ne havas retadaptilon!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Mi ne detektas eterretan retadaptilom sur via sistemo.  Bonvole lan�u la\n"
+"aparatokonfigurilon."
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"Ekzitas nur unu konfigurita retadaptilo sur via sistemo:\n"
+"\n"
+"$interface\n"
+"\n"
+"�u vi deziras konfiguri vian Lokan Reton (LAN) kun �i tiu adaptilo?"
+
+#: ../../standalone/drakgw_.c:223
+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:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"Averto, la retadaptilo estas jam konfigurata.\n"
+"�u vi deziras rekonfiguri �in?"
+
+#: ../../standalone/drakgw_.c:258
+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:268
+msgid "Firewalling configuration detected!"
+msgstr "Konfigura�o de barilo detektata!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+"Averto.  Ekzistanta konfigura�o de barilo detektata.  Vi eble devas permane\n"
+"fiksi �in poste de la instalado.  �u vi deziras anta�eniri?"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+"Mi konfiguras komandodosierojn, instalas programojn, startas servilojn..."
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Konfiguras IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "Mi ne povis instali ipchains-an (IP �enan) RPM dosieron per urpmi-o."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "Mi ne povis instali dhcp-an RPM dosieron per urpmi-o."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "Mi ne povis instali linuxconf-an RPM dosieron per urpmi-o."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "Mi ne povis instali bind-an RPM dosieron per urpmi-o."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+"Mi ne povis instali caching-nameserver-an (ka�anta-nomservilan) RPM "
+"dosieron\n"
+"per urpmi-o."
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Gratulojn!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4736,23 +6142,37 @@ msgstr "Elektas sekurnivelon"
 msgid "Choose the tool you want to use"
 msgstr "Elektu la ilon kiun vi deziras instali"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Kiu estas via klavara aran�o?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "�an�u distingivon"
+
+#: ../../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 ""
+"�an�u vian KDROM!\n"
+"\n"
+"Bonvole, en�ovu la KDROM-on etikedatan \"%s\" en via drajvo kaj klaku "
+"\"Jes\"\n"
+"kiam vi finos.\n"
+"Se vi ne havas �in, klaku \"Nuligu\" por eviti la instaladon de �i tiu KDROM."
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Kiun speco de muso havas vi?"
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "neniu serial_usb (seria USB) trovita\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "�u vi deziras emuli trian musbutonon?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Al kiu seria pordo estas via muso konektata?"
 
@@ -4964,3 +6384,556 @@ msgstr "Trovas foliojn"
 #: ../../standalone/rpmdrake_.c:360
 msgid "Finding leaves takes some time"
 msgstr "Trovi foliojn bezonas iom da tempo"
+
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Interreto"
+
+msgid "Internet"
+msgstr "Interreto"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Oficejo"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Plurmedia"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Plurmedia"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Plurmedia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Plurmedia"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Dokumentaro"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Plurmedia"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Elektu la grandecon kiu vi deziras instali"
+
+#~ msgid "Total size: "
+#~ msgstr "Tuta grandeco: "
+
+#~ msgid "Reconfigure local network"
+#~ msgstr "Rekonfiguru lokan reton"
+
+#~ msgid ""
+#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Vi povas konfiguri vian komputilon por disdividi �ian Interretan Konekton.\n"
+#~ "\n"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "�iuj estas konfigurita.\n"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Konektu al la interreto per normala modemo"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Konektu al la interreto per ISDN"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Konektu al la interreto per DSL (a� ADSL)"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Konektu al la interreto per kAblomodemo"
+
+#~ msgid ""
+#~ "Time (secs) of inactivity after which\n"
+#~ "it hangs up. (leave blank to disable it)"
+#~ msgstr ""
+#~ "Tempo (sekundoj) de neaktiveco post kiu �i\n"
+#~ "malkonektos (lasu blankan por malkapabligi �in)."
+
+#~ msgid "Germany"
+#~ msgstr "Germana"
+
+#~ msgid "Germany (1TR6)"
+#~ msgstr "Germana (1TR6)"
+
+#~ msgid "What do you wish to do?"
+#~ msgstr "Kion vi deziras fari?"
+
+#~ 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."
+#~ msgstr ""
+#~ "Iuj subdiskoj kiuj estas lastatempe kreita devas esti formatata por uzi\n"
+#~ "(formatado estas la kreado de dosiersistemo �e la subdisko).  Nune, vi eble\n"
+#~ "deziras reformati iom da subdiskojn kiuj jam ekzistas por forvi�i la "
+#~ "datenojn\n"
+#~ "kiujn ili enhavas.  Notu: ne estas necesa reformati anta�ekzistitajn\n"
+#~ "subdiskojn, precipe se ili enhavas dosierojn a� datenojn kiuj vi deziras\n"
+#~ "konservi.  Kutime konservata estas �ome kaj /usr/local."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "�i tiam, vi povas elekti kiu(j)n subdisko(j)n vi deziras uzi por instali\n"
+#~ "vian Linuks-Mandrejkan sistemon se ili estas jam difinita (de anta�a\n"
+#~ "instalado de Linukso a� de alia dispartigilo).  Aliokaze, vi devus difini\n"
+#~ "drajvajn subdiskojn.  �i tiu operacio konsistas el logike dispartigi la\n"
+#~ "drajvon de la komputilo je apartaj lokoj por uzado.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se vi devus krei novajn subdiskojn, uzu \"A�todisponigu\" por a�tomate krei\n"
+#~ "subdiskojn por GNU/Linukso.  Vi povas elekti la drajvon por dispartigado "
+#~ "per\n"
+#~ "klaki sur \"hda\" por la unua IDE drajvo, \"hdb\" por la dua a� \"sda\" por "
+#~ "la\n"
+#~ "unua SCSI drajvo ktp.\n"
+#~ "\n"
+#~ "\n"
+#~ "Du oftaj subdiskoj estas: la radika subdisko (/), kiu estas la "
+#~ "komencopunkto\n"
+#~ "de la dosierujhierarkio de la dosiersistemo, kaj /boot, kiu enhavas �iujn\n"
+#~ "dosierojn bezonatajn por starti la mastruman sistemon kiam vi unue �altas\n"
+#~ "la komputilon.\n"
+#~ "\n"
+#~ "�ar la efikoj de �i tiu procezo estas kutime neinversigeblaj, dispartigado\n"
+#~ "povas esti timiga kaj stresiga por la nesperta uzulo.  DiskDrake simpligas\n"
+#~ "la procezon por ke �i ne devu esti.  Konsultu la dokumentaron kaj malrapidu\n"
+#~ "anta� vi anta�eniras.\n"
+#~ "\n"
+#~ "\n"
+#~ "Vi povas atingi �iun ajn opcion per uzi la klavaron: navigu tra la "
+#~ "subdiskoj\n"
+#~ "per Tab kaj la Supren/Suben sagoj.  Kiam subdisko estas elektata, vi povas\n"
+#~ "uzi:\n"
+#~ "\n"
+#~ "- Ctrl-c  por krei novan subdiskon (kiam malplena subdisko estas elektata)\n"
+#~ "\n"
+#~ "- Ctrl-d  por forstreki subdiskon\n"
+#~ "\n"
+#~ "- Ctrl-m  por fiksi surmetingon\n"
+
+#~ msgid "Cable connection"
+#~ msgstr "Kablomodema Konekton"
+
+#~ 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Elektu \"Instalu\" se vi ne havas anta�an version de GNU/Linukso instalita,\n"
+#~ "a� se vi deziras uzi plurajn distribua�ojn a� versiojn.\n"
+#~ "\n"
+#~ "Elektu \"Savu\" se vi deziras savi anta�an version de Mandrejka Linukso.\n"
+#~ "\n"
+#~ "\n"
+#~ "Elektu:\n"
+#~ "\n"
+#~ "  - Rekomendata: Se vi ne jam instalis Linukson elektu �i tion.\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"
+#~ "  - Spertulo: �i tio supozas 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!\n"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "�u mi devus forgesi la �an�ojn?"
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "GNU/Linukso povas pritrakti multajn specojn de printiloj.  �iu el tiuj "
+#~ "specoj\n"
+#~ "bezonas malsaman aran�on.  Notu tamen ke la printvicilo uzas 'lp' kiel\n"
+#~ "la defa�lta printilonomo; do vi devas havi unu printilon nomatan 'lp';\n"
+#~ "sed vi povas doni multajn nomojn, apartigataj per '|' signoj, al printilo.\n"
+#~ "Do, se vi preferas havi pli signifoplenan nomon, vi simple devas meti\n"
+#~ "�in anta�e, ekz-e: \"My Printer|lp\".\n"
+#~ "La printilo kiu havas \"lp\" en �ia(j) nomo(j) estos la defa�lta printilo.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se via printilo estas rekte konektita al via komputilo, elektu \"Loka\n"
+#~ "printilo\".  Tiam vi devos elekti la pordon al kiu via printilo estas\n"
+#~ "konektita, kaj ta�gan filtrilon.\n"
+#~ "\n"
+#~ "Se vi deziras atingi printilon �e fora Uniksa komputilo, vi devos elekti\n"
+#~ "\"Fora lpd\".  Por funkciigi �in, uzulnomo kaj pasvorto ne estas "
+#~ "postulataj,\n"
+#~ "sed vi devos scii la printviconomon �e �i tiu servilo.\n"
+#~ "\n"
+#~ "Se vi deziras atingi SMB-an printilon (kiu signifas, printilo �e fora\n"
+#~ "Vindoza 9x/NT komputilo), vi devos specifi �ian SMB-an nomon (kiu ne estas\n"
+#~ "�ia TCP/IP nomo), kaj eble �ian IP adreson, kaj la uzulnomon, laborgrupon\n"
+#~ "kaj pasvorton bezonatajn por atingi la printilon, kaj kompreneble la nomo\n"
+#~ "de la printilo.  NetWare printilo samas, krom vi ne bezonas laborgrupan\n"
+#~ "informon."
+
+#~ msgid "Host name:"
+#~ msgstr "Po�tejo:"
+
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Se DrakX malsukcesis trovi vian muson, a� se vi deziras kontroli kion �i\n"
+#~ "faris, liston de musospecoj prezentos al vi supre.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se vi konsentas kun la opcioj ke DrakX elektis, simple alklaku 'JES'.\n"
+#~ "Aliokaze, vi povas elekti la specon de muso el la menuo kiun vi pensas "
+#~ "estas\n"
+#~ "la plej proksima egala�o de via muso.\n"
+#~ "\n"
+#~ "\n"
+#~ "Okaze de seria muso, vi anka� devas diri al DrakX al kiu seria pordo �i\n"
+#~ "estas konektata."
+
+#~ msgid "Install/Rescue"
+#~ msgstr "Instalu/Savu"
+
+#~ 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."
+#~ msgstr ""
+#~ "Mi forte rekomendas ke vi respondas \"Jes\" �i tie!  Se vi instalos "
+#~ "Vindozon\n"
+#~ "estontece, �i superskribos la startigan sektoron.  Krom se vi faris "
+#~ "startigan\n"
+#~ "diskon kiel sugestata, vi ne plu eblas starti GNU/Linukson."
+
+#~ msgid "Move your wheel!"
+#~ msgstr "Movu vian radon!"
+
+#~ msgid "Rescue"
+#~ msgstr "Savu"
+
+#~ 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"
+#~ "  - 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"
+#~ msgstr ""
+#~ "Elektu:\n"
+#~ "\n"
+#~ "  - A�tomaciata (rekomendata): Se vi ne jam instalis Linukson elektu �i "
+#~ "tion.\n"
+#~ "    RIMARKU: retumado ne konfiguros dum instalado, uzu LinuxConf por "
+#~ "konfiguri\n"
+#~ "    �in post kiam la instalado fini�os.\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"
+#~ "  - 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!\n"
+
+#~ 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."
+#~ msgstr ""
+#~ "La elektitaj paka�oj nun estas instalata.  �i tiu operacio devus da�ri\n"
+#~ "kelkajn minutojn krom se vi elektis promocii ekzistan sistemon.  Tiuokaze\n"
+#~ "�i eble da�ras pli da tempo anta� la promocio komencos."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "�i tiu sekcio estas dedi�ita al la konfigurado de loka reto a� modemo.\n"
+#~ "\n"
+#~ "Elektu \"Loka Reto\" kaj DrakX provos trovi Eterretan adaptilon �e via\n"
+#~ "komputilo.  PCI-aj adaptiloj devus esti trovataj kaj initataj a�tomate.\n"
+#~ "Tamen, se via periferio estas ISA-a, a�tomata detektado ne funckios, kaj\n"
+#~ "vi devos elekti pelilon el la listo kiu aperos tiam.\n"
+#~ "\n"
+#~ "\n"
+#~ "Por SCSI-aj adaptiloj, vi povas lasi ke la pelilo esploros por la adaptilo\n"
+#~ "unuafoje, aliokaze vi devas difini la opciojn al la pelilo kiuj vi havigas "
+#~ "de\n"
+#~ "la dokumentaro de via adaptilo.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se vi instalas Linuks-Mandrejkan sistemon kiu estas parto de jam ekzistanta\n"
+#~ "reto, la retadministranto estos donintan al vi �iuj el la necesa informo\n"
+#~ "(IP-adreso, reta submasko a� retmasko mallonge, kaj po�tejo).  Se vi "
+#~ "establas\n"
+#~ "privatan reton hejme ekzemple, vi devus elekti adresojn.\n"
+#~ "\n"
+#~ "\n"
+#~ "Elektu \"Telefona konekto kun modemo\" kaj la Interreta konekto kun modemo\n"
+#~ "estos konfigurata.  DrakX provos trovi vian modemon.  Se �i malsukcesas vi\n"
+#~ "devos elekti la �ustan serian pordon kie via modemo estas konektata."
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Kiun speco de muso havas vi?"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Kiun subdiskspecon deziras vi?"
diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index 0d7edb52f..33239294b 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: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+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,43 +13,96 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "Tavaline"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Graafikakaart"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Valige graafikakaart"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Valige X server"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X server"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree86 %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Millist XFree konfiguratsiooni soovite?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, c-format
+msgid ""
+"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
+"Your card is supported by XFree %s which may have a better support in 2D."
+msgstr ""
+"Teie videokaardi 3D graafikakiirendit saab kasutada vaid koos XFree %s-ga.\n"
+"XFree %s toetab Teie videokaarti ja v�ib omada paremat 2D tuge."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr "Teie kaardi 3D graafikakiirendi on t��tab koos XFree %s-ga."
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s 3D graafikakiirendi toega"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"Teie videokaardi 3D graafikakiirendit saab kasutada vaid koos XFree %s-ga.\n"
+"SEE ON AGA EKSPERIMENTAALNE JA V�IB OLLA EBASTABIILNE.\n"
+"Teie kaarti toetab XFree %s, millel on ehk parem 2D tugi."
+
+#: ../../Xconfigurator.pm_.c:248
+#, c-format
+msgid ""
+"Your card can have 3D hardware acceleration support with XFree %s,\n"
+"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
+msgstr ""
+"Teie videokaardi 3D graafikakiirendit saab kasutada koos XFree %s-ga.\n"
+"SEE ON AGA EKSPERIMENTAALNE JA V�IB OLLA EBASTABIILNE."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s EKSPERIMENTAALSE 3D kiirendi toega"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "XFree s�tted"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Valige graafikam�lu suurus"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Valige X server"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Valige monitor"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -69,39 +122,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:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Realaotussagedus"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Ekraaniuuendussagedus"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Monitor ei ole seatud"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Graafikakaart ei ole veel seatud"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Kuvatihedus ei ole veel seatud"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Kas soovite seadistusi proovida?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr "Hoiatus: testimine on sellele graafikakaardile ohtlik"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr "Hoiatus: testimine v�ib Teie arvuti peatada"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Proovime seadistusi"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -109,185 +162,173 @@ msgstr ""
 "\n"
 "proovige m�nd parameetrit muuta"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Tekkis mingi viga:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "J�tkub %d sekundi p�rast"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "Kas see on �ige?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Tekkis mingi viga, proovige m�nd parameetrit muuta"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "V�ljapakutavad kuvatihedused"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Et leida v�imalikke kuvatihedusi, testin erinevaid variante.\n"
-"Ekraan Teie ees hakkab vilkuma...\n"
-"Kui soovite, l�litage monitor v�lja. Kui valmis saan, kostab piiks"
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Kuvatihedus"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Valige kuvatihedus ja v�rvis�gavus"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Graafikakaart: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 server: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "N�ita k�ike"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Kuvatihedused"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Me v�ime proovida leida kuvatihedust, n�iteks 800x600.\n"
-"Siiski, vahel ajab see arvuti segadusse.\n"
-"Soovite proovida?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Sobivat olekut ei leitud\n"
-"Proovige palun muud graafikakaarti v�i monitori"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klaviatuuriasetus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Hiire t��p: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Hiire port: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Realaotussagedus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Ekraanisagedus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Graafikakaart: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Videom�lu: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "V�rvis�gavus: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Kuvatihedus: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 server: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 juhtprogramm: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Valmistume X-i seadistamiseks"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Muuda monitori"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Muuda graafikakaardi"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Muuda serveri parameetreid"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Muuda kuvatihedust"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Automaatne kuvatiheduste otsing"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "N�ita lisainfot"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Proovi veel"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "V�lju"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Mida Te soovite teha?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Muutusi ei teinudki?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"S�ilita muutused?\n"
+"Olemasolevad s�tted:\n"
+"\n"
+"%s"
 
 # c-format
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Muudatuste aktiveerimiseks k�ivitage %s uuesti"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Palun v�ljuge ja vajutage siis Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X stardib n��d"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -295,226 +336,221 @@ msgstr ""
 "Teie arvutis on v�imalik k�ivitada X juba alglaadimisel.\n"
 "Kas soovite nii teha?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Vaikimisi sisenemine"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"Teie arvutit saab seada vaikimisi kasutaja sisenemisele.\n"
+"Kui Te seda ei soovi, valige <Katkesta>"
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Valige uus vaikimisi kasutaja :"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "Valige palun k�ivitatav aknahaldur:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 v�rvi (8 bitti)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tuhat v�rvi (15 bitti)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tuhat v�rvi (16 bitti)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 miljonit v�rvi (24 bitti)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 miljardit v�rvi (32 bitti)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB v�i rohkem"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA, 640x400 sagedusel 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "SVGA, 800x600 sagedusel 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514-�hilduv, 1024x768, 87 Hz vahelej�tuga "
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "K�rgsageduslik SVGA, 1024x768, 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Mitmesageduslik, 1280x1024 sagedusel 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Mitmesageduslik, 1280x1024 sagedusel 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Mitmesageduslik, 1280x1024 sagedusel 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Kuvatihedus saab olla 1600x1200 sagedusel 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Kuvatihedus saab olla 1600x1200 sagedusel 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "lokiline"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "tavaline"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "pintsaklips"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "br�nett"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "neiu"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "blondiin"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "automaagiline"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Partitsiooni algusesse"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Ketta algusesse (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "LILO/grub paigaldamine"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "SILO paigaldamine"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Kuhu soovite alglaaduri paigaldada"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub paigaldamine"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Ei soovi"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Millist alglaadurit soovite kasutada?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Alglaaduri peas�tted"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Alglaadimisseade"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (ei t��ta vanema BIOSi korral)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Kompaktne"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "kompaktne"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Ooteaeg alglaadimisel"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Graafikamood"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Ooteaeg alglaadimisel"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Salas�na"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Salas�na (uuesti)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Piira k�surea suvandeid"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "piiratud"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Alglaaduri peas�tted"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Palun proovige veel"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Salas�nad ei klapi"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -522,167 +558,351 @@ msgstr ""
 "Praegu on kasutusel sellised kirjed.\n"
 "Te v�ite neid lisada ning olemasolevaid muuta."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Lisa"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Tehtud"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Millisele sektorile soovite seda t�sta?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Muu OS (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Muu OS (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Millisele sektorile soovite seda t�sta?"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Laadefail"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Juur"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Lisada"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Read-write"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Tabel"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Ebaturvaline"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "T�his"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "OK"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Eemalda kirje"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "T�hi kirjet�his ei ole lubatud"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Selline t�his on juba kasutusel"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Leiti %s %s liidest"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "On Teil veel kaarte?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Kas Teil on ikka m�ni %s liides?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Ei"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Jah"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Paigaldame juhtprogrammil %s kaardile %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(moodul %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Millist %s juhtprogrammi peaksime proovima?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"M�nedel juhtudel vajab %s juhtprogramm t��ks lisainformatsiooni\n"
+"kuigi tavaliselt saab ka ilma hakkama. Kas soovite eraldi parameetreid\n"
+"m��ratleda v�i lasta juhtprogrammil ise Teie arvutit kompida? V�ib juhtuda,\n"
+"et see viib arvuti segadusse kuid ei tohiks mingit j��vat kahju teha."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Proovida niisama"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "M��rake parameetrid"
+
+#: ../../any.pm_.c:551
+#, 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:557
+#, 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 ""
+"N��d v�ite moodulile %s parameetreid m��rata.\n"
+"Parameetrid on vormingus \"nimi=v��rtus nimi2=v��rtus2 ...\".\n"
+"N�iteks: \"io=0x300 irq=7\""
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Mooduli parameetrid:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Moodule %s laadimine ei �nnestunud.\n"
+"Kas soovite proovida parameetreid muuta?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Tere tulemast! Laadimisel aitab Teid %s!\n"
+"\n"
+"Valikud kuvab <Tab>.\n"
+"\n"
+"Valimiseks sisestage eelistatava nimi ja vajutage <Enter>\n"
+"vaikimisi oodake %d sekundit.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Tere tulemast! Laadimisel aitab Teid GRUB!"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "Kasutage valiku tegemiseks %c ja %c klahve"
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Enter laeb Teie valiku, 'e' laseb muuta"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "suvandeid enne laadimist ja 'c' veel enam."
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "Valik laetakse automaatselt %d sekundi jooksul"
+
+#: ../../bootloader.pm_.c:604
+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
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "T��laud"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Startmen��"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutit"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 minut"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekundit"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Tekita"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "�henda lahti"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Vorminda"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Muuda suurust"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "T��p"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "�henduspunkt"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Kirjuta /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Tavakasutaja > Ekspert"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Ekspert > Tavakasutaja"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Taasta failist"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Salvesta faili"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "Abimees"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Taasta flopilt"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Salvesta flopile"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Kustuta k�ik"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Vorminda k�ik"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Paiguta ise"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "K�ik primaarsed partitsioonid on kasutusel"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Partitsioone ei saa enam lisada"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -690,59 +910,63 @@ msgstr ""
 "Et saada rohkem partitsioone, kustutage palun �ks, et luua laiendatud "
 "partitsioon"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "P��sta partitsioonitabel"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Tagasi"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Kirjuta partitsioonitabel"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Laadi uuesti"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "T�hi"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Muu"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Saaleala"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "T�hi"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Muu"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Failis�steemi t��bid: "
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "�ksikasjad"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -754,17 +978,17 @@ msgstr ""
 "Soovitame teil esmalt selle suurust muuta\n"
 "(klikkige ja siis valige \"Muuda\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Palun tehke oma andmetest enne tagavarakoopia"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Lugege hoolega!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -773,77 +997,77 @@ msgstr ""
 "Kui soovite kasutada aboot-i, j�tke palun ketta algusesse v�hemalt 2048 \n"
 "sektorit vaba ruumi"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Vaadake ette: see v�ib olla ohtlik."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Viga"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "�henduspunkt:"
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Seade: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS kettat�his: %s (arvatavasti)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "T��p: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Algus: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Suurus: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektorit"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Silindrid %d kuni %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Vormindatud\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Vormindamata\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "�hendatud\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "loopback fail(id): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -851,79 +1075,79 @@ msgstr ""
 "Partitsioonilt toimub alglaadimine\n"
 "    (MS-DOS-i, mitte lilo jaoks)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Tase %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "�hiku suurus %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-kettad %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "loopback faili nimi: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Palun valige partitsioon"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Suurus: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geomeetria: %s silindrit, %s pead, %s sektorit\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Partitsioonitabeli t��p: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "siinil %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "�henda"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Aktiivne"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Lisa RAIDi"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Eemalda RAIDist"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Modifitseeri RAIDi"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Kasuta loopback-ina"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Valige tegevus"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -935,7 +1159,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:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -946,67 +1170,67 @@ 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:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "Olete valinud juurpartitsiooniks (/) tarkvaralise RAID-i.\n"
 "Ilma /boot partitsioonita ei ole v�imalik sellist s�steemi laadida.\n"
 "Lisage kindlasti /boot partitsioon!"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Kasutage pigem ``%s''"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Kasutage enne \"�henda lahti\""
 
-#  c-format
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, 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:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "J�tkate ikkagi?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "L�peta ilma salvestamata"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "L�petate ilma partitsioonitabelit salvestamata?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Muuda partitsiooni t��p"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Mis t��pi partitsiooni soovite?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "Mis keelt soovite kasutada?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr "ReiserFS ei ole kasutatav alla 32MB partisioonidel"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Kuhu soovite loopback-faili %s �hendada?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Kuhu soovite seadme %s �hendada?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1014,138 +1238,143 @@ msgstr ""
 "Seda �henduspunkti ei saa eemaldada, kuna partitsioon on kasutusel.\n"
 "loopback-ina. Eemaldage enne loopback"
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, 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:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Vormindan"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Vormindan loopback faili %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Vormindan partitsiooni %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "P�rast k�igi partitsioonide vormindamist"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "on k�ik andmed neil partitsioonidel h�vivad"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Liiguta"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Millisele kettale soovite seda �mber paigutada?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Millisele sektorile soovite seda �mber paigutada?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Paigutan �mber"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Liigutan partitsiooni..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Ketta %s partitsioonitabel salvestatakse!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Muudatuste j�ustamiseks vajate alglaadimist"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Arvutan FAT failis�steemi piire"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Muudan suurust"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Mis partitsiooni soovite muuta?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "Selle partitsiooni andmetest v�iks olla tagavarakoopia"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, 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.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Valige uus suurus"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Looge uus partitsioon"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Algsektor: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Suurus (MB): "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Failis�steemi t��p: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Eelistus: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Seda partitsiooni ei saa loopback-ina kasutada"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "loopback faili nimi:"
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "See fail on juba loopback-ina kasutusel, valige m�ni muu"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "Fail on juba olemas. Kas kasutan seda?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Valige fail"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1153,11 +1382,11 @@ msgstr ""
 "Tabeli tagavarakoopia ei ole sama suurusega\n"
 "Soovite j�tkata?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1165,78 +1394,78 @@ msgstr ""
 "Pange t�hi flopi masinasse\n"
 "K�ik andmed sellel h�vivad"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Proovin p��sta partitsioonitabelit"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "seade"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "tase"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "�hiku suurus"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Vali olemasolev RAID, millele lisada"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "uus"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s vormindamine seadmel %s eba�nnestus"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, 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:186
-msgid "nfs mount failed"
-msgstr "NFS �hendamine eba�nnestus"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "�hendamine eba�nnestus: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "viga %s lahti �hendamisel: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "�henduspunktid peavad algama kaldkriipsuga (/)"
 
 # c-format
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, 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:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Ring�hendus %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr "See kataloog peab j��ma kokku juurfailis�steemiga"
+
+#: ../../fsedit.pm_.c:259
 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:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Seadme %s avamine kirjutamiseks eba�nnestus: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1244,73 +1473,80 @@ msgstr ""
 "Tekkis viga: failis�steemi loomiseks ei leitud �htki seadet. Palun\n"
 "kontrollige oma riistvara."
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Teil ei ole �htki partitsiooni!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "Valige keel s�steemi paigaldamiseks ja kasutamiseks."
 
-#: ../../help.pm_.c:10
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Valige klaviatuuripaigutus �laltoodud nimekirjast"
-
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "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 ""
+
+#: ../../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"
-"  - 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"
-msgstr ""
-"Valige \"Paigaldamine\" kui varem sellele masinale Linuxit ei ole pandud\n"
-"v�i soovite kasutada mitut distributsiooni\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Valige \"Uuendamine\" kui soovite uuendada m�nd eelmist Mandrake Linuxit:\n"
-"5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios),\n"
-"Gold 2000 v�i 7.0 (Air).\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"
-"Valige:\n"
+"\t* Recommanded: 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"
-"  - Automaatne: Te pole kunagi varem Linuxit paigaldanud. M�RKUS: V�rku ei\n"
-"seadistata paigaldamise ajal. P�rast paigaldamist saate selleks kasutada\n"
-"LinuxConf-i.\n"
 "\n"
-"  - Isetehtud: Olete Linuxiga tuttav ja soovite s�steemi kohandada "
-"vastavalt\n"
-"Teie vajadustele. J�rgmisena saate teha valikud \"T��jaam\", \"Arendus\"\n"
-"ja \"Server\", s�ltuvalt Teie arvuti edaspidisest kasutusalast.\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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!\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1318,50 +1554,49 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Valige:\n"
 "\n"
 "  - Isetehtud: Olete Linuxiga tuttav ja soovite s�steemi kohandada "
 "vastavalt\n"
-"Teie vajadustele. J�rgmisena saate teha valikud \"T��jaam\", \"Arendus\"\n"
-"ja \"Server\", s�ltuvalt Teie arvuti edaspidisest kasutusalast.\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!\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:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "Kui valisite paigaldusklassiks \"Isetehtud\" v�i \"Ekspert\", saate teha\n"
 "veel j�rgmisi valikuid:\n"
@@ -1371,44 +1606,48 @@ msgstr ""
 "    juhul ei lisata �htki kompilaatorit ega muud arendusvahendit.\n"
 "\n"
 "  - Arendus: nii nagu nimi �tleb. Paigaldatakse t�iskomplekt vahendeid\n"
-"  eri programmeerimiskeelte kasutamiseks, allikkoodi loomiseks,\n"
-"  kompileerimiseks, silumiseks jne.\n"
-"  - Server: valige see, kui vajate Linux-Mandrake serverit. Saate "
-"serveerida\n"
-"  faile (NFS v�i SMB), printida (Unixi stiilis lp v�i Windowsi SMB), lisaks\n"
-"  andmebaasid, veebirakendused jms. Paigaldamata j�etakse esialgu "
-"graafiline\n"
-"  kasutajaliides (KDE, GNOME...).\n"
-
-#: ../../help.pm_.c:70
-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"
+"    eri programmeerimiskeelte kasutamiseks, allikkoodi loomiseks,\n"
+"    kompileerimiseks, silumiseks jne.\n"
+"  - Server: valige see, kui vajate Linux-Mandrake serverit. Saate \n"
+"    serveerida faile (NFS v�i SMB), printida (Unixi stiilis lp v�i \n"
+"    Windowsi SMB), lisaks andmebaasid, veebirakendused jms. Paigaldamata\n"
+"    j�etakse esialgu graafiline kasutajaliides (KDE, GNOME...).\n"
+
+#: ../../help.pm_.c:84
+#, 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 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"
+"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"
-"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"
+"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, 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."
+"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 proovib esmalt leida Teie s�steemist SCSI liideseid PCI siinil.\n"
-"Kui neid leitakse, ja vastav juhtprogramm on teada, siis laetakse\n"
-"see m�llu automaatselt.\n"
-"\n"
+"Kui neid leitakse, ja vastav(ad) juhtprogramm(id) on teada, siis laetakse\n"
+"ja paigaldatakse k�ik vajalik automaatselt.\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"
@@ -1422,110 +1661,319 @@ msgstr ""
 "ka parameetreid. Siiski, enamasti l�heb k�ik kenasti ka ilma neid\n"
 "sisestamata: vastavad andmed leiab juhtprogramm ise.\n"
 "\n"
-"\n"
-"Kui automaatne parameetrite otsimine ei t��ta, p��rduge palun\n"
-"oma SCSI liidese dokumentatsiooni poole. Ka samas masinas olev Windows\n"
-"oskab vahel SCSI kohta vajalikku informatsiooni anda."
+"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"
+"Ka samas masinas olev Windows oskab vahel SCSI kohta kasulikku \n"
+"informatsiooni anda."
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:108
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"\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"
-"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"
+"\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"
-"You can reach any option using the keyboard: navigate through the "
+"\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 ""
+
+#: ../../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"
-"using Tab and Up/Down arrows. When a partition is selected, you can use:\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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+"   * Undo: you can use this option to cancel your changes.\n"
 "\n"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\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"
 msgstr ""
-"N��d peaksite valima partitsioon(id) Linux-Mandrake paigaldamiseks\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"
-"eraldatud osadeks.\n"
+
+#: ../../help.pm_.c:218
+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"
-"Kui ei tunne ennast sel alal kindlalt, valige \"Auto Allocate\", et\n"
-"automaatselt luua Linuxile vajalikud partitsioonid.\n"
-"Linuxi maailmas t�hendab \"hda\" esimest, \"hdb\" teist IDE ketast,\n"
-"\"sda\" esimest. \"sdb\" teist SCSI ketast jne.\n"
+"For information, each partition is listed as follows: \"Name\", "
+"\"Capacity\".\n"
 "\n"
 "\n"
-"Kaks tavalist partitsiooni on juurpartitsioon (/), kus asub failis�steemi\n"
-"hierarhia algus ja /boot, mis sisaldab arvuti alglaadimiseks vajalikke "
-"faile\n"
+"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
 "\n"
-"Kuna partitsioneerimine ei ole p��ratav protsess, v�ib see tekitada\n"
-"algajas kerget k�hedust. DiskDrake on selle teinud k�ll lihtsamaks,\n"
-"aga kindlasti tuleks enne iga liigutust s�gavalt j�rele m�telda ja\n"
-"soovitavalt ka dokumentatsiooniga tutvuda.\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"
-"K�iki tegevusi saate teha ka ainult klaviatuuri kasutades: liikuge\n"
-"partitsioonidel <TAB> ja �les-alla noolte abil. Partitsiooni valikul\n"
 "\n"
-"- Ctrl-C  loob uue partitsiooni (valige selleks vaba kettaala)\n"
-"- Ctrl-D  kustutab partitsiooni\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
+"hard drives:\n"
 "\n"
-"- Ctrl-M  seab �henduspunkti\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 ""
+
+#: ../../help.pm_.c:252
+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:131
+#: ../../help.pm_.c:257
 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."
+"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 ""
-"K�ik Teie poolt v�rskelt loodud partitsioonid tuleb kasutamiseks vormindada\n"
-"(luua failis�steemid). Partitsiooni vormindamisel h�vitatakse k�ik andmed,\n"
-"mis seal iganes leiduvad. Pange t�hele, et varem vormindatud ja vajalikke\n"
-"andmeid sisaldavaid partitsioone, t��piliselt /home ja /usr/local, ei ole\n"
-"m�istlik �le vormindada, vaid need v�ib j�tta nii nagu on."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:267
+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 ""
+
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
+
+#: ../../help.pm_.c:303
+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 ""
+
+#: ../../help.pm_.c:329
+#, 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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 paigaldamiseks v�i uuendamiseks\n"
 "\n"
@@ -1536,148 +1984,185 @@ msgstr ""
 "Nimekirja l�pus saate valida \"Valik paketthaaval\"; sel juhul aga peate\n"
 "l�bi sirvima �le 1000 �ksiku paketi..."
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:358
+#, 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 ""
 "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, m�rkige vaid olemasolevad ja siis <OK>."
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:363
 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."
+"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 ""
-"N��d hakkan Teie valitud pakette paigaldama. Selleks peaks kuluma\n"
-"m�nik�mmend minutit. S�steemi uuendamisel kulub aega k�ll veidi rohkem,\n"
-"sest siis tuleb enne olemasolevaid pakette anal��sida."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:371
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"Kui DrakX ei suutnud Teie hiirt �les leida, v�i soovite vaadata, mida\n"
-"leiti, kuvatakse Teile �lalpool hiirte nimekiri.\n"
-"\n"
-"\n"
-"Kui olete valikuga n�us, minge lihtsalt vasakpoolses men��s edasi.\n"
-"Vastasel juhul valige hiire t��p, mis Teie arvates k�ige paremini Teie\n"
-"hiirt iseloomustab\n"
-"\n"
-"\n"
-"Kui tegemist on seerialpordi hiirega, peate �tlema ka, mis porti ta on\n"
-"�hendatud."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
-"Palun valige �ige port. N�iteks MS Windows-i COM1 kannab Linuxis\n"
+"Palun valige �ige port. N�iteks MS Windows-i COM1 kannab GNU/Linuxis\n"
 "nime ttyS0."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
+"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"
-"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"
-"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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"See sektsioon on p�hendatud kohtv�rgu (LAN) v�i sissehelistamisteenuse\n"
-"(DialUp) s�tete paikapanemisele.\n"
-"\n"
-"Kui vastate \"LAN\", siis proovitakse Teie arvutist leida v�rgukaarti.\n"
-"Kui Teie v�rgukaart t��tab PCI siinil, peaks ta olema leitav ja kasutatav\n"
-"automaatselt. ISA kaardi puhul, v�ib automaatne otsing alt vedada ja Te\n"
-"peate juhtprogrammi ise nimekirjast valima.\n"
-"\n"
-"\n"
-"SCSI kaartide puhul peab juhtprogramm esmalt leidma SCSI liidese, vastasel\n"
-"juhul peate p��rduma kaardi m��ja poole.\n"
-"\n"
-"\n"
-"Kui paigaldate Linux-Mandrake 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"
-"v�rku, peaksite ise valima aadressid \n"
-"\n"
-"Kui soovite Internetti kasutada modemi ja sissehelistamisteenuse kaudu,\n"
-"valige \"DialUp\" ja DrakX proovib otsida Teie arvutist modemit. Kui\n"
-"modemit ei leita, peate sisestama seerialpordi, kuhu kavatsete modemi\n"
-"�hendada."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"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:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
 "Sisestage:\n"
 "\n"
-"  - IP-aadress: kui Te seda ei teha, k�sige oma v�rguhaldurilt.\n"
+"  - IP-aadress: kui Te seda ei teha, k�sige oma v�rguhaldurilt v�i\n"
+"internetiteenuse pakkujalt (ISP)\n"
 "\n"
 "\n"
 "  - V�rgumask: \"255.255.255.0\" on tavaliselt sobiv. Igaks juhuks v�ite\n"
-"v�rguhalduri k�est �le k�sida.\n"
+"v�rguhalduri v�i ISP k�est �le k�sida.\n"
 "\n"
 "\n"
-"  - Automaatne IP: Kui Teie kohtv�rgus on kasutusel bootp v�i dhcp.\n"
+"  - Automaatne IP: Kui Teie kohtv�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.\n"
+"k�sige j�llegi oma v�rguhaldurilt v�i ISP-lt.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"Kui Teie v�rgus on kasutusel NIS, valige \"Kasuta NIS-i\". Kahtluse korral\n"
+"k�sige v�rguhaldurilt."
+
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1686,7 +2171,7 @@ msgstr ""
 "kindel,\n"
 "mida kuhu sisestada, k�sige oma ISP k�est �le."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1694,13 +2179,15 @@ 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:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1711,29 +2198,42 @@ msgstr ""
 "M�rkus: kr�ptopakettide valimisel peate arvesse v�tma ka v�imalikke\n"
 "�iguslikke piiranguid."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
-"N��d valige oma ajav��nd.\n"
+"N��d saate valida valige oma ajav��ndi.\n"
 "\n"
 "\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:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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"
 "Abiinfo balloonis antakse l�hike kirjeldus iga�he kohta neist.\n"
@@ -1741,77 +2241,159 @@ msgstr ""
 "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:257
+#: ../../help.pm_.c:486
+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:490
 msgid ""
-"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"
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"Linuxi all saate kasutada mitmesuguseid printereid. Iga�ks neist n�uab\n"
-"erinevaid s�tteid t��tamiseks. Siiski tasub t�hele panna, et s�steem\n"
-"kasutab nime 'lp' vaikimisi printeri jaoks; seega peab Teil �ks \n"
-"selliselt t�histatud, kuigi printeri(te)le v�ib panna '|' m�rgiga "
-"eraldatult\n"
-"mitu nime. Kui eelistate \"t�hendusega\" nimesid, pange nimeks\n"
-"n�iteks \"Minu printer|lp\" ja see saab olema Teie vaikimisi printer.\n"
+
+#: ../../help.pm_.c:505
+msgid ""
+"GNU/Linux can deal with many types of printer. Each of these types requires\n"
+"a different setup.\n"
+"\n"
 "\n"
-"Kui Teie printer on otse arvuti k�lge �hendatud, valige \"Kohalik "
+"If your printer is physically connected to your computer, select \"Local\n"
 "printer\".\n"
-"Siis saate valida pordi kuhu see on �hendatud ja vajaliku printfiltri\n"
 "\n"
 "\n"
-"Kui soovite kasutada printerit, mis on �hendatud Un*x serveriga, peate\n"
-"Valima \"lpd v�rguprinter\". Niisugusel juhul ei vaja Te kasutajatunnust\n"
-"ega salas�na, vaid ainult serveri nime ja printimisj�rje nime serveril.\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 ""
+
+#: ../../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"
+"\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 ""
+
+#: ../../help.pm_.c:542
+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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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"
-"Kui soovite kasutada SMB printserverit (st. printerit, mida jagab v�lja\n"
-"Windows 9x/NT, peate �ra n�itama serveri SMB nime (mis ei pea olema sama\n"
-"TCP/IP nimega) ja kindluse m�ttes ka IP-aadressi. Loomulikult on vaja teada\n"
-"ka serveri poolt jagatava printeri nime ning kasutajatunnust, salas�na ja\n"
-"t��grupi nime. Sama, v�lja arvatud t��grupp, on vaja teada ka NetWare\n"
-"printserveri kasutamise korral."
+"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 ""
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:585
+#, fuzzy
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"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"
@@ -1824,7 +2406,7 @@ msgstr ""
 "v�hemalt 8 m�rki pikk. �rge *kunagi* kirjutage oma parooli �les!\n"
 "Samas ei peaks see olema liiga pikk ja keeruline meelde j�tmiseks."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1832,7 +2414,7 @@ msgstr ""
 "Turvalisema s�steemi saamiseks peaksite valima \"Kasuta varjutatud \n"
 "paroolifaili\" ja \"Kasuta parooli kaitsmiseks MD5 algoritmi\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1840,7 +2422,7 @@ msgstr ""
 "Kui Teie v�rgus on kasutusel NIS, valige \"Kasuta NIS-i\". Kahtluse korral\n"
 "k�sige v�rguhaldurilt."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1881,33 +2463,28 @@ msgstr ""
 "Juurkasutaja �igused on ainult administreerimiseks ja hoolduseks,\n"
 "k�ike muud tehke palun tavakasutajana"
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"On ��rmiselt soovitatav vastata siin \"Jah\"! N�iteks, kui paigaldate\n"
-"samasse masinasse hiljem MS Windowsi, kirjutab see �le bootsektori.\n"
-"Ilma alglaadimisflopita ei ole Teil siis enam v�imalik Linuxit\n"
-"laadida."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 Linuxit laadida.\n"
+"N��d peate valima, milliselt kettaosalt soovite GNU/Linuxit laadida.\n"
 "\n"
 "Valige \"K�vaketta esimene sektor (MBR)\", kui ei tea t�pselt, mida\n"
 "teha."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1915,10 +2492,10 @@ msgstr ""
 "Tavaline valik on \"/dev/hda\" (esimese IDE kanali master), kui Te ei\n"
 "tea t�pselt, et tahate teisiti teha."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1928,13 +2505,14 @@ msgid ""
 "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 (ehk LInux LOader) ja grub on alglaadurid: nad v�imaldavad laadida\n"
-"kas Linuxit v�i m�nd muud Teie arvutis olevad operatsioonis�steemi.\n"
+"LILO (ehk LInux LOader) ja Grub on alglaadurid: nad v�imaldavad laadida\n"
+"kas GNU/Linuxi v�i m�ne muu Teie arvutis olevad operatsioonis�steemi.\n"
 "Tavaliselt tuvastakse teised operatsioonis�steemid �igesti ja seadista-\n"
 "takse ka alglaadur. Kui Teil aga ei ole �nne, tuleb parameetrid seada\n"
 "k�sitsi. Olge sel juhul hoolas valima �iged."
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1951,7 +2529,9 @@ msgid ""
 "\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."
 msgstr ""
 "LILO ja grub-i peamised suvandid on:\n"
@@ -1969,10 +2549,52 @@ msgstr ""
 "    * normal: tavaline 80x25 tekstimood\n"
 "    * <number>:  numbrile vastav tekstimood."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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."
+
+#: ../../help.pm_.c:692
+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."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -1984,7 +2606,7 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 "On aeg konfigureerida \"X Window System\" ehk lihtsalt X. X on\n"
-"Linuxi graafilise kasutajaliidese s�da. Sel eesm�rgil peame koos\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"
@@ -1993,7 +2615,7 @@ msgstr ""
 "Kui saame seadistamisega hakkama, k�ivitakse X (kui Te ei anna\n"
 "eraldi k�sku mitte nii teha)."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2001,7 +2623,7 @@ msgstr ""
 "Kui midagi on X-i seadistustega valesti, saab siinkohal v�imalikke vigu\n"
 "parandada."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2009,48 +2631,53 @@ msgstr ""
 "Kui eelistate graafilist s�steemi sisenemist, valige \"Jah\". Konsoolimoodi\n"
 "eelistamisel valige \"Ei\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"\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"
+"\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"
+"\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."
 msgstr ""
 "N��d saate valida mitmesuguseid s�steemi k�itumise v�imalusi.\n"
 "\n"
 "  - Optimiseeri k�vaketast: selle variandi puhul saate kiirendada\n"
-"  k�vaketta poole p��rdumist, kuid vale kasutamise korral v�ite k�vaketta\n"
-"  rikkuda. Valige, kui olete endas kindel\n"
+"  k�vaketta poole p��rdumist, kuid teatud vigaste emaplaatide puhul \n"
+"  v�ite k�vaketta rikkuda. Valige, kui olete endas kindel.\n"
 "\n"
 "\n"
 "  - Valige turvatase: saate valida oma s�steemi turvalisuse taseme.\n"
@@ -2061,7 +2688,7 @@ msgstr ""
 "  JUURKASUTAJA SISSE LOGIDA! Peate kasutama k�sku 'su'. Mida turvalisem, \n"
 "  seda keerulisem kasutada!\n"
 "\n"
-"  - T�psusta operatiivm�lu mahtu: v�ib esineda olukord, kus Linux ei\n"
+"  - T�psusta operatiivm�lu mahtu: v�ib esineda olukord, kus GNU/Linux ei\n"
 "  ole suuteline detekteerima t�pselt operatiivm�lu suurust. Kui see on\n"
 "  nii juhtunud, saate �elda ette tegeliku m�luhulga\n"
 "\n"
@@ -2073,7 +2700,7 @@ msgstr ""
 "  - V�imalda NumLock alglaadimisel: s�steemi laadimisel muudetakse\n"
 "  konsoolimoodis NumLock aktiivseks"
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2087,96 +2714,118 @@ msgstr ""
 "Kui soovite laadida m�nd muud operatsioonis�steemi, lugege palun\n"
 "lisainformatsiooni."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Valige sobiv keel"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Valige paigaldusmeetod"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "K�vaketta leidmine"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Hiire seadmine"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Klaviatuuri valik"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Muud s�tted"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Failis�steemid"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Vormindamine"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Pakettide valik"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "S�steemi paigaldus"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "V�rgus�tted"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Kr�pto"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Ajav��tme m��ramine"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Teenuste s�tted"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Printeri s�tted"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Juurkasutaja salas�na"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Tavakasutaja"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Loo alglaadimisflopi"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Alglaaduri s�tted"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Seadista X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Kiirpaigaldusflopi"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "V�lju programmist"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Viga faili $f lugemisel"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "Palun testige hiirt"
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Palun testige hiirt"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+"Osa teie riistvarast n�uab tarnijapoolseid juhtprogramme.\n"
+"Informatsiooni nende kohta saate: %s"
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2186,230 +2835,246 @@ msgstr ""
 "Selleks looge uus partitsioon (v�i valige �ks olemasolevatest).\n"
 "Siis valige tegevus \"�henduspunkt\" ja seadke see kui '/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Partitsioonitabel on loetamatu, liiga rikutud DrakX-i jaoks :(\n"
-"Proovin loetamatud kirjed puhastada"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "Teil peab olema saaleala"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake ei saanud partitsioonitabeli lugemisega hakkama.\n"
-"J�tkate omal vastutusel!"
+"Saaleala ei ole m��ratud\n"
+"\n"
+"J�tkate ikkagi?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Otsin juurpartitsiooni.."
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Kasuta vaba ruumi"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Informatsioon"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "Ei ole piisavalt ruumi uute partitsioonide jaoks"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: See ei ole juurpartitsioon, palun valige m�ni muu."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "Kasuta olemasolevat partitsiooni"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Juurpartitsiooni ei leitud"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "Kasutatavat partitsiooni ei leitud"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "�ldlevi kasutamine on ilma NIS domeenita v�imatu"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Kasuta Windowsi partitsiooni loopback-ina"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Viga faili $f lugemisel"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Millisele partitsioonile soovite paigaldada Lnx4Win?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Tekkis mingi viga, aga seda ei suuda programm ise klaarida.\n"
-"J�tkake omal vastutusel."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Valige suurused"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "�henduspunkt %s on m��ratud topelt"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Juurpartitsiooni suurus (MB): "
 
-#: ../../install_steps.pm_.c:323
-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 ""
-"M�ned t�htsad paketid ei saanud korralikult paika.\n"
-"Teie CD-lugeja v�i CD on ilmselt vigane.\n"
-"Paketifaile CD-l saate kontrollida k�suga \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Saaleala suurus (MB): "
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "See ongi %s"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "Kasuta vaba ruumi Windowsi partitsioonil"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Flopiseade ei ole k�ttesaadav"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Mis partitsiooni soovite muuta?"
+
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "Arvutan Windowsi failis�steemi piire"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "J�rgmine samm: '%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"FAT partitsiooni suurust ei �nnestu muuta, \n"
+"ilmnes selline viga: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "Teil peab olema saaleala"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
+"Teie Windowsi partitsioon on fragmenteerunud, palun kasutada 'defrag'-i"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"Saaleala ei ole m��ratud\n"
+"HOIATUS!\n"
 "\n"
-"J�tkate ikkagi?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Valige paigalduse maht"
+"DrakX hakkab Teie Windowsi partitsiooni suurust muutma. Olge ettevaatlik:\n"
+"see operatsioon v�ib olla ohtlik Teie failidele. Palun kasutage enne\n"
+"scandisk-i, defrag-i ja tehke tagavarakoopia.\n"
+"Kui olete oma otsuses kindel, vajutage OK."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Suurus kokku: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "Kui palju ruumi j�tate Windowsi jaoks?"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "Versioon: %s\n"
+msgid "partition %s"
+msgstr "Partitsioon %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "Suurus: %d kB\n"
+msgid "FAT resizing failed: %s"
+msgstr "Suuruse muutmine eba�nnestus: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Valige paketid paigaldamiseks"
+#: ../../install_interactive.pm_.c:144
+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_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "T�hjenda kogu ketas"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Paigaldamine"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Eemalda Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Paigaldan"
+#: ../../install_interactive.pm_.c:153
+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 paigaldate Linuxi?"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Palun oodake, "
+#: ../../install_interactive.pm_.c:156
+#, 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_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Aega j��nud "
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "Eksperdi mood"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Aega kokku "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "Kasuta diskdrake-i"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Valmistun paigaldamiseks"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "Kasuta fdisk-i"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "Paketi %s paigaldamine"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"N��d saate partitsioneerida %s k�vaketta\n"
+"Kui olete valmis, salvestage k�suga 'w'"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Ikkagi edasi?"
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Kasuta vaba ruumi Windowsi partitsioonil"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Pakettide tellimisel tekkis viga:"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Partitsioone ei saa enam lisada"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Kasutada olemasolevat X-i seadistust?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "DrakX kettajagamise abimees leidis sellised lahendused:"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Palun valige �ks j�rgnevatest paigaldusklassidest"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Ketta jagamine eba�nnestus: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Teil ei ole �htki Windowsi partitsiooni!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "K�ivitame v�rguliidesed"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Teil ei ole piisavalt ruumi Lnx4win jaoks"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Seiskame v�rguliidesed"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"HOIATUS!\n"
-"DrakX peab Teie Windowsi partitsiooni suurust muutma. Olge ettevaatlik:\n"
-"see operatsioon v�ib olla ohtlik Teie failidele. Palun kasutage enne\n"
-"scandisk-i, defrag-i ja tehke tagavarakoopia.\n"
-"Kui olete oma otsuses kindel, vajutage OK."
+"Tekkis mingi viga, aga seda ei suuda programm ise klaarida.\n"
+"J�tkake omal vastutusel."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Automaatne muutmine eba�nnestus"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "�henduspunkt %s on m��ratud topelt"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Millisele partitsioonile soovite paigaldada Lnx4Win?"
+#: ../../install_steps.pm_.c:375
+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 ""
+"M�ned t�htsad paketid ei saanud korralikult paika.\n"
+"Teie CD-lugeja v�i CD on ilmselt vigane.\n"
+"Paketifaile CD-l saate kontrollida k�suga \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Valige suurused"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "See ongi %s"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Juurpartitsiooni suurus (MB): "
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Flopiseade ei ole k�ttesaadav"
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Saaleala suurus (MB): "
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "J�rgmine samm: '%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"Teie s�steemil on ressursiprobleeme ja paigaldamine v�ib eba�nnestuda.\n"
+"Kui nii juhtub, proovige palun tekstip�hjalist paigaldust. Selleks \n"
+"vajutaga laadimisel F1 ja sisestage 'text'"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Palun valige �ks j�rgnevatest paigaldusklassidest"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2422,7 +3087,7 @@ msgstr ""
 "Madalama protsendi puhul paigaldatakse vaid k�ige t�htsamad paketid;\n"
 "100%% t�hendab k�ige valitud pakettide paigaldamist."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2436,58 +3101,98 @@ msgstr ""
 "Kui soovite sellest v�hem, valige v�iksem protsent ja paigaldamisele\n"
 "kuuluvad vaid olulisemad paketid."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 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:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Paigaldatavate pakettide protsent"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Valige paketid paigaldamiseks"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Paigaldamine"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Automaatsed s�ltuvused"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Ava puu"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Sule puu"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Sorteeritud v�i sorteerimata"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Vigane pakett"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nimi: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versioon: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Suurus: %d kB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "T�htsus: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Suurus kokku: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+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:386
+msgid "The following packages are going to be installed"
+msgstr "Paigaldamiseks on valitud j�rgmised paketid"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "Eemaldamiseks on valitud j�rgmised paketid"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Seda paketti ei saa (mitte) valida"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "See pakett on kohustuslik"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "See pakett on juba paigaldatud"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2495,44 +3200,88 @@ msgstr ""
 "Selle paketi peaks uuendame\n"
 "Olete kindel, et Te ei vali seda?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 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:493
-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:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Paigaldamiseks v�i eemaldamiseks valitud paketid"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "Seda paketti ei saa (mitte) valida"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Paigaldan"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Oletan"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Palun oodake, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Aega j��nud "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Aega kokku "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Valmistun paigaldamiseks"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d paketti"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Paketi %s paigaldamine"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "Sobib"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2546,181 +3295,385 @@ msgstr ""
 "Palun sisestage CD pealdisega \"%s\" lugejasse ja vajutage <OK>.\n"
 "Kui teil s�herdust ei ole, vajutage <Katkesta>"
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "Ei sobi"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Ikkagi edasi?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Pakettide tellimisel tekkis viga:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Pakettide paigaldamisel tekkis viga:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Tekkis mingi viga"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Palun valige kasutatav keel"
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Klaviatuur"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Palun valige klaviatuuriasetus"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr "Teisi keeli saab valida p�rast paigaldamist"
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Juurpartitsioon"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Millisel partitsioonil hoiate juurkataloogi (/)?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "K�ik"
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Paigaldusklass"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Millist paigaldusklassi Te soovite"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Paigaldus/Uuendus"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr "On see paigaldus v�i uuendus?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
+msgstr "On see paigaldus v�i taastamine?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Automaatne"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Soovituslik"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Isetehtud"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Ekspert"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "Olete ikka kindlasti ekspert? \n"
-"Hei, ilma naljata, eksperdi valikud on laiemad kuid sellev�rra ohtlikumad."
+"Hei, ilma naljata, eksperdi valikud on laiemad kuid sellev�rra ohtlikumad.\n"
+"\n"
+"Teilt k�sitakse k�simusi n�iteks 'paroolifaili varjutamise' jms kohta,\n"
+"olete Te selleks valmis?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Uuendus"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Tavakasutus"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "T��jaam"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Arendus"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Server"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
 msgstr "Milline on Teie s�steemi kasutusala?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Palun valige hiire t��p"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Hiire port"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Millisesse seerialporti on Teie hiir �hendatud?"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "PCMCIA kaartide seadmine..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "IDE seadistamine"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "ei leia partitsioone"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%d MB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Millist partitsiooni soovite kasutada juurkataloogi jaoks?"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Valige �henduspunktid"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Partitsioonitabel on loetamatu, liiga rikutud DrakX-i jaoks :(\n"
+"Proovin loetamatud kirjed puhastada kuid ANDMED NENDEL H�VIVAD.\n"
+"Teine v�imalus on keelata DrakX-il partitsioonitabeli muutmine.\n"
+"(Viga oli selline: %s)\n"
+"Kas olete n�us partitsioonide kaotamisega?\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake ei saanud partitsioonitabeli lugemisega hakkama.\n"
+"J�tkate omal vastutusel!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Juurpartitsioon"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Millisel partitsioonil hoiate juurkataloogi (/)?"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Partitsioonitabeli s�ilitamiseks vajate alglaadimist"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Valige partitsioonid, mida soovite vormindada"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Blokkide kontroll?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Vormindan partitsioone"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Loon ja vormindan faili %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Saaleala on paigaldamiseks liiga v�ike, palun lisage"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Otsin k�ttesaadavaid pakette"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Otsin uuendatavaid pakette"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr "Teie k�vakettal ei ole piisavalt vaba ruumi"
+#: ../../install_steps_interactive.pm_.c:433
+#, 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:317
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "T�ielik (%d MB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "Minimaalne (%d MB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Soovitatav (%d MB)"
+
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "Isetehtud"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "Valige paigalduse maht"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Paketigruppide valik"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Valik paketthaaval"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2730,12 +3683,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:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD pealdisega \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2743,173 +3696,11 @@ msgstr ""
 "Paketi %s paigaldamine\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Paigaldusj�rgsed s�tted"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "S�ilita olemasolevad IP s�tted"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Seadista v�rk uuesti"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Ei taha v�rku seadistada"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "V�rgu s�tted"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Kohtv�rk on seadistatud. Kas soovite:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Kas soovite kasutada kohtv�rku?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "v�rgukaarti ei leitud"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Modemi s�tted"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "Kas soovite kasutada DialUp �hendust modemi kaudu?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Seadistame v�rgukaardi %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-msgid ""
-"Please enter the IP configuration for this machine.\n"
-"Each item should be entered as an IP address in dotted-decimal\n"
-"notation (for example, 1.2.3.4)."
-msgstr ""
-"Palun andke IP parameetrid selle masina jaoks.\n"
-"K�ik read tuleb sisestada IP-aadressi kujul\n"
-"(N�iteks 12.34.56.78)"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Automaatne IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP-aadress"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "V�rgu mask:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP-aadress peab olema formaadis 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "V�rguseadistused"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Palun sisestage oma masina nimi.\n"
-"Masina nimi peab olema esitatud t�iskujul,\n"
-"nagu ``minumasin.minufirma.ee''.\n"
-"Kui Teil on vaikimisi l��s, siis sisestage ka selle IP-aadress"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "Nimeserver:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "L��sipoolne seade:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Vaikel��s:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Masinanimi:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Kas otsida modemit?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Millisesse seerialporti on Teie modem �hendatud?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "DialUp parameetrid"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "�henduse nimi"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Sissehelistamiskeskuse number"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Kasutajakonto"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Autentimisviis"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Skriptip�hine"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Terminalip�hine"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Domeeninimi"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Esimene nimeserver:"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Teine nimeserver:"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2977,88 +3768,92 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Valige peegel, millelt lugeda pakettide nimekiri"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Proovin lugeda peeglilt pakettide nimekirja"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Palun valige paketid paigaldamiseks"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
-msgstr "Millises ajav��tmes elate?"
+msgstr "Millises ajav��tmes asute?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Kas Teie arvuti sisekell on seatud GMT ajale?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "Millist printimiss�steemi soovite kasutada?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Salas�na puudub"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Kasuta varjutatud paroolifaili"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "varjutatud"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Kasuta parooli kaitsmiseks MD5 algoritmi"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Kasuta NIS-i"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "NIS YP"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, 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:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "NIS autentimine"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS domeen"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS server:"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Kasutaja �ige"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Lisa kasutaja"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(juba lisatud %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3068,60 +3863,88 @@ msgstr ""
 "Sisesta kasutaja\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "P�risnimi"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Kasutajatunnus"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "K�surida"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikoon"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Salas�na on liiga lihtne"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Palun andke kasutajatunnus"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Kasutajatunnus tohib sisaldada ainult v�ikesi t�hti, numbreid, - ja _"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "See kasutajatunnus on juba lisatud"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Isetehtud alglaadimisketas annab Teile v�imaluse laadida Linux flopilt\n"
+"s�ltumata tavaliselt alglaadijast. See v�ib abiks olla, kui Te ei soovi\n"
+"SILO-t k�vakettale kirjutada v�i m�ni muu operatsioonis�steem SILO\n"
+"�ra kustutab v�i ei �nnestu SILO-t Teie riistvara peal kasutada.\n"
+"Alglaadmisflopi on kasutatav ka h�daabikettana, kui k�vakettal oleva\n"
+"failis�steemiga peaks mingi �nnetus juhtuma. Hoidke end ja Teid hoiab\n"
+"ka Jumal!\n"
+"\n"
+"Alglaadimisketta loomiseks asetage flopi esimesse seadmesse ning vajutage\n"
+"\"Ok\"."
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Esimene flopiseade"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Teine flopiseade"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "J�ta vahele"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3142,64 +3965,32 @@ msgstr ""
 "failis�steemiga peaks mingi �nnetus juhtuma. Hoidke end ja Teid hoiab\n"
 "ka Jumal!"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Flopiseade ei ole k�ttesaadav"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 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:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Pane flopi seadmesse %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Loome alglaadimisketta"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "LILO paigaldamine eba�nnestus. Tekkis j�rgnev viga:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Soovite SILO-t kasutada?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "SILO peas�tted"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Praegu on SILO jaoks kirjeldatud alltoodud kirjed.\n"
-"Te v�ite neid lisada ning olemasolevaid muuta."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Partitsioon"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Selline t�his on juba kasutusel"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "SILO paigaldamine eba�nnestus. Tekkis j�rgnev viga:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Alglaaduri s�tted"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "Soovite aboot-i kasutada?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3207,126 +3998,120 @@ msgstr ""
 "Viga aboot-i paigaldamisel, \n"
 "kas forseerida, riskides esimese partitsiooni h�vinguga?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Vahendajate s�tted"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP vahendaja"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP vahendaja"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Vahendaja peab olema kujul http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Vahendaja peab olema kujul ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "Alglaaduri paigaldamine eba�nnestus. Tekkis j�rgnev viga:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Tere tulemast, kr�kkerid"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "V�hene"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Madal"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Keskmine"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "K�rge"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoiline"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Muud k�simused"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(v�ib tekitada andmete h�vimist)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Kas optimiseerime k�vaketast?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Valige turvatase"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Kui vaja, t�psusta RAM suurust (leitud %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "CD/flopi/.. auto�hendamine"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Puhasta /tmp igal laadimisel"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "V�imalda mitut profiili"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "L�lita Num Lock k�ivitamisel sisse"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Anna m�lu suurus megabaitides"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "K�rgel turvatasemel ei saa supermount-i kasutada"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX saab luua s�ttefailid nii XFree 3.3 kui ka XFree 4.0. \n"
-"Vaikimisi kasutatakse versiooni 3.3, sest see toetab rohkem seadmeid ja \n"
-"on stabiilsem.\n"
-"\n"
-"Kas soovite kasutada XFree versiooni 4.0?"
+"SELLEL TURVATASEMEL EI OLE V�IMALIK S�STEEMI SISENEDA JUURKASUTAJANA!\n"
+"Juurkasutaja �iguste saamiseks tuleb siseneda tavakasutajana ja siis \n"
+"kasutada \"su\"-d.\n"
+"Serveri puhul on selline piirang t�iesti m�istlik.\n"
+"Teid on igal juhul hoiatatud."
+
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"Olge ettevaatlik, NumLock-i kasutamine v�ib p�hjustada (eriti kantavatel\n"
+"arvutitel) probleeme."
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Kas otsida PCI seadmeid?"
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Kasutada olemasolevat X-i seadistust?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 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:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Pange palun t�hi flopi seadmesse %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Loon kiirpaigaldusflopi"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3336,7 +4121,7 @@ msgstr ""
 "\n"
 "Olete kindel, et v�ljute programmist?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3357,151 +4142,17 @@ msgstr ""
 "Abi s�steemi edasiseks konfigureerimiseks saab eelk�ige dokumendist\n"
 "\"Official Linux-Mandrake User's Guide\""
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Sulgemine"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Paigaldame juhtprogrammil %s kaardile %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(moodul %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Millist %s juhtprogrammi peaksime proovima?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"M�nedel juhtudel vajab %s juhtprogramm t��ks lisainformatsiooni\n"
-"kuigi tavaliselt saab ka ilma hakkama. Kas soovite eraldi parameetreid\n"
-"m��ratleda v�i lasta juhtprogrammil ise Teie arvutit kompida? V�ib juhtuda,\n"
-"et see viib arvuti segadusse kuid ei tohiks mingit j��vat kahju teha."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Proovida niisama"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "M��rake parameetrid"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "N��d v�ite moodulile %s parameetreid m��rata"
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"N��d v�ite moodulile %s parameetreid m��rata.\n"
-"Parameetrid on vormingus \"nimi=v��rtus nimi2=v��rtus2 ...\".\n"
-"N�iteks: \"io=0x300 irq=7\""
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Mooduli parameetrid:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Moodule %s laadimine ei �nnestunud.\n"
-"Kas soovite proovida parameetreid muuta?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Kas otsida PCMCIA kaarte?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "PCMCIA kaartide seadmine..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Kas otsida %s seadmeid?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Leiti %s %s liidest"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "On Teil veel kaarte?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Kas Teil on ikka m�ni %s liides?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Ei"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Jah"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Info riistvara kohta"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "K�ivitame v�rguliidesed"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Seiskame v�rguliidesed"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake paigaldamine %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr " <Tab>/<Alt-Tab> v�ljade vahel  | <Space> valib | <F12> j�rgmine samm "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"N��d saate partitsioneerida %s k�vaketta\n"
-"Kui olete valmis, salvestage k�suga 'w'"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Palun oodake"
 
@@ -3511,7 +4162,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Mitmeselt m�istetav (%s), palun t�psustage\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Halb valik, proovige palun uuesti\n"
 
@@ -3525,446 +4176,952 @@ msgstr " ? (vaikimisi %s) "
 msgid "Your choice? (default %s) "
 msgstr "Teie valik? (vaikimisi %s)"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Teie valik? (vaikimisi %s, `none' - ei midagi)"
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "T�ehhi"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Saksa"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "DVORAK"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Hispaania"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Soome"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Prantsuse"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norra"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Poola"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Vene"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Briti"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "US"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armeenia (vanem)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armeenia (tr�kimasin)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armeenia (foneetiline)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "Aserbaid�aani (ladina)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "Aserbaid�aani (kirillitsa)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belgia"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulgaaria"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasiilia (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "Valgevene"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "�veitsi (Saksa asetus)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "�veitsi (Prantsuse asetus)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Saksa (ilma sammuta)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Taani"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "DVORAK (US)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "DVORAK (Norra)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gruusia (vene)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gruusia (ladina)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Kreeka"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Ungari"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Kroaadi"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Iisraeli"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Iisraeli foneetiline"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Iraani"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islandi"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Itaalia"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "Jaapani 106 klahviga"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Ladina-Ameerika"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Hollandi"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Leedu AZERTY (vanem)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Leedu AZERTY (uuem)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Leedu numbrireaga QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Leedu foneetiline QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Poola (QWERTY)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Poola (QWERTZ)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugali"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanada (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Vene (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Rootsi"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Sloveenia"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slovaki"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Tai"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "T�rgi (\"F\" mudel)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "T�rgi (\"Q\" mudel)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukraina"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "US (rahvusvaheline)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vietnami numbrireaga QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Jugoslaavia (latin)"
 
-# 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
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Suni hiir"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "Tavahiir"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Tavaline"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "Ratas"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "seerial"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Lihtsalt 2-nupuline hiir"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Lihtsalt 3-nupuline hiir"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC seeria (seerial)"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech (seerial, vana C7 t��pi)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Hiirt ei ole"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2 nuppu"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3 nuppu"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "ei soovi"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Hiirt ei ole"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "J�rgmine ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Kas see on sobiv?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Interneti s�tted"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Kas soovite oma interneti�hendust proovida?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "V�rgus�tted"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Ei taha v�rku seadistada"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Loo interneti�hendus / Seadista kohtv�rk"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "ISDN s�tted"
+
+#: ../../netconnect.pm_.c:141
+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:158
+msgid "Connection Configuration"
+msgstr "Interneti�henduse s�tted"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "Palun t�ida allpool olev v�li"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "Kaardi IRQ"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "Kaardi m�lu (DMA)"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "Kaardi IO"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "Kaardi IO_0"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "Kaardi IO_1"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "Teie telefoninumber"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "Teenusepakkuja tunnus (n�iteks minuisp.ee)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Sissehelistamiskeskuse number"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "Teenusepakkuja DNS 1"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "Teenuspakkuja DNS 2"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "Valimisviis"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "Kasutajatunnus"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Salas�na"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Salas�na uuesti"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "Euroopa"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Euroopa (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "�lej��nud maailm"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "�lej��nud maailm - ilma D-kanalita"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "Mis protokolli soovite kasutada?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "Ei tea"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "Mis t��pi kaart Teil on?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "J�tka"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "Katkesta"
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
 "\n"
+"Kui Teil on ISA kaart, siis peaks j�rgmised v��rtused olema �iged.\n"
+"\n"
+"Kui Teil on PCMCIA kaart, peaksite Te ise teadma selle IRQ ning IO "
+"v��rtusi.\n"
+
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "Milline on Teie ISDN kaart?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "Leitud ISDN kaart:\n"
+
+#: ../../netconnect.pm_.c:287
+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 ""
-"Tere tulemast! Laadimisel aitab Teid LILO!\n"
+"Leidsin k�ll PCI ISDN kaardi, kui selle t��p on tundmatu. Palun valige �ks "
+"PCI kaart j�rgmisel sammul."
+
+#: ../../netconnect.pm_.c:299
+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:331
+#, fuzzy
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+"�htki v�rgukaarti ei ole hetkel seadistatud. Palun kasutage selleks "
+"riistvara s�tteseadjat."
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Valige v�rguliides"
+
+#: ../../netconnect.pm_.c:336
+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:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "V�rguliides"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
-"Valikud kuvab <Tab>.\n"
+"Do you agree?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Kas k�ivitan uued v�rguliidese s�tted?"
+
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "ADSL s�tted"
+
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "Kas soovite luua �henduse juba alglaadimisel?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Kas otsida modemit?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Millisesse seerialporti on Teie modem �hendatud?"
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "DialUp parameetrid"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "�henduse nimi"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "Sissehelistamiskeskuse number"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Kasutajakonto"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Autentimisviis"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Skriptip�hine"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Terminalip�hine"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Domeeninimi"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Esimene nimeserver:"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Teine nimeserver:"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
 "\n"
-"Valimiseks sisestage eelistatava nimi ja vajutage <Enter>\n"
-"vaikimisi oodake %d sekundit.\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Loo interneti�hendus / Seadista kohtv�rk"
 
-# 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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Tere tulemast! Laadimisel aitab Teid GRUB!"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "V�rgus�tted"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "Kasutage valiku tegemiseks %c ja %c klahve"
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Ei taha v�rku seadistada"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Enter laeb Teie valiku, 'e' laseb muuta"
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "suvandeid enne laadimist ja 'c' veel enam."
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Ei taha v�rku seadistada"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Valik laetakse automaatselt %d sekundi jooksul"
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Loo �hendus"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "/boot on liiga t�is"
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Katkesta �hendus"
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "T��laud"
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "V�rgus�tted"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Startmen��"
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "Interneti�henduse seadistamine"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Suni hiir"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+#, fuzzy
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr "Kas k�ivitan uued v�rguliidese s�tted?"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB hiir"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "V�rgus�tted"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB hiir (2 nuppu)"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "V�rgus�tted"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB hiir (3+ nuppu)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Sisemine ISDN kaart"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB hiir"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "V�line modem"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB hiir (2 nuppu)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "Loo interneti�hendus"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB hiir (3+ nuppu)"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "Millist ISDN �hendust kasutate?"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Lihtsalt hiir (PS/2)"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "V�rgus�tted"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (PS/2)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "Prantsusmaa"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Lihtsalt 3-nupuline hiir (PS/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "Muud maad"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "Millisel maal Te praegu olete ?"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "Alcatel modem"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "ECI modem"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "Kui teil on Alcatel-i modem, valige Alcatel. Muidu aga ECI"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "kasuta pppoe-d"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "�ra kasuta pppoe-d"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"K�ige tavalisem �hendusviis ADSL jaoks on dhcp + pppoe.\n"
+"M�nel juhul aga kasutatakse ainult dhcp-d.\n"
+"Kui Te ei tea, kasutage pppoe-d"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "V�rgus�tted"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus hiir"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"Mis DHCP klienti soovite kasutada?\n"
+"Vaikimisi on dhcpd"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus hiir"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "V�rgus�tted"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus hiir"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "Kohtv�rgu seadistamine"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB hiir"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "V�rgu s�tted"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB hiir (3 v�i enam nuppu)"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Kas soovite seadistusi proovida?"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Hiirt ei ole"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "t�hista v�rgus�tted"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A v�i k�rgem (seerial)"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Loo interneti�hendus / Seadista kohtv�rk"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC seeria (seerial)"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"Kohtv�rk on juba seadistatud.\n"
+"Kas soovite:"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (seerial)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "Kuidas soovite luua interneti�hendust?"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (seerial)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "V�rgu s�tted"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (seerial)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
+"N��d on interneti�hendus seadistatud aga Teie arvutit\n"
+"saab panna ka seda jagama teistele arvutitele kohtv�rgus.\n"
+"M�rkus: kohtv�rgu jaoks on vajalik eraldi v�rgukaardi olemasolu\n"
+"\n"
+"Kas soovite interneti�hendust jagada?\n"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (seerial)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "v�rgukaarti ei leitud"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (seerial)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "V�rguseadistused"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (seerial)"
+#: ../../network.pm_.c:274
+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''."
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech (seerial, vana C7 t��pi)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "Masinanimi"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (seerial)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+"HOIATUS: See seade on juba seadistatud Interneti jaoks.\n"
+"Valige lihtsalt OK, et s�tteid mitte muuta."
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Lihtsalt hiir (seerial)"
+#: ../../network.pm_.c:302
+msgid ""
+"Please enter the IP configuration for this machine.\n"
+"Each item should be entered as an IP address in dotted-decimal\n"
+"notation (for example, 1.2.3.4)."
+msgstr ""
+"Palun andke IP parameetrid selle masina jaoks.\n"
+"K�ik read tuleb sisestada IP-aadressi kujul\n"
+"(N�iteks 12.34.56.78)"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsofti �hilduv (seerial)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Seadistame v�rgukaardi %s"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Lihtsalt 3-nupuline hiir (seerial)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Automaatne IP"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (seerial)"
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "IP-aadress"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Kas see on sobiv?"
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "V�rgu mask"
+
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP-aadress peab olema formaadis 1.2.3.4"
+
+#: ../../network.pm_.c:341
+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 ""
+"Palun sisestage oma masina nimi.\n"
+"Masina nimi peab olema esitatud t�iskujul,\n"
+"nagu ``minumasin.minufirma.ee''.\n"
+"Kui Teil on vaikimisi l��s, siis sisestage ka selle IP-aadress"
+
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "Nimeserver"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "Vaikel��s"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "L��sipoolne seade"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "Vahendajate s�tted"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP vahendaja"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP vahendaja"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Vahendaja peab olema kujul http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Vahendaja peab olema kujul ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr "Sellel platformil ei saa laiendatud partitsiooni luua"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -3974,21 +5131,21 @@ msgstr ""
 "Ainuke lahendus on nihutada primaarset partitsiooni, et auk satuks "
 "laiendatud partitsioonide k�rvale"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Viga faili %s lugemisel"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Taastamine failist %s eba�nnestus: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "K�lbmatu tagavarakoopia"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Viga faili %s kirjutamisel"
@@ -4022,42 +5179,51 @@ msgstr "huvitav"
 msgid "maybe"
 msgstr "v�ib olla"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (t�htis)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (v�ga kena)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (kena)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "N�ita v�hem"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "N�ita rohkem"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Kohalik printer"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
 msgstr "V�rguprinter"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "CUPS printserver"
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "lpd printserver"
+
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "V�rguprinter (socket)"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "Printeri seadme URI"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Otsin printerit..."
@@ -4071,11 +5237,11 @@ msgstr "Proovin porte"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Leiti printer, nimega \"%s\" "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Otse �hendatud printer"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4083,15 +5249,15 @@ msgstr ""
 "Mis porti on Teie printer �hendatud? \n"
 "(paneme t�hele, et /dev/lp0 on sama mis LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Printeri seade"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "V�rguprinteri s�tted"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4101,19 +5267,19 @@ msgstr ""
 "printserveri nime ja printimisj�rje nime, mida soovite\n"
 "serveril kasutada."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Printserveri nimi:"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Printimisj�rje nimi"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) printeri s�tted"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4126,27 +5292,27 @@ 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:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "SMB serveri nimi"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "SMB serveri IP"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Jagatav printer"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "T��grupp"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "NetWare printeri s�tted"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4157,133 +5323,157 @@ msgstr ""
 "nime (NB! See v�ib olla erinev tema TCP/IP nimest!) samuti nagu ka\n"
 "printimisj�rje nime serveril ning kasutajatunnuse ja salas�na"
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Printserver:"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Printimisj�rje nimi:"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "Pistikprinteri s�tted"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"Sisestage palun printeri masinanimi ja v�imaluse\n"
+"korral pordi number"
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "Printeri nimi"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:155
+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:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Mis t��pi printer see on?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Kas soovite seadistusi proovida?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Tr�kitakse testlehek�lg(i)..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\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"
+"Staatus:\n"
+"%s\n"
+"\n"
+"Kas tulemust on juba n�ha?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"Testlehek�lg on saadetud tr�kideemonile.\n"
+"N��d v�ib minna natuke aega.\n"
+"Staatus:\n"
+"%s\n"
+"\n"
+"Kas tulemust on juba n�ha?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Jah, tr�ki ASCII testlehek�lg"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Jah, tr�ki PostSript testlehek�lg"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Jah, tr�ki m�lemad testlehek�ljed"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Sea printer"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Mis t��pi printer see on?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Otse �hendatud printeri s�tted"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Paberi suurus"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "T�� l�petamisel v�ljasta kogu leht?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Kas optimiseerime k�vaketast?"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Mooduli parameetrid:"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Tr�kkida tekst PostScriptina?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Viimane leht enne"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Paranda trepitud tekst?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Lehek�lgi �hel paberil"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Lehe laiuse m�rgid punktides (1/72 tollile)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Lehe k�rguse m�rgid punktides (1/72 tollile)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Lisa GhostScript parameetrid"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Lisa teksti parameetrid"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Kas soovite seadistusi proovida?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Tr�kitakse testlehek�lg(i)..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\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"
-"Staatus:\n"
-"%s\n"
-"\n"
-"Kas tulemust on juba n�ha?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"Testlehek�lg on saadetud tr�kideemonile.\n"
-"N��d v�ib minna natuke aega.\n"
-"Staatus:\n"
-"%s\n"
-"\n"
-"Kas tulemust on juba n�ha?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Printer"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Kas soovite printerit seadistada?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4291,68 +5481,116 @@ msgstr ""
 "Kirjeldatud on j�rgnevad printimisj�rjed.\n"
 "Te v�ite neid lisada ning olemasolevaid muuta."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "CUPS k�ivitatakse"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr "Loetakse CUPS juhtprogramme"
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Vali printeri �hendusviis"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Kuidas on see printer �hendatud?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "Vali v�rguprinteri �hendusviis"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+"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:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Eemalda printimisj�rg"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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?"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "Printeri nimi"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "Kirjeldus"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "Asukoht"
+
+#: ../../printerdrake.pm_.c:419
 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 printerit, millest iga�ks vajab nime\n"
+"Masinal v�ib olla mitu printimisj�rge, millest iga�ks vajab nime\n"
 "(sageli lp) ja printkataloogi. Millist nime ja kataloogi peaks\n"
-"kasutama selle printeri puhul?"
+"kasutama selle printeri puhul ja kuidas see on �hendatud?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Printeri nimi"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Printkataloog"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Printeri �hendusviis"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, 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:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Ei saa kirjutada faili $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid eba�nnestus"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid eba�nnestus (puudub 'raidtools'?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ei ole piisavalt partitsiooni RAID-%d jaoks\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
-msgstr "Anacron k�ivitab programme perioodiliselt."
+msgstr ""
+"Anacron k�ivitab programme perioodiliselt analoogiliselt cron-ile.\n"
+"Kasutage seda juhul kui Teie arvuti ei t��ta 24h."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4360,7 +5598,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:17
+#: ../../services.pm_.c:18
 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."
@@ -4368,7 +5606,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:19
+#: ../../services.pm_.c:20
 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 "
@@ -4377,9 +5615,9 @@ msgid ""
 msgstr ""
 "cron on UNIXi s�steemide standardvahend kasutaja programmide perioodiliseks\n"
 "k�ivitamiseks. Vixie cron sisaldab lisaks veel turvalisust ja kasutus-\n"
-"mugavust t�stvaid omadusi."
+"mugavust t�stvaid omadusi. Soovitav s�steemile mis t��tab 24h"
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4389,13 +5627,15 @@ msgstr ""
 "GPM annab v�imaluse kasutada hiirt ka tekstikonsoolil. Lisaks tavalisele\n"
 "l�ikamisele/kleepimisele saab kasutada ka men��s�steeme."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
-msgstr "Apache on maailma juhtiv veebiserveri programm."
+msgstr ""
+"Apache on maailma juhtiv veebiserveri programm. T�en�oliselt\n"
+"ka v�imsaim."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4407,7 +5647,7 @@ msgstr ""
 "Interneti \"superserver\", nimega inetd laseb k�ivitada mitmeid v�rgu-\n"
 "teenustel, nagu telnet, ftp, rsh, rlogin jne."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4416,13 +5656,13 @@ msgstr ""
 "See programm laeb s�steemi k�ivitumisel klaviatuuripaigutuse vastavalt\n"
 "failis /etc/sysconfig/keyboard kirjeldatule."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4430,7 +5670,7 @@ msgstr ""
 "named (BIND) on kasutusel nimeserverites, mis teenindavad DNS\n"
 "hierarhiat, t�lkimaks nimesid IP-aadressideks"
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4438,13 +5678,13 @@ msgstr ""
 "�hendab ja lahutab k�iki v�rgufailis�steeme (nii NFS, SMB\n"
 "kui ka NCP)"
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 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:42
+#: ../../services.pm_.c:43
 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"
@@ -4453,7 +5693,7 @@ msgstr ""
 "NFS on UNIXi keskkonna standardne failijaotusprotokoll. See programm t�idab\n"
 "NFS serveri funktsioone, ja konfigureeritakse failis /etc/exports."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4461,7 +5701,7 @@ msgstr ""
 "NFS on UNIXi keskkonna standardne failijaotusprotokoll. See programm t�idab\n"
 "NFS failide lukustamise funktsioone. Vajalik serveerimisel."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4471,7 +5711,7 @@ msgstr ""
 "PCMCIA tugi on tavaliselt vajalik s�learvutitele v�rgu- ja modemiliideste\n"
 "lisamiseks."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4481,7 +5721,7 @@ msgstr ""
 "portmapper haldab RPC �hendusi, mida kasutavad NFS ja NIS. Neil \n"
 "serveritel on see h�davajalik."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4489,7 +5729,7 @@ msgstr ""
 "Postfix on meili transpordiagent, see t�hendab programm, mis\n"
 "toimetab meili �hest masinast teise."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4497,7 +5737,7 @@ msgstr ""
 "Salvestab ja taastab juhuarvude genereerimiseks vajaliku s�steemse\n"
 "entroopiasalve."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4506,7 +5746,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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4514,7 +5754,7 @@ msgstr ""
 "rstat protokoll laseb �le v�rgu saada informatsiooni s�steemi\n"
 "t�� kohta. Ettevaatust!"
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4522,7 +5762,7 @@ msgstr ""
 "rusers protokoll laseb �le v�rgu saada informatsiooni s�steemi\n"
 "kasutajate kohta. Ettevaatust!"
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4530,63 +5770,226 @@ msgstr ""
 "rwho protokoll laseb �le v�rgu saada informatsiooni s�steemi\n"
 "kasutajate kohta. Ettevaatust!"
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr "See skript proovib seadistada USB hiirt"
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "Stardib X fondiserveri, selleta X ei k�ivitu."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Valige, millised teenused tuleks alglaadimisel k�ivitada"
 
-# 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
-#
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Tere tulemast! Laadimisel aitab Teid SILO!\n"
-"\n"
-"Valikud kuvab <Tab>.\n"
-"\n"
-"Valimiseks sisestage eelistatava nimi ja vajutage <Enter>\n"
-"vaikimisi oodake %d sekundit.\n"
+"Partitsioonitabel on loetamatu, liiga rikutud DrakX-i jaoks :(\n"
+"Proovin loetamatud kirjed puhastada"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "LILO/GRUB seadistamine"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Loo alglaadimisflopi"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Vorminda flopi"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Valik"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "LILO paigaldamine eba�nnestus. Tekkis j�rgnev viga:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Interneti�henduse jagamine t��tab"
+
+#: ../../standalone/drakgw_.c:104
+#, fuzzy
+msgid ""
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently enabled.\n"
+"\n"
+"What would you like to do?"
+msgstr "Interneti�henduse jagamine on juba seadistatud.\n"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Tabel"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Seadista X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Interneti�hendust ei jagata"
+
+#: ../../standalone/drakgw_.c:123
+#, fuzzy
+msgid ""
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently disabled.\n"
+"\n"
+"What would you like to do?"
+msgstr "Interneti�henduse jagamine on juba seadistatud.\n"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Tabel"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "S�tete fail ei ole interpreteteeritav."
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "Interneti�henduse jagamine"
+
+#: ../../standalone/drakgw_.c:152
+#, fuzzy
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+"N��d on interneti�hendus seadistatud aga Teie arvutit\n"
+"saab panna ka seda jagama teistele arvutitele kohtv�rgus.\n"
+"M�rkus: kohtv�rgu jaoks on vajalik eraldi v�rgukaardi olemasolu\n"
+"\n"
+"Kas soovite interneti�hendust jagada?\n"
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Valimisviis"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "Teie s�steemis ei ole v�rguliidest!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"�htki v�rgukaarti ei ole hetkel seadistatud. Palun kasutage selleks "
+"riistvara s�tteseadjat."
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"Teil on vaid �ks seadistatud v�rguliides:\n"
+"\n"
+"$interface\n"
+"\n"
+"Kas soovite siduda kohtv�rgu s�tted selle liidesega?"
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"Palun valige millist v�rguliidest soovite kasutada kohtv�rgu\n"
+"jaoks."
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"Hoiatan, v�rguliides on juba seadistatud.\n"
+"Kas soovite anda uued s�tted?"
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr "V�imalik kohtv�rgu aadressi konflikt $_ konfiguratsioonis!\n"
+
+#
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "Leitud tulem��ri s�tted!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+"Hoiatus! Leiti olemasolevad tulem��ri s�tted. T�en�oliselt peaksite need "
+"hiljem �le vaatame. Kas j�tkan?"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "H��lestan skriptid, paigaldan tarkvara, k�ivitan serverid..."
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "IDE seadistamine"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "Ei saa paigaldada 'ipchains' paketti urpmi abil."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "Ei saa paigaldada DHCP paketti urpmi abil."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "Ei saa paigaldada linuxconf-i urpmi abil."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "Ei saa paigaldada 'bind' paketti urpmi abil."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "Ei saa paigaldada nimeserveri vahendajat urpmi abil."
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "�nnitleme!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4641,23 +6044,35 @@ msgstr "Turvataseme seadmine"
 msgid "Choose the tool you want to use"
 msgstr "Valige kasutatav vahend"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Milline on Teie klaviatuuriasetus"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Muuda kuvatihedust"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Mis t��pi hiirt kasutate?"
+#: ../../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 ""
+"Vahetage CD!\n"
+"\n"
+"Palun sisestage CD pealdisega \"%s\" lugejasse ja vajutage <OK>.\n"
+"Kui teil s�herdust ei ole, vajutage <Katkesta>"
+
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "ei leitud: serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Teeskleme keskmist hiirenuppu?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Millisesse seerialporti on Teie hiir �hendatud?"
 
@@ -4871,6 +6286,942 @@ msgstr "Leian �lej��gid"
 msgid "Finding leaves takes some time"
 msgstr "�lej��kide leidmine v�tab veidi aega"
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Interneti s�tted"
+
+#, fuzzy
+msgid "Internet"
+msgstr "huvitav"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+#, fuzzy
+msgid "Office"
+msgstr "kena"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multimeedia"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multimeedia"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multimeedia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multimeedia"
+
+#, fuzzy
+msgid "Gnome"
+msgstr "ei soovi"
+
+#, fuzzy
+msgid "Documentation"
+msgstr "Autentimisviis"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multimeedia"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Valige paigalduse maht"
+
+#~ msgid "Total size: "
+#~ msgstr "Suurus kokku: "
+
+#~ msgid "Reconfigure local network"
+#~ msgstr "Seadista kohtv�rk uuesti"
+
+#~ msgid ""
+#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Teie arvutit saab seadistada interneti�henduse jagajana.\n"
+#~ "\n"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "K�ik sai seadistatud.\n"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Kasuta Interneti jaoks tavamodemit"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Kasuta Interneti jaoks ISDN modemit"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Kasuta Interneti jaoks DSL (v�i ADSL) modemit"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Kasuta Interneti jaoks DOC kaablimodemit"
+
+#~ msgid ""
+#~ "Time (secs) of inactivity after which\n"
+#~ "it hangs up. (leave blank to disable it)"
+#~ msgstr ""
+#~ "Mittekasutamise aeg, mille jooksul �hendus\n"
+#~ "katkestatakse. (vaikimisi ei katkestata)"
+
+#~ msgid "Germany"
+#~ msgstr "Saksa"
+
+#~ msgid "Germany (1TR6)"
+#~ msgstr "Saksa (1TR6)"
+
+#~ msgid "What do you wish to do?"
+#~ msgstr "Mida Te soovite teha?"
+
+#~ msgid "Install/Rescue"
+#~ msgstr "Paigalda/Taasta"
+
+#~ msgid "Rescue"
+#~ msgstr "Taasta"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Mis t��pi partitsiooni soovite?"
+
+#~ 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Valige \"Paigaldamine\" kui varem sellele masinale GNU/Linuxit ei ole "
+#~ "pandud\n"
+#~ "v�i soovite kasutada mitut distributsiooni\n"
+#~ "\n"
+#~ "Valige \"Taastamine\" kui soovite taastada m�nd eelmist Mandrake Linuxit:\n"
+#~ "%s v�i %s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Valige:\n"
+#~ "\n"
+#~ "  - Soovitatav: Te pole kunagi varem GNU/Linuxit paigaldanud. \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"
+#~ "  - 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!\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "N��d peaksite valima partitsioon(id) Linux-Mandrake paigaldamiseks\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"
+#~ "eraldatud osadeks.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui ei tunne ennast sel alal kindlalt, valige \"Paiguta ise\", et\n"
+#~ "automaatselt luua Linuxile vajalikud partitsioonid.\n"
+#~ "Linuxi maailmas t�hendab \"hda\" esimest, \"hdb\" teist IDE k�vaketast,\n"
+#~ "\"sda\" esimest. \"sdb\" teist SCSI k�vaketast jne. Partitsioneerimiseks\n"
+#~ "valige kettaseade lihtsalt sellel klikkides.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kaks tavalist partitsiooni on juurpartitsioon (/), kus asub failis�steemi\n"
+#~ "hierarhia algus ja /boot, mis sisaldab arvuti alglaadimiseks vajalikke "
+#~ "faile, sealhulgas Linuxi kernelit.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kuna partitsioneerimine ei ole p��ratav protsess, v�ib see tekitada\n"
+#~ "algajas kerget k�hedust. DiskDrake on selle teinud k�ll lihtsamaks,\n"
+#~ "aga kindlasti tuleks enne iga liigutust s�gavalt j�rele m�telda ja\n"
+#~ "soovitavalt ka dokumentatsiooniga tutvuda.\n"
+#~ "\n"
+#~ "K�iki tegevusi saate teha ka ainult klaviatuuri kasutades: liikuge\n"
+#~ "partitsioonidel <TAB> ja �les-alla noolte abil. Partitsiooni valikul\n"
+#~ "\n"
+#~ "- Ctrl-C  loob uue partitsiooni (valige selleks vaba kettaala)\n"
+#~ "- Ctrl-D  kustutab partitsiooni\n"
+#~ "\n"
+#~ "- Ctrl-M  seab �henduspunkti\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."
+#~ msgstr ""
+#~ "K�ik Teie poolt v�rskelt loodud partitsioonid tuleb kasutamiseks vormindada\n"
+#~ "(luua failis�steemid). Partitsiooni vormindamisel h�vitatakse k�ik andmed,\n"
+#~ "mis seal iganes leiduvad. Pange t�hele, et varem vormindatud ja vajalikke\n"
+#~ "andmeid sisaldavaid partitsioone, t��piliselt /home ja /usr/local, ei ole\n"
+#~ "m�istlik �le vormindada, vaid need v�ib j�tta nii nagu on."
+
+#~ 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."
+#~ msgstr ""
+#~ "N��d hakkan Teie valitud pakette paigaldama. Selleks peaks kuluma\n"
+#~ "m�nik�mmend minutit. S�steemi uuendamisel kulub aega k�ll veidi rohkem,\n"
+#~ "sest siis tuleb enne olemasolevaid pakette anal��sida."
+
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Kui DrakX ei suutnud Teie hiirt tuvastada, v�i soovite vaadata, mida\n"
+#~ "leiti, kuvatakse Teile �lalpool \"hiiret�ugude\" nimekiri.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui olete valikuga n�us, minge lihtsalt vasakpoolses men��s edasi.\n"
+#~ "Vastasel juhul valige hiire t��p, mis Teie arvates k�ige paremini Teie\n"
+#~ "hiirt iseloomustab\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui tegemist on seerialpordi hiirega, peate �tlema ka, mis porti ta on\n"
+#~ "�hendatud."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "See sektsioon on p�hendatud kohtv�rgu (LAN) v�i sissehelistamisteenuse\n"
+#~ "(DialUp) s�tete paikapanemisele.\n"
+#~ "\n"
+#~ "Kui vastate \"LAN\", siis proovitakse Teie arvutist leida v�rgukaarti.\n"
+#~ "Kui Teie v�rgukaart t��tab PCI siinil, peaks ta olema leitav ja kasutatav\n"
+#~ "automaatselt. ISA kaardi puhul, v�ib automaatne otsing alt vedada ja Te\n"
+#~ "peate juhtprogrammi ise nimekirjast valima.\n"
+#~ "\n"
+#~ "\n"
+#~ "SCSI kaartide puhul peab juhtprogramm esmalt leidma SCSI liidese, vastasel\n"
+#~ "juhul peate p��rduma kaardi m��ja poole.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui paigaldate Linux-Mandrake 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"
+#~ "v�rku, peaksite ise valima aadressid \n"
+#~ "\n"
+#~ "Kui soovite Internetti kasutada modemi ja sissehelistamisteenuse kaudu,\n"
+#~ "valige \"DialUp\" ja DrakX proovib otsida Teie arvutist modemit. Kui\n"
+#~ "modemit ei leita, peate sisestama seerialpordi, kuhu kavatsete modemi\n"
+#~ "�hendada."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "Linuxi all saate kasutada mitmesuguseid printereid. Iga�ks neist n�uab\n"
+#~ "erinevaid s�tteid t��tamiseks. Siiski tasub t�hele panna, et s�steem\n"
+#~ "kasutab nime 'lp' vaikimisi printeri jaoks; seega peab Teil �ks \n"
+#~ "selliselt t�histatud, kuigi printeri(te)le v�ib panna '|' m�rgiga "
+#~ "eraldatult\n"
+#~ "mitu nime. Kui eelistate \"t�hendusega\" nimesid, pange nimeks\n"
+#~ "n�iteks \"Minu printer|lp\" ja see saab olema Teie vaikimisi printer.\n"
+#~ "\n"
+#~ "Kui Teie printer on otse arvuti k�lge �hendatud, valige \"Kohalik "
+#~ "printer\".\n"
+#~ "Siis saate valida pordi kuhu see on �hendatud ja printerile vastava filtri.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui soovite kasutada printerit, mis on �hendatud Un*x serveriga, peate\n"
+#~ "Valima \"lpd v�rguprinter\". Niisugusel juhul ei vaja Te kasutajatunnust\n"
+#~ "ega salas�na, vaid ainult serveri nime ja printimisj�rje nime serveril.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui soovite kasutada SMB printserverit (st. printerit, mida jagab v�lja\n"
+#~ "Windows 9x/NT, peate �ra n�itama serveri SMB nime (mis ei pea olema sama\n"
+#~ "TCP/IP nimega) ja kindluse m�ttes ka IP-aadressi. Loomulikult on vaja teada\n"
+#~ "ka serveri poolt jagatava printeri nime ning kasutajatunnust, salas�na ja\n"
+#~ "t��grupi nime. Sama, v�lja arvatud t��grupp, on vaja teada ka NetWare\n"
+#~ "printserveri kasutamise korral."
+
+#~ 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."
+#~ msgstr ""
+#~ "On ��rmiselt soovitatav vastata siin \"Jah\"! N�iteks, kui paigaldate\n"
+#~ "samasse masinasse hiljem MS Windowsi, kirjutab see �le bootsektori.\n"
+#~ "Ilma alglaadimisflopita ei ole Teil siis enam v�imalik GNU/Linuxit\n"
+#~ "laadida."
+
+#~ msgid "Move your wheel!"
+#~ msgstr "Liigutage ratast!"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Muutusi ei teinudki?"
+
+#~ msgid "Cable connection"
+#~ msgstr "Kaabli�hendus"
+
+#~ msgid "Host name:"
+#~ msgstr "Masinanimi:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Mis t��pi hiirt kasutate?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "V�ljapakutavad kuvatihedused"
+
+#~ 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"
+#~ msgstr ""
+#~ "Et leida v�imalikke kuvatihedusi, testin erinevaid variante.\n"
+#~ "Ekraan Teie ees hakkab vilkuma...\n"
+#~ "Kui soovite, l�litage monitor v�lja. Kui valmis saan, kostab piiks"
+
+#~ 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?"
+#~ msgstr ""
+#~ "Me v�ime proovida leida kuvatihedust, n�iteks 800x600.\n"
+#~ "Siiski, vahel ajab see arvuti segadusse.\n"
+#~ "Soovite proovida?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Sobivat olekut ei leitud\n"
+#~ "Proovige palun muud graafikakaarti v�i monitori"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Automaatne kuvatiheduste otsing"
+
+#~ msgid "dhcpd"
+#~ msgstr "dhcpd"
+
+#~ msgid "pump"
+#~ msgstr "pump"
+
+#~ msgid "dhcpxd"
+#~ msgstr "dhcpxd"
+
+#~ msgid "dhcp-client"
+#~ msgstr "dhcp-client"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB hiir"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB hiir (2 nuppu)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB hiir (3+ nuppu)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB hiir"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB hiir (2 nuppu)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB hiir (3+ nuppu)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Lihtsalt hiir"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus hiir"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Bus hiir"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech Bus hiir"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB hiir"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB hiir (3 v�i enam nuppu)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A v�i k�rgem (seerial)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (seerial)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (seerial)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (seerial)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Lihtsalt hiir (seerial)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsofti �hilduv (seerial)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Lihtsalt 3-nupuline hiir (seerial)"
+
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse (seerial)"
+
+#~ msgid ""
+#~ "I need to configure your network adapter to be able to connect to internet."
+#~ msgstr "Interneti�henduse jaoks on vaja seadistada v�rguliides."
+
+#~ msgid ""
+#~ "Please choose which network adapter do you want to use to connect to "
+#~ "internet.\n"
+#~ "If you don't know, choose eth0.\n"
+#~ msgstr ""
+#~ "Palun valige millist v�rguliidest soovite kasutada kohtv�rgu\n"
+#~ "jaoks.\n"
+#~ "Kui Te ei tea, valige eth0.\n"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "NFS �hendamine eba�nnestus"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Socket"
+#~ msgstr "Pistik"
+
+#~ 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?"
+#~ msgstr ""
+#~ "DrakX saab luua s�ttefailid nii XFree 3.3 kui ka XFree 4.0. \n"
+#~ "Vaikimisi kasutatakse 4.0, kui see toetab Teie riistvara\n"
+#~ "\n"
+#~ "Kas soovite j��da XFree versiooni 3.3 juurde?"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Kr�pto"
+
+#~ msgid "Configure LAN"
+#~ msgstr "Seadista X"
+
+#~ msgid "End configuration"
+#~ msgstr "ISDN s�tted"
+
+#~ msgid "Do not set up networking"
+#~ msgstr "Ei seadista v�rku"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "Kas soovite kasutada kohtv�rku?"
+
+#~ msgid "Show less"
+#~ msgstr "N�ita v�hem"
+
+#~ msgid "Show more"
+#~ msgstr "N�ita rohkem"
+
+#~ msgid "Take over the hard drive"
+#~ msgstr "Kasuta kogu ketast"
+
+#~ msgid "URI for Local printer"
+#~ msgstr "Kohalik printer"
+
+#~ msgid "URI for Network printer"
+#~ msgstr "V�rguliides"
+
+#~ msgid "Local Printer Device (URI)"
+#~ msgstr "Otse �hendatud printer"
+
+#~ msgid ""
+#~ "What URI device is your printer connected to\n"
+#~ "(note that parallel:/dev/lp0 is equivalent to LPT1:)?"
+#~ msgstr ""
+#~ "Mis porti on Teie printer �hendatud? \n"
+#~ "(paneme t�hele, et /dev/lp0 on sama mis LPT1:)?\n"
+
+#~ msgid "curly"
+#~ msgstr "lokiline"
+
+#~ msgid "default"
+#~ msgstr "tavaline"
+
+#~ msgid "tie"
+#~ msgstr "pintsaklips"
+
+#~ msgid "brunette"
+#~ msgstr "br�nett"
+
+#~ msgid "girl"
+#~ msgstr "neiu"
+
+#~ msgid "woman-blond"
+#~ msgstr "blondiin"
+
+#~ msgid "automagic"
+#~ msgstr "automaagiline"
+
+#~ msgid "Have you been provided with a hostname?"
+#~ msgstr "Anti Teile masinanimi"
+
+#~ msgid "Local Area Network specification"
+#~ msgstr "Kohtv�rgu seaded"
+
+#~ msgid "You may now decide which class C network to use.\n"
+#~ msgstr "Millist C-klassi v�rku soovite kasutada.\n"
+
+#~ msgid "Network:"
+#~ msgstr "V�rgu mask:"
+
+#~ msgid "Internet Connection Sharing - setup of $device"
+#~ msgstr "Interneti�henduse jagamine - liides $device"
+
+#~ msgid ""
+#~ "The following interface is about to be configured:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Seatakse s�tted j�rgmisele v�rguliidesele:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+
+#
+#~ msgid "Everything configured!"
+#~ msgstr "K�ik seadistatud!"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Milline on Teie klaviatuuriasetus"
+
+#~ msgid "Normal"
+#~ msgstr "Tavakasutus"
+
+#~ msgid "Configure my card"
+#~ msgstr "Seadista minu kaart"
+
+#~ msgid ""
+#~ "\n"
+#~ "I recommend that you abort, and then launch this internet wizard after "
+#~ "installation.It will then be able to setup ISA or PCMCIA cards easier.\n"
+#~ "\n"
+#~ "But, if you know the irq, dma, io of your card, you can still configure your "
+#~ "card."
+#~ msgstr ""
+#~ "\n"
+#~ "Soovitan teil praegu katkestada ja k�ivitada v�rgu�henduse abimees p�rast "
+#~ "paigaldamist uuesti. Siis on v�imalik Teie ISA v�i PCMCIA kaarte lihtsam\n"
+#~ "seadistada\n"
+#~ "Muidugi, kui teil on teada oma kaardi IRQ, DMA ja IO, ei ole probleemi."
+
+#~ msgid "pptp alcatel"
+#~ msgstr "Paiguta ise"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Kas otsida PCMCIA kaarte?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "Kas otsida %s seadmeid?"
+
+#~ msgid "Small(%dMB)"
+#~ msgstr "V�ike (%d MB)"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "Modemi s�tted"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "Kas soovite kasutada DialUp �hendust modemi kaudu?"
+
+#~ msgid "Do you want to configure a ISDN connection for your system?"
+#~ msgstr "Kas soovite kasutada ISDN �hendust?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "Kas otsida PCI seadmeid?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "Otsin juurpartitsiooni.."
+
+#~ 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 "Can't use broadcast with no NIS domain"
+#~ msgstr "�ldlevi kasutamine on ilma NIS domeenita v�imatu"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "Millist partitsiooni soovite kasutada juurkataloogi jaoks?"
+
+#~ msgid "Autologin at startup"
+#~ msgstr "X stardib n��d"
+
+#~ msgid "Autologin - Choose default user"
+#~ msgstr "Valige uus suurus"
+
+#~ msgid "You don't have any windows partitions!"
+#~ msgstr "Teil ei ole �htki Windowsi partitsiooni!"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "Teil ei ole piisavalt ruumi Lnx4win jaoks"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "Automaatne"
+
+# 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 ""
+#~ "Tere tulemast! Laadimisel aitab Teid LILO!\n"
+#~ "\n"
+#~ "Valikud kuvab <Tab>.\n"
+#~ "\n"
+#~ "Valimiseks sisestage eelistatava nimi ja vajutage <Enter>\n"
+#~ "vaikimisi oodake %d sekundit.\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
+#
+#~ 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 ""
+#~ "Tere tulemast! Laadimisel aitab Teid SILO!\n"
+#~ "\n"
+#~ "Valikud kuvab <Tab>.\n"
+#~ "\n"
+#~ "Valimiseks sisestage eelistatava nimi ja vajutage <Enter>\n"
+#~ "vaikimisi oodake %d sekundit.\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "SILO peas�tted"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "Praegu on SILO jaoks kirjeldatud alltoodud kirjed.\n"
+#~ "Te v�ite neid lisada ning olemasolevaid muuta."
+
+#~ msgid "This label is already in use"
+#~ msgstr "Selline t�his on juba kasutusel"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "SILO paigaldamine eba�nnestus. Tekkis j�rgnev viga:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX proovib esmalt leida Teie s�steemist SCSI liideseid PCI siinil.\n"
+#~ "Kui neid leitakse, ja vastav juhtprogramm on teada, siis laetakse\n"
+#~ "see m�llu automaatselt.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui Teie SCSI liides kasutab ISA siini v�i kui DrakX ei tea,\n"
+#~ "millist juhtprogrammi kasutada v�i Teil ei ole �ldse SCSI liidest,\n"
+#~ "siis k�sitakse Teilt selle kohta.\n"
+#~ "Kui Teil SCSI liidest t�esti ei ole, vastake \"Ei\". Kui Teil aga siiski\n"
+#~ "on, siis vastake \"Jah\". Seej�rel lastakse Teil nimekirjast sobiv\n"
+#~ "juhtprogramm valida.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui olete juhtprogrammi v�lja valinud, on Teil v�imalus anda sellele\n"
+#~ "ka parameetreid. Siiski, enamasti l�heb k�ik kenasti ka ilma neid\n"
+#~ "sisestamata: vastavad andmed leiab juhtprogramm ise.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui automaatne parameetrite otsimine ei t��ta, p��rduge palun\n"
+#~ "oma SCSI liidese dokumentatsiooni poole. Ka samas masinas olev Windows\n"
+#~ "oskab vahel SCSI kohta vajalikku informatsiooni anda."
+
+#~ msgid "Shutting down"
+#~ msgstr "Sulgemine"
+
 #~ msgid "useless"
 #~ msgstr "kasutu"
 
@@ -4884,9 +7235,6 @@ msgstr "�lej��kide leidmine v�tab veidi aega"
 #~ "Teie arvutist m�ned hulk Windowsi TrueType fondid.\n"
 #~ "Soovite Te neid ka Linuxis kasutada (eeldusel, et Teil on need legaalsed)?"
 
-#~ msgid "Recommended"
-#~ msgstr "Soovituslik"
-
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
@@ -4999,21 +7347,12 @@ msgstr "�lej��kide leidmine v�tab veidi aega"
 #~ msgid "Setup SCSI"
 #~ msgstr "SCSI seadistamine"
 
-#~ msgid "Which language do you want?"
-#~ msgstr "Mis keelt soovite kasutada?"
-
 #~ msgid "Which packages do you want to install"
 #~ msgstr "Valige paketid mida soovite paigaldada"
 
 #~ msgid "Local LAN"
 #~ msgstr "LAN"
 
-#~ msgid "Dialup with modem"
-#~ msgstr "DialUp"
-
-#~ msgid "Local Printer Options"
-#~ msgstr "Otse �hendatud printeri s�tted"
-
 #~ msgid "server"
 #~ msgstr "server"
 
diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po
index b8dd733a8..c82ace77a 100644
--- a/perl-install/share/po/eu.po
+++ b/perl-install/share/po/eu.po
@@ -1,56 +1,112 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Copyright (c) 1999 MandrakeSoft
-# Joseba Bidaurrazaga van Dierdonck <2258-2@ej-gv.es>, 1999-2000.
+# Joseba Bidaurrazaga van Dierdonck <jepibi-san@ej-gv.es>, 1999-2000.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 1999-12-20 11:28+0100\n"
-"Last-Translator: Joseba Bidaurrazaga van Dierdonck <gcpbivaj@lg.ehu.es>\n"
+"Last-Translator: Joseba Bidaurrazaga van Dierdonck <jepibi-san@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:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "Generikoa"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Grafikoen txartela"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Hautatu grafikoen txartela"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Hautatu X zerbitzaria"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X zerbitzaria"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "XFree-ren zein konfigurazio izan nahi duzu?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"Zure txartelak 3D azelerazioa izan lezake, baina soilik XFree %s-z.\n"
+"XFree %s-ek zure txartela onar lezake, honek dena den, 2D-tan hobeto lan "
+"egin lezake."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, 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:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s hardwarearen 3D azelerazioaz"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"Zure txartelak harware bidezko 3D azelerazioa onar lezake baina soilik XFree "
+"%s-z.KASU: EXPERIMENTAZIOAN DAGOEN ONARPENA DA ETA KONPUTAGAILUA IZOZTU "
+"LEZAKE.\n"
+"XFree %s-ek zure txartela onar lezake, honek dena den, 2D-tan hobeto lan "
+"egin lezake."
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"Zure txartelak 3D azelerazioa izan lezake XFree %s-z.\n"
+"KASU: EXPERIMENTAZIOAN DAGOEN ONARPENA DA ETA KONPUTAGAILUA IZOZTU LEZAKE."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s harware bidezko 3D azelerazioaz; EXPERIMENTALA"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "XFree-ren konfigurazioa"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Hatatu zure grafikoen txartelerako memoriaren tamaina"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Hautatu zerbitzariarentzako aukerak"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Hautatu monitorea"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitorea"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -73,39 +129,39 @@ msgstr ""
 "OSO GARRANTZITSUA da: monitorea kaltetudezakezu.\n"
 " Dudatan bazaude izan kontserbakorra."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Freskatze horizontalaren maiztasuna"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Freskatze bertikalaren maiztasuna"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Monitorea konfiguratu gabe"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Grafikoen txartela konfiguratu gabe oraindik"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Oraindik erresoluzioak hautatu gabe"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Konfigurazioa frogatu nahi duzu?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr ""
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr "Kasu: txartel grafiko honen saiakerak konputagailua izoztu lezake"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Frogatu konfigurazioa"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -113,185 +169,172 @@ msgstr ""
 "\n"
 "saia zaitez beste parametruez"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Errorea gertatu da:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d segundu barru irtengo naiz"
 
-#: ../../Xconfigurator.pm_.c:378
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
-msgstr "Zuzena da?"
+msgstr "Zuzenak dira hautuak?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Errorea gertatu da, saia zaitez zenbait parametro aldatuz"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Erresoluzio automatikoak"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Eskuragarri dauden erresoluzioak bilatzearren, zenbaitzuk frogatuko ditut.\n"
-"Pantailak kliskatuko du...\n"
-"Irten zaitezke nahi baduzu, bukatzerakoan beep-a entzengo duzu"
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Erresoluzioa"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Hautatu erresoluzioa eta kolore sakontasuna"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafikoen txartela: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 zerbitzaria: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Erakutsi dena"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Erresoluzioak"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Eskuragarri dauden erresoluzioak aurkitzen saia naiteke (eg: 800x600).\n"
-"Batzutan honen ondorioz makina eskegi daiteke.\n"
-"Saiatuko naiz??"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Modu egokirik ezin aurkitu\n"
-"Bestelako txartel edo monitoreaz saia zaitez"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Teklatuaren itxura: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Sagu mota: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Saguaren tresna (device): %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitorea: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitorearen HorizSync: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitorearen VertRefresh: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafikoen txartela: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Memoria grafikoa: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "Kolore sakontasuna: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Erresoluzioa: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 zerbitzaria: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 gidaria: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "X-Windows-en konfigurazioa prestatzen"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Aldatu monitorea"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Aldatu grafikoen txartela"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Aldatu zerbitzariaren aukerak"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Aldatu erresoluzioa"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Bilatu erresoluzio automatikoak"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Erakutsi informazioa"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Saia zaitez berriro"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Irten"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Zer egin nahi duzu?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Aldaketak ahaztu?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"Aldaketak mantendu?\n"
+"Oraingo konfigurazioa:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Mesedez, log egin berriro %s-n aldaketak indarrean sartzeko"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Mesedez log out egin eta gero Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X abiatzerakoan"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -299,403 +342,579 @@ msgstr ""
 "Zure konputagailua abiatzerakoan X-en sartzeko egokitu dezaket.\n"
 "X-en sartu nahi al duzu abiatzerakoan?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Autologin"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"Zure konputagailua abiatzerakoan erabiltzailea log on egiteko egokitu "
+"dezaket.\n"
+"Ez baduzu aukera hau erabili, etsi botoia klikatu"
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Hautatu jatorrizko erabiltzailea:"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "Hauta abiarazterakoan nahi duzun lehio kudeatzailea:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 kolore (8 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 milaka kolore (15 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 milaka kolore (16 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 miloi kolore (24 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 biloi kolore (32 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 Mb"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 Mb"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 Mb"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB edo gehiago"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA standarra, 640x480 60 Hz-tan"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 56 Hz-tan"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 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:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Frekuentzia handiko SVGA, 1024x768 70 Hz-tan"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "1280x1024 60 Hz-tan egin lezakeen frekuentzia anitzekoa"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "1280x1024 74 Hz-tan egin lezakeen frekuentzia anitzekoa"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "1280x1024 76 Hz-tan egin lezakeen frekuentzia anitzekoa"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "1600x1200 70 Hz-tan egin lezakeen pantaila"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "1600x1200 76 Hz-tan egin lezakeen pantaila"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "kizkurra"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "Jatorrizkoa"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "gorbata"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "brunette"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "neska"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "ile-horia"
-
-#: ../../any.pm_.c:19
-#, fuzzy
-msgid "automagic"
-msgstr "IP automatikoa"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Boot partizioaren lehenengo sektorea"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Diskoaren lehenengo sektorea (MBR)"
 
-#: ../../any.pm_.c:65
-#, fuzzy
-msgid "LILO/grub Installation"
-msgstr "LILOren instalazioa"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "SILOren instalazioa"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Non instalatu nahi duzu abiarazlea?"
 
-#: ../../any.pm_.c:73
-#, fuzzy
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub Instalazioa"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
-msgstr "Eginda"
+msgstr "Batez"
 
-#: ../../any.pm_.c:73
-#, fuzzy
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
-msgstr "Zelako sarrera mota gehitu nahi duzu"
+msgstr "Zein abiarazle erabili nahi duzu?"
+
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Abiarazlearen instalazioa"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Abiarzsteko unitatea"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
-msgstr ""
+msgstr "LBA (ez dabil BIOS zaharretan"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Trinkoa"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "trinkoa"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Imagina arrunta abiarazteko itxaron denbora"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Bideo modua"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Imagina arrunta abiarazteko itxaron denbora"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Pasahitza"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Pasahitza (berriz)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Komando lerroaren aukerak murriztu"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "murriztu"
 
-#: ../../any.pm_.c:98
-#, fuzzy
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
-msgstr "LILOren aukera nagusiak"
+msgstr "Abiarazlearen aukera nagusiak"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Mesedez saia zaitez berriro"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Pasahitza ez dator bat"
 
-#: ../../any.pm_.c:112
-#, fuzzy
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
 msgstr ""
-"Hemen daude LILOko hurrengo sarrerak.\n"
-"Zenbait gehitu edo daudenak aldatu dezakezu."
+"Hemen daude sarrera desberdinak.\n"
+"Zenbait gehitu edo daudenak aldatu ditzakezu."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Gehitu"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Eginda"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Zelako sarrera mota gehitu nahi duzu"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Beste OS (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Beste OS (windows..."
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Zelako sarrera mota gehitu nahi duzu"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Imagina"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Jarraitu (Append)"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Irakur-idatz"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Taula"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Unsafe"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Etiketa"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Jatorrizkoa"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ados"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Ezabatu sarrera"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Etiketa kentzea ez dau onartzen"
 
-#: ../../any.pm_.c:167
-#, fuzzy
+#: ../../any.pm_.c:224
 msgid "This label is already used"
-msgstr "Etiketa hau dagoeneko erabiltzen da"
+msgstr "Etiketa hau dagoeneko erabilia"
+
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "%s %s inteface-ak aurkituta"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Besterik daukazu?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "%s interface-rik duzu?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Ez"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Bai"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "%s-ko %s txartelen driver-ak instalatzen"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(%s modulua)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Zein %s driver-an saia naiteke?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"Zenbaitetan, %s driver-ak egokiro lan egiteko informazio gehigarria behar "
+"du\n"
+",naiz eta gehienetan ondo ibili hau gabe. Aukera extra hauek espezifikatuko "
+"zenuke\n"
+"edo utziko zenuke driver-ari lortzen saiatzen? Batzutan saiaketak "
+"konputagailua\n"
+"eskegi lezake, honek ez du kalterik eragin beharrik."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Autofroga"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Aukerak espezifikatu"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Orain %s moduluari bere aukerak ezarri diezaiokezu."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"%s moduluari bere aukerak ezardiezaiokezu.\n"
+"Aukeren formatua: ``izena=balioa izena2=balioa2 ...''.\n"
+"Adibidez, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Muduluaren aukerak:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"%s moduluare kargak porrot egin du.\n"
+"Beste parametro batuzuez saiatu nahi al duzu?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Ongi etorria %sra, sistema eragilearen hautatzailera!\n"
+"\n"
+"Aukeren zerrenda ikusteko <TAB> sakatu.\n"
+"\n"
+"Kargatzeko, izena idatzi eta <ENTER> sakatu <ENTER> edo itxaron %d segundu "
+"jatorriz hautatutakoa abiatzeko.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Ongi etorri GRUBera, sistema eragilearen hautatzailea!"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "%c eta %c tekla erabili hautatutakoa aukeratzeko"
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Hautatutako OSa abiarazteko enter sakatu, 'e' editatzeko"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "abiatze aurretiko komandoak, edo 'c' komando-lerroa izateko"
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "Hautatutakoa abiaraziko da %d segundu barru."
+
+#: ../../bootloader.pm_.c:604
+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
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Idazmahaia"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Abiatze Menua"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d segundu"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Eratu"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Desmuntatu"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Formatua"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Berregokitu"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Mota"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Muntatze puntua"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Idatzi /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Zoaz aditu modura"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Zoaz ohiko modura"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Fitxategitik berreskuratu"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Fitxategian gorde"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Floppy-tik berreskuratu"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Floppy-an gorde"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Garbitu dena"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Dena formateatu"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Berez egokitu"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Partizio primario guztiak erabiltzen"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Ezin dut partizio gehiagorik gehitu"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -703,59 +922,63 @@ msgstr ""
 "Partizio gehiago edukitzeko, mesedez ezabatu bat hedatutako partizioa eratu "
 "ahalizateko"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Partizio taula berreskuratu"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Ez egin"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Partizio taula idatzi"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Berkargatu"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Hutsik"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
-msgstr ""
+msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Bestelakoa"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Hutsik"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Bestelakoa"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Fitxategi-sistemen motak:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Ezaugarriak"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -767,17 +990,17 @@ msgstr ""
 "Beharrezko zenuke partizio hau egokitzea\n"
 "(gainean klikatu, eta gero \"Egokitu\"-n)"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Mesedez, aurretik datuen backup-a egin"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Arretaz irakur"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -786,77 +1009,77 @@ msgstr ""
 "aboot erabiliko baduza, tokia utzi (diskoaren hasierako 2048 sektore\n"
 "nahikoak dira)"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Kontuz: arrizkutsua izan daiteke."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Errorea"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Muntatze puntua: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Device-a: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS unitatearen hizkia: %s (iragarpena basterik)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Mota: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Hasi: %s sektorea\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Tamaina: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektore"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "%d zilindrotik %d zilindrora arte\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Formateatuta\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Formateatu gabe\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Muntatua\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Loopback fitxategia(k): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -864,79 +1087,79 @@ msgstr ""
 "Jatorrizko partizioa abiaraztua\n"
 "    (MS-DOS abiarazteko, ez lilo-rako)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Maila %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Xerraren tamaina %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-diska %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Loopback fitxategiaren izena: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Partizio baten gainean klikatu"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Tamaina: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometria: %s zilindro, %s buru, %s sektore\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Partizio taularen mota: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "on bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Muntatu"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Aktibatu"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Gehitu RAIDi"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "RAIDtik ken"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Aldatu RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Loopback erabili"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Hautatu akzioa"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -948,7 +1171,7 @@ msgstr ""
 "LILO erabiliz gero ez du funtzionatuko, edo LILO erabili ezean ez duzu "
 "/boot-en beharrik"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -960,64 +1183,68 @@ msgstr ""
 "eta ez duzu /boot partiziorik.\n"
 "LILO abiarazle modura erabiliko baduzu, /boot partizioa gehitu"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
+"RAID partizioa zuztar(root) bezala hautatu duzu (/).\n"
+"Abiarazleak ezin du hau kudeatu /boot partiziorik gabe.\n"
+"Beraz habil kontuz eta gehitu /boot partizioa"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Bestela ``%s'' erabili"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Lehenengo ``Unmount'' erabili"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, 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:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Jarraitu dena den?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Irten gorde gabe"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Irten partizio taula idatzi gabe?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Aldatu partizio mota"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Zein partizio mota nahi duzu?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "Zein erabilera nahi duzu?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr ""
+msgstr "Ez erabili ReiserFS 32MB baino gutxiagoko partizioak eratzeko"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "%s loopback fitxategia non eraiki nahi duzu?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "%s tresna non instalatu nahi duzu?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1025,140 +1252,145 @@ msgstr ""
 "Ezin kendu muntai puntua hemendik, loop back-ek erabiltzen du.\n"
 "Aurretik loopback kendu"
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, 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:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Formateatzen"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "%s loopback fitxategia formateatzen"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "%s partizioa formateatzen"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Partizio guztiak formateatu ondoren,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "partizio hoietako datu guztiak galduko dira"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Mugitu"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Zein diskotara mugitu nahi duzu?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sektore"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Zein sektore mugitu nahi duzu?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Mugituz"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Partizioa mugitzen..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "%s unitatearen partizio taula diskoan idatziko da!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Aldaketak indarrean jar daitezen breabiatu behar duzu ordenadorea"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "fat-aren fitxategi-sistemen loturak zenbatzen"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Egokitzen"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Zein partizio berregokitu nahi duzu?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "Partizio honetako datu guztien backup-a beharrezkoa litzateke"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, 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.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Hautatu tamaina berria"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Eratu partizio berriak"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Haste sektorea: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Tamaina MBetan: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Fitxategi-sistema mota: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Hobespena: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Partizio hau ezin du loopback-ek erabili"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Loopback-en fitxategi izena: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
-msgstr ""
+msgstr "Beste loopback batek erabilitako fitxategia, hauta besteren bat"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "%s fitxategia esistitzen da. Erabili?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Hautatu fitxategia"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1166,11 +1398,11 @@ msgstr ""
 "Backup-aren partizio taulak ez du neurri berdina\n"
 "Jarraituko dut?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1178,77 +1410,79 @@ msgstr ""
 "Disketea sartu unitatean\n"
 "Disketeko datu guztiak galduko dira"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Partizio taula berreskuratzeko saioan"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "tresna (device)"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "maila"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "xerraren tamaina"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Hautatu esistitzen den RAIDa hona gehitzeko"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "berria"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s-ren %s formateatzeak porrot egin du"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, 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:186
-msgid "nfs mount failed"
-msgstr "nfs-aren muntaiak porrot egin du"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "muntaketak porrot egin du: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "%s desmuntatzen errorea: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Muntaia puntuak /-z hasi behar dira"
 
-#: ../../fsedit.pm_.c:253
-#, fuzzy, c-format
+#: ../../fsedit.pm_.c:238
+#, c-format
 msgid "There is already a partition with mount point %s\n"
-msgstr "%s muntaketa puntua duen partizioa jadanik esistitzen da %s\n"
+msgstr "Jadanik esistitzen da %s muntaketa puntua duen partizioa\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Muntai zirkularrak %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 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:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "%s irekitzerakoan errorea: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1256,76 +1490,83 @@ msgstr ""
 "Errorea gertatu da - sistemaren fitxategiak eraikitzeko unitate "
 "baliogarririkez da aurkitu. Hardwarea aztertu mesedez."
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Partiziorik ez duzu!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr ""
 "Hautatu hobestutako hizkuntza instalaziorako eta sistemaren erabilerako"
 
-#: ../../help.pm_.c:10
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Hautatu zureari dagokion teklatuaren itxura goiko listan"
-
-#: ../../help.pm_.c:13
-#, fuzzy
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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
+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"
-"  - 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"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\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"
-msgstr ""
-"Hautatu \"Instalatu\" Linux-en aurretiko bertsiorik ez badago instalatuta,\n"
-"edo distribuzio edo bertsio bat baino gehiago erabili nahi baduzu.\n"
 "\n"
-"Hautatu \"Eguneratu\" Mandrake-ren aurretiko bertsioren bat eguneratu nahi "
-"izanez gero.\n"
-"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000 edo 7.0 (Air).\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* Recommanded: 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"
-"Select:\n"
 "\n"
-"  - Gomendatua: inoiz ez baduzu Linux-ik instalatu.\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - Norberarena: Linux ezagutzen baduzu, normal, garatzaile edo aditu\n"
-"moduko instalazioak hauta dezakezu. Hautatu \"Arrunta\" ohiko instalazioa\n"
-"egitekotan. Hauta dezakezu \"Garatzailearena\" modua konputagailua "
-"softwarea\n"
-"garatzeko erabiliko baduzu batez ere, edo hautatu \"Zerbitzariarena\" ohiko\n"
-"zerbitzari (posta, inprimaketa,...) instalazioa egin nahi baduzu.\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"
+"\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
+#, fuzzy
 msgid ""
 "Select:\n"
 "\n"
@@ -1333,12 +1574,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Select:\n"
 "\n"
@@ -1354,341 +1596,604 @@ msgstr ""
 "egin nahi baduzu,instalazio modu hau zuretzako da. Zure sistemaren\n"
 "erabilera honela egin beharko duzu \"Norberarena\".\n"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
+"Makinaren erabilera desberdinak (zerorrek hautatutakoak, hau da\n"
+"\"Norberarena\" edo \"Aditua\" instalazio motetan) hurrengoak \n"
+"dira:\n"
+"\n"
+"  - Arrunta: egunerako erabilerarako\n"
+"    (ofizina lana, irudiketa, eta abar). Ez\n"
+"    duzu konpilaziorik edo garatzale lanerako tresnarik edukiko.\n"
+"\n"
+"  - Garatzaile: izenak diona. sofwarearen garapenerako\n"
+"    erabiliko baduzu makina. Orduan software\n"
+"    bilduma osoa izango duzu konpilatu, debug eta jatorrizko\n"
+"    kodearen formateaoa, edo software paketeak eratzeko.\n"
+"\n"
+"  - Zerbitzari: hauta hau zure Linux-Mandrake\n"
+"    instalazioa zerbitzari modura erabiltzeko. Hau da fitxategi zerbitzari "
+"(NFS edo SMB),\n"
+"    irarkola zerbitzari (Unix' lp (Line Printer) protokoloa edo Windows "
+"motako SMB\n"
+"    ipresioa), egiaztatze zerbitzari (NIS), datubase zerbitzari eta abar. "
+"Hemen\n"
+"    , ez duzu gimmicks-k izango (KDE, GNOME...).\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
+#, fuzzy
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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-ek PCI edo SCSI egokitzaileak bilatzen saiatuko da aldez aurretik.\n"
-"Aurkitzekotan eta drivera(k) ezagutz geronautomatikoki ezarriko ditu.\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"
+"Ez baduzu DrakX-ek ezagutzen duen SCSI egokitzaile, 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"
+"\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"
+"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: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"
+"\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"
-"Zure SCSI egokitzailea ISA bada, edo DrakX-ek ezagutzen ez duen\n"
-"PCIa bada, edo SCSI egokitzailerik ez baduzu, orduan zera galdetuko zaizu;\n"
-"ia SCSI egokitzailerik duzun ala ez.\n"
-"Ez badaukazu \"Ez\" erantzun. Bat edo gehiago baduzu,\n"
-"erantzun \"Bai\". driver zerrenda agertuko zaizu, eta bertatik bat hautatu\n"
-"beharko duzu.\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"
-"Driver-a hautatu ondoren, DrakX-ek aukerak eman nahi badiozu\n"
-"galdetuko dizu. Lehenengo, utzi driver-ari harwarea frogatzen:\n"
-"gehienetan ongi dabil.\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"
-"Ez badabil, zure Windows-aren (hau bada zure sistema) harwarearen "
-"informazioa\n"
-"dokumentaziotik lor dezakezu, instalazio gidan iradokitzen denez.\n"
-"Hor izango dira driver-ari eman beharreko\n"
-"aukerak."
+"\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 ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:160
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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"
 "\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"
-"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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\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"
 msgstr ""
-"Orain, Linux-Mandrake sistema zein partiziotan instalatu nahi duzun\n"
-"hauta dezakezu, aldez aurretik partizioak eginak badituzu (aurretikfrom a\n"
-"instalatutako Linux-an edo bestelako partizio tresna batek egindakoak).\n"
-"Bestera, disko zurrunaren partizioak definitu behar dira. Hau egoterakoan\n"
-"konputagailuaren disko zurruna erabilera desberdinetarako area "
-"desberdinetan\n"
-"zatitzen da.\n"
+
+#: ../../help.pm_.c:218
+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"
-"Partizio berriak egin nahi izanez gero, erabili \"Auto allocate\" "
-"etahorrela\n"
-"Linux-ek partizio berriak egingo ditu automatikoki. Zatitu beharreko diskoa\n"
-"hautatzuko \"hda\" kliklatu lehenengo IDE diskorako,\n"
-"\"hdb\" bigarrenerako edo \"sda\" lehenengo SCSI diskorako eta horrela ere "
-"urrengokoak.\n"
+"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
 "\n"
-"Ohiko partizioak dira: root (/), direktorioen ierarkian sistemaren "
-"fitxategien hasiera\n"
-"puntua dena, eta /boot,konputagailua pizterakoan\n"
-"sistema eragilea abiarazteko beharrezko diren\n"
-"fitxategiak duena.\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"
-"Partizio prozeduraren ekintzak atzerako biderik izan ohi ez dutenez,\n"
-"esperientziarik ez duenarengan beldurra eta larritasuna eragin diezaioke. "
-"DiskDrake-k\n"
-"prozedura errazten du izua uxatzeko. Dokumentazioa kontsultatu eta\n"
-"har ezazu behar duzun denbora hasi aurretik.\n"
-"Teklatua erabiliz edozien aukeraz baliatu zaitezke: partizioetatiknabigatu\n"
-"Tab eta Gora/Bera geziez. Behin partizioa hautatua, zera erabil zenezake:\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
+"hard drives:\n"
 "\n"
-"- Ctrl-c  partizio berria eraikitzeko (partizio hutsa hautatzekotan)\n"
+"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-d  partizioa ezabatzeko\n"
+"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-m  muntai puntua ezartzeko\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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:252
 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."
+"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 ""
-"Berriki ezarritako edozein partizio formateatu beharko da erabilgarria\n"
-"izateko (formateatu esan nahi du sistemen fitxategiak ezartzea). Orain, "
-"agian\n"
-"esistitzen direnetako zenbait partizio formateatu nahiko duzu, bertako "
-"datuak\n"
-"ezabatzeko. Oharra: aurretik zeuden partizioak formateatzea ez da "
-"beharrezkoa\n"
-"batez ere, mantendu nahi dituzun fitxategi eta datuak gordetzen baditu.\n"
-"Normalean /home eta /usr/local dira gordetzen direnak."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:257
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"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"
-"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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"\n"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:267
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
 
-#: ../../help.pm_.c:155
-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."
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
-"Hautatutako paketeak instalatzen ari dira. Operazio honek\n"
-"minutu gutxi batzuk iraun lezake, baina sistema eguneratzea hautatu\n"
-"baduzu are gehiago iraun lezake operazioak eguneratzea egin beharko\n"
-"delako."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:303
 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"
+"Any partitions that have been newly defined must be\n"
+"formatted for use (formatting meaning creating a filesystem).\n"
 "\n"
 "\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\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"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
-msgstr ""
-"DrakX-ek ez du sagurik aurkitzen ez badu, edo egindakoa\n"
-"aztertu nahi baduzu, gainean duzun saguen zerrenda duzu\n"
-"eskura.\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"
-"DrakX'-en aukerekin ados bazaude settings, jauzi egin nahi duzun atalera\n"
-"ezkerrean duzun menuan klik eginez. Bestela,\n"
-"zure saguarekin antza handiena zukeen sagua hautatu\n"
-"menuan.\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"
-"Seriean konektatutako sagua izanez gero, DrakX-i\n"
-"serie-kaia adierazi beharko diozu."
+"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 ""
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:329
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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 ""
-"Mesedez kai zuzena hautatu. Adibidez, MS Windows-eko COM1 kaia\n"
-"ttyS0 izendatzen da Linux-en."
+"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..."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:341
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"You can now choose individually all the packages you\n"
+"wish to install.\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"
+"You can expand or collapse the tree by clicking on options in the left "
+"corner of\n"
+"the packages window.\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"
+"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
+"\"Toggle flat and group sorted\".\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"
 "\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."
+"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 ""
-"Atal hau bertoko sarea (LAN) edo modem-a konfiguratzeko\n"
-"da\n"
-"\n"
-"Hautatu \"Bertoko LAN\" eta DrakX-ek\n"
-"zure makinako Ethernet egokitzailea bilatzen saiatuko da. PCI egokitzaileak\n"
-"automatikoki bilatu eta abiarazten dira.\n"
-"Dena den, zure periferikoa ISA bada, autodetekzioak huts egingo du,\n"
-"eta orduan agertuko zaizun zerrendatik hautatu beharko duzu driver-a.\n"
+
+#: ../../help.pm_.c:358
+#, 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 ""
+"Goiko zerrendako CD guztiak badituzu, Ados klikatu.\n"
+"Batere ez baduzu, Etsi klikatu.\n"
+"Baten bat faltatuz gero, hautatuetatik atera eta ondoren Ados klikatu."
+
+#: ../../help.pm_.c:363
+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"
-"SCSI egokitzaileentzat gertatzen den moduan, lehen aldian driverrak\n"
-"egokitzailea frogatu lezake bere kabuz, bestela aukerak adierazi\n"
-"beharko dizkiozu driver-ari, aukerak dokumentazioan edo harwarean\n"
-"aurki ditzakezu.\n"
+"Please be patient."
+msgstr ""
+
+#: ../../help.pm_.c:371
+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:376
+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:380
+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"
-"Linux-Mandrake sistema sare batean dagoen konputagailuan\n"
-"instalatuz gero, sare administrariak beharrezko duzun informazioa eman "
-"beharko dizu\n"
-"(IP helbidea, sareko submaskara\n"
-"edo netmask, eta ostalariaren izena). Zure sare pribatua\n"
-"instalatzen ari bazara helbidea hautatu beharko\n"
-"duzu.\n"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\n"
 "\n"
 "\n"
-"Hautatu \"Deitu modem-ez\" eta modem bitarteko internet\n"
-"konexioa konfiguratuko da. DrakX-ek, zure modem-a bilatzen saiatuko da\n"
-"hau huts eginez gero aukeratu beharko duzu modem-aren serieko kaia\n"
-"zein den."
+"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:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"Markatze opziotan sar zintezke. Sartu beharreko informazioa\n"
+"zure ISP-tik lor dezakezu."
+
+#: ../../help.pm_.c:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
-"Enter:\n"
+"Sartu:\n"
 "\n"
-"  - IP helbidea: ez badakizu, sare administrariari galdetu.\n"
+"  - IP helbidea: ez badakizu, sare administrariari edo ISP-ari galdetu.\n"
 "\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" ohikoena da. ziur ez bazaude\n"
-"administratzaileari galdetu.\n"
+"  - Netmask: \"255.255.255.0\" ohikoena da. Ziur ez bazaude\n"
+"administratzaileari edo ISP-ri galdetu.\n"
 "\n"
 "\n"
-"  - Automatic IP: Sareak bootp edo dhcp protocol erabiliz gero, hautatu \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.\n"
+"Ziur ez bazaude, galdetu administrariari edo ISP-ari.\n"
+
+#: ../../help.pm_.c:437
+#, 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 ""
+"Sareak NIS erabiliz gero, hautatu \"Erabil NIS\". Ez badakizu, sarearen "
+"administrariari\n"
+"galde egiozu."
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1696,7 +2201,7 @@ msgstr ""
 "Markatze opziotan sar zintezke. Sartu beharreko informazioa\n"
 "zure ISP-tik lor dezakezu."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1704,13 +2209,15 @@ msgstr ""
 "Proxy-rik erabiliz gero, mesedez orain konfiguratu. Ez badakizu\n"
 "ISP-ari edo sareko administrariari galdetu."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1722,100 +2229,204 @@ msgstr ""
 "Mirror ete pakete kriptografikoak zure tokiko legeen arabera hautatu\n"
 "behar dituzu."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "Bizi zaren tokiko denbora-eremua hauta dezakezu.\n"
 "\n"
 "\n"
-"Linux-ek GMT edo \"Greenwich Mean Time\" erabiltzen du eta hau\n"
+"GNU/Linux-ek GMT edo \"Greenwich Mean Time\" erabiltzen du eta hau\n"
 "zure bizitokira egokitzen du."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 ""
+"Abiatzerakoan zein zerbitzu nahi duzun hauta zenezake orain.\n"
+"Sagua item baten gainetik pasatzerakoan, globo txiki batek zerbitzuaren "
+"zeregina\n"
+"aipatuko dizu.\n"
+"\n"
+"Makina zerbitzari modura erabiliko baduzu, kontu handiz ibili:\n"
+"erabiliko ez dudun zerbitzuak ez abiarazi."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
+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:490
+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:505
+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 ""
+
+#: ../../help.pm_.c:521
 msgid ""
-"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"
+"Please turn on your printer before continuing to let DrakX detect it.\n"
+"\n"
+"You have to enter some informations here.\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"
+"   * 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"
-"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"
+"   * 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"
-"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."
+"   * 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 ""
-"Linux-ek irarkola mota ugari erabil ditzake. Bakoitzak\n"
-"bere egokiera behar du.\n"
+
+#: ../../help.pm_.c:542
+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"
-"Irarkola zuzenean konputagailuari lotuta egonez gero hautatu\n"
-"\"Bertoko irarkola\". Gero zein kaietara lotuta dagoen adierazi\n"
-"beharko duzu, eta iragazki egokia hautatu.\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:567
+msgid ""
+"Your printer has not been detected. Please enter the name of the device on\n"
+"which it is connected.\n"
 "\n"
 "\n"
-"Urruneko Unix makinari lotutako irarkola erabili nahi izanez gero,\n"
-"hautatu \"Urruneko lpd\". Indarrean sartzeko\n"
-", ez da beharrezko erabiltzaile izena ez eta pasahitzik, baina\n"
-"zerbitzariaren inprimitze isatsaren izena jakin beharko duzu.\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:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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"
-"SMB irarkola erabili nahi izanez gero (hau da,\n"
-"urruneko Windows 9x/NT makinan kokatutakoa),\n"
-"SMB izena (ez TCP/IP izena)eman beharko duzu, eta agian IP helbidea ere,\n"
-"gehi erabiltzaile izena, lantaldea eta irakola erabiltzeko beharrezkoa\n"
-"den pasahitza, eta, nola ez, irarkolaren izena. Bardin\n"
-"NetWare irarkolentzako, baina kasu honetan ez duzu lantalde izenik eman "
-"beharrik."
+"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 ""
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:585
+#, fuzzy
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"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 Linux-Mandrake sistemarako pasahitza sar dezakezu.\n"
 "Pasahitza birritan tekleatu beharko duzu, bigarrenean\n"
@@ -1832,7 +2443,7 @@ msgstr ""
 "ez du izan behar, hau da: neke handiegirik gabe gogora dezakezuna\n"
 "behar du izan."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1840,7 +2451,7 @@ msgstr ""
 "Sistema seguruago izan daitean, hautatu \"Fitxategi itzaldua erabili\" eta\n"
 "\"MD5 pasahitzak erabili\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1849,7 +2460,7 @@ msgstr ""
 "administrariari\n"
 "galde egiozu."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1891,47 +2502,41 @@ msgstr ""
 ", eta root login-a bakarrik administraziorako eta mantenurako\n"
 "erabiliko duzu."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Oso gomendatua da hemen \"Bai\" erantzutea. Microsoft Windows\n"
-"gerorago instalatzekotan boot sektorea ezabatuko dizu.\n"
-"Esan zaizun bezala boot diskorik egin ez baduzu ezin izango duzu\n"
-"Linux abiatu."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
-"Linux abiarazteko beharrezkoa den informazioa\n"
+"GNU/Linux abiarazteko beharrezkoa den informazioa\n"
 "non kokatu nahi duzun galdetuko zaizu.\n"
 "\n"
 "\n"
 "Ziur ez bazaude, hautatu \"Honen lehenengo sektorea\n"
 "unitatez (MBR)\"."
 
-#: ../../help.pm_.c:343
-#, fuzzy
+#: ../../help.pm_.c:643
 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"
-"(disko maisuaren lehen kanala)."
+" (IDE disko nagusia) edo \"/dev/sda\" (lehen SCSI diskoa)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1941,8 +2546,20 @@ msgid ""
 "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) eta Grub abiarazleak dira: biek\n"
+"GNU/Linux edo bestelako sistema eragileak abiarazteko gai dira.\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!"
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 #, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
@@ -1960,52 +2577,88 @@ msgid ""
 "\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."
 msgstr ""
-"LILOren aukera nagusiak dira:\n"
+"LILO eta grub-en aukera nagusiak dira:\n"
 "  - Abiarazteko unitatea: boot sektorea non (e.g. disko zurruna edo "
 "partizioa)\n"
 "dagoen esaten du). Bestera ez bada,\n"
 "\"/dev/hda\" hautatu.\n"
 "\n"
 "\n"
-"  - Lineala: helbide linealak sektoreentzako eta ez\n"
-"sector/buru/zilindro helbideak. Helbide linealak abiarazterakoan itzultzen "
-"dira\n"
-"eta ez dude diskoaren geometriarekin lotuta. Kontuan izan disko zurruna "
-"eramngarri\n"
-"ez dela \"linear\" erabiliz gero, diskoen geometria ezartzeko BIOSaren\n"
-"atala ez dabil disketeentzako. Disko handietan\n"
-"\"linear\", /sbin/lilo-k erabilgarriak ez diren areetarako loturak\n"
-"ezar lezake, 3D sektoreetako helbideak abiarazi ostean ezartzen\n"
-"direlako.\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.\n"
 "\n"
 "\n"
-"  - Compact: Irakurketa eta baieztapena bat egiten ditu irakurketa "
-"bakarrera\n"
-"auzokoak diren sektoretan. Zama denbora jaisten du eta mapa txikiagoa "
-"eratzen du.\n"
-"\"compact\" gomendatzen da disketez abiarazten denean batez\n"
-"ere.\n"
+"  - Video modua: Hau abiatzerakoan zein VGA testu modua hautatzeko da\n"
+"Hurrengo balioak izan dezake: \n"
+"    * arrunta: hauta 80x25 testu modua.\n"
+"    * <zenbakia>:  erabili dagokion testu modua."
+
+#: ../../help.pm_.c:680
+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"
-"  - Jatorriz hautatutako imagina abiarazteko itxaron denbora:\n"
-"boot kargatzailea zenbat itxaron behar duen (segunduen hamarrenekotan).\n"
-"Hau batez ere disko zurrunetik abiarazten denean teklatua egokitu \n"
-"ondoren. Horrela ez dago itxaron denborarik \"itxaron-denbora\"\n"
-"zero bada.\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!"
+
+#: ../../help.pm_.c:692
+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"
-"  - Video modua: Abiatzerakoan zein VGA testu modua hautatzen\n"
-"den adierazteko. Hurrengo balioak aukeran: \n"
-"    * normala: hautatu 80x25 testu modua.\n"
-"    * <zenbakia>:  dagokian testu modua."
+"  - 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:378
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2017,7 +2670,7 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 "Orain X Window Sistem konfiguratu behar duzu, hau\n"
-"Linux GUIren (Graphical User Interface) muina da. Honetarako,\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"
@@ -2028,7 +2681,7 @@ msgstr ""
 "aukeren egokiera. Ez bazaude konforme atzera jo dezakezu,\n"
 "aukerak aldatu eta berriz frogatu."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2036,7 +2689,7 @@ msgstr ""
 "X konfigurazioan zerbait gaizki izanez gero, aukera hauek erabili\n"
 "X Window Sistema konfiguratzeko."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2044,43 +2697,47 @@ msgstr ""
 "Login grafikoa nahi baduzu \"Bai\" hautatu. Bestela, hautatu\n"
 "\"Ez\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 #, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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."
 msgstr ""
 "Zure sistemaren zenbait aukera gehigarri hauta dezakezu orain.\n"
 "\n"
@@ -2090,11 +2747,11 @@ msgstr ""
 "\n"
 "\n"
 "  - Hautatu segurtasun maila: Zure sistemarako segurtasun maila hauta\n"
-"dezakezu.\n"
+"dezakezu. Ez badakizu \"Ertaina\" hautatu.\n"
 "    Informazio gehiagorako gidaliburua aztertu.\n"
 "\n"
 "\n"
-"  - RAM tamaina zehatza: Zenbaitetan, Linux-ek ez du ongi detektatzen\n"
+"  - RAM tamaina zehatza: Zenbaitetan, GNU/Linux-ek ez du ongi detektatzen\n"
 "sisteman dagoen RAM guztia. Hau gertatuz gero,\n"
 "adierazi tamaina zehatza. Oharra:  2 edo 4 Mb arteko diferentzia\n"
 "normala da.\n"
@@ -2109,7 +2766,7 @@ msgstr ""
 "  - Num Lock abiatzerakoan: Number Lock abiatzerakoan ezarrita\n"
 "nahi izanez gero, hautatu hau (Oharra: Num Lock ez dabil X-en)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2123,97 +2780,119 @@ msgstr ""
 "Bestelako sistema eragilerik erabili nahi izanez gero mesedez irakurri\n"
 "instrukzio gehigarriak."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Hautatu hizkuntza"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Hautatu instalazio mota"
 
-#: ../../install2.pm_.c:45
-#, fuzzy
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
-msgstr "Disko zurrunaren optimizatzaileak erabili nahi?"
+msgstr "Disko zurrunaren detekzioa"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Konfiguratu sagua"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Aukeratu teklatua"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Denetarik"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Fitxategi sistemak egokitu"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Partizioak formateatu"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Aukeratu instalatu beharreko paketeak"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Instalatu sitema"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Konfiguratu sare lana"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Enkriptatua"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Konfiguratu ordu eremua"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Konfiguratu zerbitzuak"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Konfiguratu irarkola"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "root-aren pasahitza ezarri"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Gehitu erabiltzailea"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Bootdisk-a eraiki"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Instalatu bootloader-ra"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Konfiguratu X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
-msgstr ""
+msgstr "Auto instalatu disketea"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Instalaziotik irten"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "$f fitxategia irakurtzean errorea"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "Mesedez testatu sagua"
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Mesedez testatu sagua"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+"Zure konputagailuaren harwareren baten batek lanerako ``proprietary'' "
+"gidariak behar ditu.\n"
+"Horri buruzko informazioa hemen duzu: %s"
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2223,235 +2902,249 @@ msgstr ""
 "Honetarako, partizioa eratu (edo existitzen deneko batean klikatu).\n"
 "Geru hauta ``Muntai puntua'' eta `/' ezarri"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Partizio taula ezin irakurri, zeharo galduta:(\n"
-"Partizio txarrak hustutzen saiatuko naiz"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "swap partizioa beharrezko duzu"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake-k ezin izan du partizio taula irakurrri.\n"
-"Zure kontura jarraitu!"
+"Ez duzu swap partiziorik\n"
+"\n"
+"Jarraitu?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "root partizioaren bila."
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Erabili toki librea"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Informazioa"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "Ez dago lekurik partizio berririk ezartzeko"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: hau ez da root partizioa, mesedez aukeratu besteren bat."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "Erabili dauden partizioak"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Ez dut aurkitu root partiziorik"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "Ez dago partizio erabilgarririk"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "NIS domeinurik gabe ezin erabili broadcast"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Loopback-erako erabili Windows partizioa"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "$f fitxategia irakurtzean errorea"
+#: ../../install_interactive.pm_.c:90
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Zein partizio erabili nahi duzu Linux4Win ezartzeko?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Errorea eman da eta ezin dezaket egokiro kudeatu.\n"
-"Jarraitu zure kabuz."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Hautatu tamainak"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "%s muntaia puntua bikoiztu"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Root partizioaren tamaina MBetan: "
 
-#: ../../install_steps.pm_.c:323
-msgid ""
-"Some important packages didn't get installed properly.\n"
-"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
-msgstr ""
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Swap partizzioaren tamaina MBetan: "
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Ongi etorri %s-ra"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "Erabili Windows partizioako toki librea"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Ez dago disketerik"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Zein partizio berregokitu nahi duzu?"
+
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "Windows-aren fitxategi-sistemen loturak zenbatzen"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "`%s' urratsean sartzen\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"FATaren berregokitzaileak ezin du zure partizioan eragin, \n"
+"hurrengo errorea gertatu da: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "swap partizioa beharrezko duzu"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr "Zure windows partizioa oso zatikatua, mesedez ``defrag'' egin"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"Ez duzu swap partiziorik\n"
+"KASU!\n"
 "\n"
-"Jarraitu?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Instalatu nahi duzunaren tamaina hautatu"
+"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."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Tamaina guztira: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "Zein tamaina gorde nahi duzu windowserako?"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "Bertsioa: %s\n"
+msgid "partition %s"
+msgstr "partizioa %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "Tamaina: %d KB\n"
+msgid "FAT resizing failed: %s"
+msgstr "FAT tamaina egokierak huts egin du: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Instalatu nahi dituzun paketeak hautatu"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+"Ez dao FAT partiziorik berregokitzeko edo loopback bezala erabiltzeko (edo "
+"ez da lekurik geratzen)"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Instalatu"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Ezabatu Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Instalatzen"
+#: ../../install_interactive.pm_.c:153
+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_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Mesedez itxaron, "
+#: ../../install_interactive.pm_.c:156
+#, 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_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Falta den denbora "
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "Aditu mota"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Denbora guztira"
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "Erabili diskdrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Instalazioa prestatzen"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "Erabili fdisk"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "%s paketea instalatzen"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"%s partizioa egin dezakezu orain\n"
+"Eginda dagoenean, ez ahaztu, gorde `w' erabiliz"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Jarraitu dena den?"
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Erabili Windows partizioako toki librea"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Paketeak antolatzerakoan errorea izan da:"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Ezin dut partizio gehiagorik gehitu"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "X11-rako dagoen konfigurazioa erabili?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "DraX-en partiziorako tresnak hurrengo soluzioak aurkitu ditu:"
 
-#: ../../install_steps_gtk.pm_.c:158
-#, fuzzy
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Mesedez hurrengo informazioa igorri"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Partizioak huts egin du: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-#, fuzzy
-msgid "You don't have any windows partitions!"
-msgstr "Partiziorik ez duzu!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Sarea eraikitzen"
 
-#: ../../install_steps_gtk.pm_.c:201
-#, fuzzy
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Partiziorik ez duzu!"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Sarea beheratzen"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"KASU!\n"
-"\n"
-"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."
+"Errorea eman da eta ezin dezaket egokiro kudeatu.\n"
+"Jarraitu zure kabuz."
+
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "%s muntaia puntua bikoiztu"
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Tamaina egokiera automatikoak huts egin du"
+#: ../../install_steps.pm_.c:375
+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 ""
+"Zenbait pakete garrantzitsu ez dira ongi instalatu.\n"
+"Cdrom tresna edo cd-a gaizki leudeke.\n"
+"Saiatu cd-a instalatutako konputagailuren batean \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\" erabiliaz\n"
 
-#: ../../install_steps_gtk.pm_.c:265
-#, fuzzy
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Zein partizio erabili nahi duzu root partizio modura?"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Ongi etorri %s-ra"
 
-#: ../../install_steps_gtk.pm_.c:284
-#, fuzzy
-msgid "Choose the sizes"
-msgstr "Hautatu tamaina berria"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Ez dago disketerik"
 
-#: ../../install_steps_gtk.pm_.c:286
-#, fuzzy
-msgid "Root partition size in MB: "
-msgstr "Root partizioa"
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "`%s' urratsean sartzen\n"
 
-#: ../../install_steps_gtk.pm_.c:288
-#, fuzzy
-msgid "Swap partition size in MB: "
-msgstr "Tamaina MBetan: "
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"Zure sistemak ahalmen gutxi du. Linux-Mandrakeren 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:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Mesedez, hurrengoetatik instalazio mota hautatu"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
-msgstr ""
+msgstr "Hautatutako taldeen tamaina gutxigorabehera %d MBekoa da.\n"
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2459,8 +3152,11 @@ msgid ""
 "A low percentage will install only the most important packages;\n"
 "a percentage of 100%% will install all selected packages."
 msgstr ""
+"Tamaina hau baino txikiagoa nahi baduzu,\n"
+"hauta instalatu nahi duzun paketeen ehunekoa.\n"
+"100%%ekoak pakete guztiak instalatuko du."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2469,105 +3165,194 @@ msgid ""
 "A low percentage will install only the most important packages;\n"
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
+"Zure diskoan, paketeen %d%%rako tokia duzu.\n"
+"\n"
+"Gutxiago nahi baduzu,\n"
+"hauta instalatu nahi duzun paketeen ehunekoa.\n"
+"Ehuneko txikiak pakete nagusiak instalatuko ditu;\n"
+"%d%% ehunekoak ahal bezain besteko paketeak instalatuko ditu."
 
-#: ../../install_steps_gtk.pm_.c:333
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
-msgstr "Hurrengo hurratsean zehatzago egin dezakezu"
+msgstr "Hurrengo hurratsean zehatzago hauta dezakezu"
 
-#: ../../install_steps_gtk.pm_.c:335
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
-msgstr "Aukeratu instalatu beharreko paketeak"
+msgstr "Instalatu beharreko paketeen ehunekoa"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Instalatu nahi dituzun paketeak hautatu"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Instalatu"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Dependentzia automatikoak"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Zabaldu adarrak"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Batu adarrak"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
-msgstr ""
+msgstr "Toggle between flat and group sorted"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Pakete okerra"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
-msgstr ""
+msgstr "Izena: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Bertsioa: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Tamaina: %d KB\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Garrantzia: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Tamaina guztira: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+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:386
+msgid "The following packages are going to be installed"
+msgstr "Hurrengo paketeak instalatuko dira"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "Hurrengo paketeak ezabatuko dira"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Ezin hauta/kendu pakete hau"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Ezinbesteko paketea da, ezin zaio huatapena kendu"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
-msgstr ""
+msgstr "Ezin duzu hautatutako hau kendu. Dagoeneko instalatua"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
+"Pakete hau eguneratu behar da\n"
+"Aukera kendu nahi?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:496
-#, fuzzy
-msgid "The following packages are going to be installed/removed"
-msgstr "Hurrengo paketeak instalatu/ezabatuko dira"
+msgstr "Ezin duzu hautatutakoa kendu. Eguneratu behar da"
 
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr ""
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Instalatzen"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Neurtzen"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Mesedez itxaron, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Falta den denbora "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Denbora guztira"
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Etsi"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Instalazioa prestatzen"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pakete"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "%s paketea instalatzen"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "Onartu"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2581,200 +3366,403 @@ msgstr ""
 "Mesedez, \"%s\" izena duen Cd-Rom-a sartu unitatean eta gero Ok sakaegizu.\n"
 "Ez baldin baduzu Etsi sakatu Cd-Rom-etiko instalazioa ezeztatzeko."
 
-#: ../../install_steps_gtk.pm_.c:615
-#, fuzzy
-msgid "There was an error installing packages:"
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "Ez onartu"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Jarraitu dena den?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
 msgstr "Paketeak antolatzerakoan errorea izan da:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_gtk.pm_.c:573
+msgid "There was an error installing packages:"
+msgstr "Paketeak instalatzerakoan errorea izan da:"
+
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Errorea gertatu da"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+msgstr "Mesedez, hauta hizkuntza."
+
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Teklatua"
 
-#: ../../install_steps_interactive.pm_.c:73
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
-msgstr "Zein da zure teklatuaren itxura?"
+msgstr "Mesedez, hauta zure teklatuaren itxura."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 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:91
-msgid "Root Partition"
-msgstr "Root partizioa"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Zure sisteman zein da root (/) partizioa?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "Denak"
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Instalazio mota"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Zein instalazio mota nahi duzu?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Instalatu/Eguneratu"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr "Instalazioa edo eguneratzea da?"
-
-#: ../../install_steps_interactive.pm_.c:110
+#: ../../install_steps_interactive.pm_.c:183
 #, fuzzy
-msgid "Automated"
-msgstr "IP automatikoa"
+msgid "Is this an install or an update?"
+msgstr "Instalazioa edo berreskuraketa da?"
+
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Gomendatua"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Norberarena"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Aditua"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "Ziur zaude aditua zarela? \n"
-"Txantxarik ez, arriskutsuak izan daitezkeenak egin ditzakezu hemen."
+"Txantxarik ez, arriskutsuak izan daitezkeenak egin ditzakezu hemen.\n"
+"Honako galderei aurre eginbeharko duzu: ``Erabili fitxategi itzalduak "
+"pasahitzentzako?'',\n"
+"Horrelakoak erantzuteko prest?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Eguneratu"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Arrunta"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "Lan estazioa"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Garatzailearena"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Zerbitzariarena"
 
-#: ../../install_steps_interactive.pm_.c:141
-#, fuzzy
-msgid "Which usage is your system used for ?"
-msgstr "Zein da zure ordu-eremua?"
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
+msgstr "Zein da zure sistemaren erabilera?"
 
-#: ../../install_steps_interactive.pm_.c:152
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
-msgstr "Zein da zure sagu mota?"
+msgstr "Mesedez, hauta da zure sagu mota."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Saguaren kaia(port)"
 
-#: ../../install_steps_interactive.pm_.c:161
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
-msgstr "Zure sagua serieko zein kaietara dago konektatua?"
+msgstr "Mesedez, hauta zure sagua serieko zein kaietara konektatua dagoen."
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "PCMCIA txartelak konfiguratzen..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "IDE Konfiguratzen"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
-msgstr ""
+msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "ez dago partizio erabilgarririk"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-#, fuzzy
-msgid "Please choose a partition to use as your root partition."
-msgstr "Zein partizio erabili nahi duzu root partizio modura?"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Muntai puntuak hautatu"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Partizio taula ezin irakurri, zeharo galduta:(\n"
+"Partizio txarrak hustutzen saiatuko naiz eta DATU GUZTIAK galduko dira\n"
+"(Akatsa: %s)\n"
+"\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake-k ezin izan du partizio taula irakurrri.\n"
+"Zure kontura jarraitu!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Root partizioa"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Zure sisteman zein da root (/) partizioa?"
+
+#: ../../install_steps_interactive.pm_.c:352
 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:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Hautatu formateatu nahi duzun partizioak"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
-msgstr ""
+msgstr "Bloke txarrak txekeatu?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Partizioak formateatzen"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "%s fitxategia eratzen eta formateatzen"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 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:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Erabilgarri dauden paketeak bilatzen"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Eguneratu beharreko paketeak bilatzen"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
+"Zure sistemak ez du leku nahikorik instalaziorako edo eguneratzerako (%d > "
+"%d)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "Osoa (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "Minimoa (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Gomendatua (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "Norberarena"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "Hauta instalatu nahi duzun tamaina"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Pakete Taldearen aukeraketa"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Banan-banako pakete hautapena"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 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 ""
+"Beheko zerrendako CD guztiak badituzu, Ados klikatu.\n"
+"Ez badituzu, Etsi klikatu.\n"
+"Ez duzuna ezaba dezakezu, eta gero Ados klikatu."
 
-#: ../../install_steps_interactive.pm_.c:363
-#, fuzzy, c-format
+#: ../../install_steps_interactive.pm_.c:575
+#, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr "Cd-Rom Nr %s"
+msgstr "Cd-Rom etiketan %s"
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2782,176 +3770,11 @@ msgstr ""
 "%s paketea instalatzen\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Postinstalazioaren konfigurazioa"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Darabildan IP konfigurazioa mantendu"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Berkonfiguratu sarea orain!"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Sarearen konfigurazioa ez ukitu"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Sarearen Konfigurazioa"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Bertoko sarea konfiguratua dago. Nahi al duzu:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Zure sistemarako bertoko LAN sarea konfiguratu nahi duzu?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "ez da sare txartelik aurkitu"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Modem-aren konfigurazioa"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr ""
-"Zure sistemarako modem-markazioaren bitartezko sare-lana konfiguratu nahi "
-"duzu?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "% sarerako tresna konfiguratzen"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Makina honetarako IP konfigurazioa ezarri mesedez.\n"
-"Item bakoitze zenbaki eta puntuz sartu behar da IPan bezala\n"
-"(adibidez, 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "IP automatikoa"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP helbidea:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Maskara (Netmask):"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP helbidea hurrengo formatuan 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Sarea konfiguratzen"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Ostalariaren izena sartu mesedez.\n"
-"Zure ostalariaren izena guztiz gaitua behar du izan,\n"
-"honakoa bezala ``nirekutxa.niregela.nirelantegia.com''.\n"
-"Atariaren (gateway) IP helbidea sar dezakezu horrelakorik baduzu"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS zerbitzaria:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Atariko tresna (gateway device):"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Ataria (gateway):"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Ostalariaren izena:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Aurkitu modema?"
-
-#: ../../install_steps_interactive.pm_.c:521
-#, fuzzy
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Serieko zein kaira dago zure modema konektatua?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Markatze aukerak"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Konexioaren izena"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Telefono zenbakia"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Login ID"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Egiaztapena"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Scipt-ean oinarritua"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Terminalean oinarritua"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Domeinuaren izena"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Lehenengo DNS zerbitzaria"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Bigarren DNS zerbitzaria"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3021,89 +3844,92 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Hautatu paketeak lortzeko erabiliko duzun mirror-a"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 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:592
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
-msgstr "Instalatu nahi dituzun paketeak hautatu"
+msgstr "Mesedea hauta instalatu nahi dituzun paketeak."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
-msgstr "Zein da zure ordu-eremua?"
+msgstr "Zein da zure ordu eremua?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Zure hardwareko erlojua GTMari egokitua dago?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "Zein inprimaketa sistema erabili nahi duzu?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Pasahitzik ez"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Itzalpeko fitxategia erabili"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "itzalpea"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "MD5 pasahitzak erabili"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "NIS erabili"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "orri horiak"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, 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:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "NIS egiaztapena"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS domeinua"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS Zerbitzaria:"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Onartu erabiltzailea"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Gehitu erabiltzailea"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s dagoeneko gehitua)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3113,61 +3939,88 @@ msgstr ""
 "Erabiltzailea sartu\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Benetako izena"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Erabiltzailearen izena"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Maskorra"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikonoa"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Pasahitza sinpleegia da"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Mesedez erabiltzaile izena eman"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Erabiltzailearen izenean soilik hizki txikiak, zenbakiak, `-' eta `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Erabiltzaile izen hau dagoeneko gehituta dago"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Norberaren disko abiarazleaz (bootdisk) Linux-an sar zintezke abiarazle\n"
+"arrunta erabili ordez. Hau batez ere balio du zure sisteman SILOrik ezarri\n"
+"nahi ez duzunerako edo beste sistema batek SILOa ezabatzen duenerako edo "
+"zure\n"
+"hardware konfigurazioarekin SILO bat ez daterrenerako. Disko abiarazleak "
+"ere\n"
+"Mandrakeren erreskate imaginaren ordezkoarena egin lezake, eta horrela "
+"sistema\n"
+"porrotetatik berreskura dezake. Zure sistemarako disko abiarazlerik egin "
+"nahi baduzu \"Ados\" klikatu."
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Lehenengo diskete unitatea"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Bigarren diskete unitatea"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Ahaztu"
 
-#: ../../install_steps_interactive.pm_.c:755
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3182,8 +4035,8 @@ msgid ""
 msgstr ""
 "Norberaren disko abiarazleaz (bootdisk) Linux-an sar zintezke abiarazle\n"
 "arrunta erabili ordez. Hau batez ere balio du zure sisteman LILOrik ezarri\n"
-"nahi ez duzunerako edo beste sistema batek LILOa ezabatzen duenerako edo "
-"zure\n"
+"nahi ez duzunerako edo beste sistema batek LILOa (edo grub) ezabatzen "
+"duenerako edo zure\n"
 "hardware konfigurazioarekin LILO bat ez daterrenerako. Disko abiarazleak "
 "ere\n"
 "Mandrakeren erreskate imaginaren ordezkoarena egin lezake, eta horrela "
@@ -3191,184 +4044,154 @@ msgstr ""
 "porrotetatik berreskura dezake. Zure sistemarako disko abiarazlerik egin "
 "nahi duzu?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Parkatu, ez dago disko unitate erabilgarririk"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 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:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "%s-n diskoa sartu"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Disko abiarazlea eraikitzen"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "LILOren instalazioak porrot egin du. Errore hau izan da:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "SILO erabili nahi duzu?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "SILOren aukera nagusiak"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Hemen daude SILOko hurrengo sarrerak.\n"
-"Zenbait gehitu edo daudenak aldatu dezakezu."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Partizioa"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Etiketa hau dagoeneko erabiltzen da"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "SILOren instalazioak porrot egin du. Errore hau izan da:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Abiarazlea prestatzen"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "aboot erabili nahi duzu?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
+"aboot instalatzerakoan errorea, \n"
+"indarrez ezarri instalazioa nahiz eta lehen partizioa urratzeko arriskua "
+"egon?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Proxy-en konfigurazioa"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy-a honelakoa http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy-a honelakoa ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "abiarazlearen instalazioak porrot egin du. Errore hau izan da:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Ongi etorri Crackers-era"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Txiroa"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Gutxi"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Ertaina"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Handia"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoidea"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Denetariko galderak"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(datuak galaraz lezake)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Disko zurrunaren optimizatzaileak erabili nahi?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Hautatu segurtasun neurria"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Behar izanez gero RAM tamaina zehatza(%d MB aurkituta)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Medio eramangarrien automuntaia"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Abiarazte bakoitzean /tmp garbitu"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
-msgstr ""
+msgstr "Gaitu multi profilak"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Hasterakoan zenbakien finkaketa (num lock) baimendu"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Ram tamaina Mb-etan"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Segurtasun neurri altuetan ezin da supermount erabili"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
+msgstr ""
+"kasu: SEGURTASUN MAILA HONETAN, KONSOLAN EZIN DUZU ROOT LOGIN-IK EGIN!\n"
+"Root izan nahi baduzu, erabiltzaile bezala login egin behar duzu eta gero "
+"\"s\" erabili.\n"
+"Orokorrero, zure makina zerbitzari bezala lan egingo du.\n"
+"Abisatuta zaude."
+
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
 msgstr ""
+"Kasu, numlock-a piztuta izatean zenbait tekla zenbaikak ematen\n"
+"dituzte, hizkien ordez (ad: sakatu `p' eta lortu `6')"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Saiatuko naiz PCI unitateen bilaketan?"
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "X11-rako dagoen konfigurazioa erabili?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
+msgstr "Linuxaren replikazioarako auto install floppya egin nahi duzu?"
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s-n disko hutsa sartu"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Berez instalatzeko disketea prestatzen"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3378,7 +4201,7 @@ msgstr ""
 "\n"
 "Benetan irten nahi duzu?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3400,157 +4223,19 @@ msgstr ""
 "Linux-Mandrake Erabiltzailearen Gida Ofizialean dagoen instalazio kapitulura "
 "jo."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Itzaltzen"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "%s-ko %s txartelen driver-ak instalatzen"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(%s modulua)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Zein %s driver-an saia naiteke?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"Zenbaitetan, %s driver-ak egokiro lan egiteko informazio gehigarria behar "
-"du\n"
-",naiz eta gehienetan ondo ibili hau gabe. Aukera extra hauek espezifikatuko "
-"zenuke\n"
-"edo utziko zenuke driver-ari lortzen saiatzen? Batzutan saiaketak "
-"konputagailua\n"
-"eskegi lezake, honek ez du kalterik eragin beharrik."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Autofroga"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Aukerak espezifikatu"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Orain %s moduluari bere aukerak ezarri diezaiokezu."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"%s moduluari bere aukerak ezardiezaiokezu.\n"
-"Aukeren formatua: ``izena=balioa izena2=balioa2 ...''.\n"
-"Adibidez, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Muduluaren aukerak:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"%s moduluare kargak porrot egin du.\n"
-"Beste parametro batuzuez saiatu nahi al duzu?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Saiatuko naiz PCMCIA txartelak bilatzen?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "PCMCIA txartelak konfiguratzen..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Saiatuko naiz %s unitateen bilaketan?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "%s %s inteface-ak aurkituta"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Besterik daukazu?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "%s interface-rik duzu?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Ez"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Bai"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Ikus harwarearen informazioa"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Sarea eraikitzen"
-
-#: ../../install_steps_interactive.pm_.c:1207
-#, fuzzy
-msgid "Bringing down the network"
-msgstr "Sarea eraikitzen"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake-ren %s instalazioa"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> elementuen artean  | <Space> hautatzeko | <F12> hurrengo "
 "pantaila "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"%s disko zurrunaren partizioa egin dezakezu orain\n"
-"Eginda dagoenean, ez ahaztu, gorde `w' erabiliz"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Mesedez itxaron"
 
@@ -3560,7 +4245,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Anbiguitatea (%s), zehatzago izan\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Aukera okerra, saia zaitez berriro\n"
 
@@ -3574,444 +4259,940 @@ msgstr " ? (jatorrizkoa %s) "
 msgid "Your choice? (default %s) "
 msgstr "Zure aukera? (jatorrizkoa %s"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Zure aukera? (jatorrizko % sar `none' ezer denean"
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "Txekoa"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Germaniarra"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
-msgstr "Euskalduna edo Espaniarra"
+msgstr "Hegoko Euskalduna edo Espaniarra"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Finlandarra"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
-msgstr "Frantziarra"
+msgstr "Iparreko Euskalduna edo Frantziarra"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norbegiarra"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Polonesa"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Errusiarra"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Erresuma Batukoa"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "Estatu Batuetakoa"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armeniarra (zaharra)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armeniarra (teklatuzkoa)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armeniarra (fonetikoa)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "Azerbaidjan-era (cyrillic)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belgikarra"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulgariarra"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazildarra"
 
-#: ../../keyboard.pm_.c:115
-#, fuzzy
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
-msgstr "Bulgariarra"
+msgstr "Bielorrusiarra"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Suitzarra (Germaniarra)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Suitzarra (Frantseza)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Alemana (alferrikako teklarik ez)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Daniarra"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak (US)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (Norbegiarra)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Estoniarra"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgiarra (\"Errusiarra\")"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgiarra (\"Latindarra\")"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "grekoa"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Hungariarra"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Kroata"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Israeldarra"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Israeldarra (fonetikoa)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Iraniarra"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islandiarra"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Italiarra"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "Japoniarra 106 tekla"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Amerika latindarra"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Holandarra"
 
-#: ../../keyboard.pm_.c:140
-#, fuzzy
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
-msgstr "Lituaniako AZERTY"
+msgstr "Lituaniako AZERTY (zaharra)"
 
-#: ../../keyboard.pm_.c:142
-#, fuzzy
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
-msgstr "Lituaniako AZERTY"
+msgstr "Lituaniako AZERTY (berria)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lituaniako \"lerro zenbakia\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituaniako \"fonetikoa\"QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Poloniarra (QWERTY)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Poloniarra (QWERTZ)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugaldarra"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanadakoa (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Errusiarra (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Suediarra"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Eslobeniarra"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Eslobakiarra"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Tailandarra"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turkiarra (ohiko \"F\" modeloa"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turkiarra (modernoa \"Q\" modeloa"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukraniarra"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "Estatu Batuetakoa (nazioartekoa)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vietnameko \"lerro zenbakia\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Iugoslabiarra (latinoa)"
 
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - Sagua"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Generikoa"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "Pilotatxoa"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "seriekoa"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Ohiko sagua, 2 botoiduna"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Ohiko sagua, 3 botoiduna"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Segidakoa"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (serial, zaharra C7 motakoa)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Sagurik ez"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2 botoi"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3 botoi"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "batez"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Sagurik ez"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Zuzena da?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Interneten konfigurazioa"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Internetera konektatze saiorik egin nahi orain?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Konfiguratu internet konexioa"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Internetera ez konektatu"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Internetera konektatu / Bertoko sarea konfiguratu"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "ISDN Konfigurazioa"
+
+#: ../../netconnect.pm_.c:141
+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:158
+msgid "Connection Configuration"
+msgstr "Konexioaren Konfigurazioa"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "Mesedez beheko eremua bete edo berrikusi"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "Txartelaren IRQ"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "Txartelaren memoria (DMA)"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "Txartelaren IO"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "Txartelaren IO_0"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "Txartelaren IO_1"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "Zure telefono zenbakia"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "Ornitzailearen izena (adb: ornitzaile.net)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Ornitzailearen telefono zenbakia"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "Ornitzailearen dns 1"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "Ornitzailearen dns 2"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "Markatze modua"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "Kontuaren login-a (erabiltzailearen izena)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Kontuaren Pasahitza"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Biaeztatu Pasahitza"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "Europa"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Europa (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "Munduko beste guztia"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "Eropatik at - ez D-Channel-ik (leased lines)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "Zein protokolo erabili nahi duzu?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "Ez dakit"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "Zein da zure txartel mota?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "Jarraitu"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "Eten"
+
+#: ../../netconnect.pm_.c:245
 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"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
-"Ongi etorria LILOra, sistema eragilearen hautatzailera!\n"
 "\n"
-"Aukeren zerrenda ikusteko <TAB> sakatu.\n"
-"\n"
-"Kargatzeko, izena idatzi eta <ENTER> sakatu <ENTER> edo itxaron %d segundu "
-"jatorriz hautatutakoa abiatzeko.\n"
+"ISA txartel baduzu, hurrengo pantailan agertzen diren balioak egokiak izan "
+"beharko liratekez.\n"
 "\n"
+"PCMCIA txartela baduzu, txartelaren irq eta io-a jakin behar duzu.\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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Ongi etorri GRUBera, sistema eragilearen hautatzailea!"
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "Zein da zure ISDN txartela?"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "%c eta %c tekla erabili hautatutakoa aukeratzeko"
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "ISDAN txartela aurkitu dut:\n"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Hautatutako OSa abiarazteko enter sakatu, 'e' editatzeko"
+#: ../../netconnect.pm_.c:287
+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 txartela aurkitu dut, baina ez dakit zein motakoa. Mesedez hauta "
+"PCI txartel mota hurrengo pantailan."
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "abiatze aurretiko komandoak, edo 'c' komando-lerroa izateko"
+#: ../../netconnect.pm_.c:299
+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."
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Hautatutakoa abiaraziko da %d segundu barru."
+#: ../../netconnect.pm_.c:331
+#, fuzzy
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+"Ez duzu konfiguratutako Ethernet egokitzailerik zure sisteman. Mesedez "
+"harwarearen konfigurazio tresna erabili."
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Hautatu sareko interfacea"
+
+#: ../../netconnect.pm_.c:336
+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:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "Sarearen interfazea"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
+"\n"
+"Do you agree?"
 msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Konfigurazioa frogatu nahi duzu?"
+
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "ADSL konfigurazioa"
+
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "Abiatzerakoan zure konexioa abiarazi nahi duzu?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Aurkitu modema?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Mesedez hauta serieko zein kaira dago zure modema konektatua."
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Markatze aukerak"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Konexioaren izena"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "Telefono zenbakia"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Login ID"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Egiaztapena"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Scipt-ean oinarritua"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Terminalean oinarritua"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Domeinuaren izena"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Lehenengo DNS zerbitzaria"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Bigarren DNS zerbitzaria"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Internetera konektatu / Bertoko sarea konfiguratu"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "Konfiguratu internet konexioa"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Internetera ez konektatu"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
 msgstr ""
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Internetera ez konektatu"
+
+#: ../../netconnect.pm_.c:590
+msgid "Connect to Internet"
+msgstr "Internetera konektatu"
+
+#: ../../netconnect.pm_.c:592
+msgid "Disconnect from Internet"
+msgstr "Irteneteko konexioa eten"
+
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Konfiguratu internet konexioa"
+
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "Internet konexioa  & konfigurazioa"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - Sagua"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Konfiguratu internet konexioa"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB Sagua"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Konfiguratu internet konexioa"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB sagua (2 botoi)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Barneko ISDAN txarela"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB sagua(3 botoi edo gehiago)"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Kanpoko modema"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB sagua"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "Internetera konektatu"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "USB sagua (2 botoi)"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "Zure ISDN konexioa zein motatakoa da?"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB sagua (3 botoi edo gehiago)"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Konfiguratu internet konexioa"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Generic Mouse (PS/2)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "Frantzia"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "Beste herrialdeak"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Generic 3 Button Mouse (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "Zein herrialdetan zaude?"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "Alcatel modema"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "ECI modema"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "Zure adsl modem-a alcatel-ekoa bada, hauta Alcatel. Bestela, ECI."
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Konfiguratu internet konexioa"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"Zein dhcp bezero erabili nahi duzu?\n"
+"Jatorrizkoa dhcpd da"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus Mouse"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Konfiguratu internet konexioa"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus Mouse"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "Konfiguratu bertoko sarea"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus Mouse"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "ISDN Konfigurazioa"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB Mouse"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Konfigurazioa frogatu nahi duzu?"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB Mouse (3 botoi edo gehiago)"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "Sarea ezgaitu"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Sagurik ez"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Internetera konektatu / Bertoko sarea konfiguratu"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A edo gorago (serial)"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"Bertoko sarea konfiguratua dago.\n"
+"Nahi al duzu:"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Segidakoa (serial)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "Zelan nahi duzu interneten sartu?"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (serial)"
+#: ../../netconnect.pm_.c:858
+#, fuzzy
+msgid "Network Configuration"
+msgstr "ISDN Konfigurazioa"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (serial)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (serial)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "ez da sare txartelik aurkitu"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (serial)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Sarea konfiguratzen"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (serial)"
+#: ../../network.pm_.c:274
+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''."
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (serial)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "Ostalariaren izena"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (serial, zaharra C7 motakoa)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (serial)"
+#: ../../network.pm_.c:302
+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 ""
+"Makina honetarako IP konfigurazioa ezarri mesedez.\n"
+"Item bakoitze zenbaki eta puntuz sartu behar da IPan bezala\n"
+"(adibidez, 1.2.3.4)."
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Generic Mouse (serial)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "% sarerako tresna konfiguratzen"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft compatible (serial)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "IP automatikoa"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Generic 3 Button Mouse (serial)"
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "IP helbidea"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (serial)"
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "Maskara (Netmask)"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Zuzena da?"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../partition_table.pm_.c:528
-msgid "Extended partition not supported on this platform"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP helbidea hurrengo formatuan 1.2.3.4"
+
+#: ../../network.pm_.c:341
+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 ""
+"Ostalariaren izena sartu mesedez.\n"
+"Zure ostalariaren izena guztiz gaitua behar du izan,\n"
+"honakoa bezala ``nirekutxa.niregela.nirelantegia.com''.\n"
+"Atariaren (gateway) IP helbidea sar dezakezu horrelakorik baduzu"
+
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "DNS zerbitzaria"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "Ataria (gateway)"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "Atariko tresna (gateway device)"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "Proxien konfigurazioa"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy-a honelakoa http://..."
 
-#: ../../partition_table.pm_.c:546
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy-a honelakoa ftp://..."
+
+#: ../../partition_table.pm_.c:540
+msgid "Extended partition not supported on this platform"
+msgstr "Plataforma honek ez du onartzen hedatutako(extended) partiziorik"
+
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4021,21 +5202,21 @@ msgstr ""
 "Soluzio bakarra da lehen mailako partizioak mugitzea eta zuloa "
 "hedatutako(extended) partizioen parean uztea"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Errorea %s fitxategia irakurtzerakoan"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "%s fitxategitik berreskuratzen: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Backup fitxategi kaxkarra"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "%s fitxategia idazterakoan errorea"
@@ -4069,42 +5250,51 @@ msgstr "interesgarria"
 msgid "maybe"
 msgstr "litekeena"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (garrantzitsua)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (oso ederra)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (ederra)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Gutxiago erakutsi"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Gehiago erakutsi"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Bertoko irarkola"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "Urrutiko lpd"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "Urrutiko irarkola"
+
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "Urrutiko CUPS zerbitzaria"
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "Urrutiko lpd zerbitzaria"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "Sareko irarkola (socket)"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "Irarkolaren Tresna URI"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Unitateak ezabatzen..."
@@ -4118,11 +5308,11 @@ msgstr "Kaiak saiatzen"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Irarkola, \"%s\" modelokoa, hurrengo tokian aurkitua:"
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Bertoko Irarkolaren Tresna"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4130,15 +5320,15 @@ msgstr ""
 "Zein tresnetara konektatzen da zure irarkola \n"
 "(kasu! /dev/lp0 eta LPT1 gauza bera dira:)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Irarkolaren Tresna"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Urrutiko lpd Irarkolaren Aukerak"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4149,19 +5339,19 @@ msgstr ""
 "eta isatsaren izena eman behar duzu.\n"
 "Lanak bertatik inprimatu daitezen."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Urrutiko ostalari izena"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Urrutiko isatsa"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) Irarkolaren Aukerak"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4176,27 +5366,27 @@ msgstr ""
 "irarkolaren banatze izena, erabiltzailearen izena,\n"
 "pasahitza eta lantaldearen informazioa."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "SMB zerbitzariaren ostalaria"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "SMB zerbitzariaren IP"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Banatze izena"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Lantaldea"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "NetWare Irarkolen Aukerak"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4209,154 +5399,220 @@ msgstr ""
 ", erabili nahi duzun irarkolaren izena eta beharrezko daitezken\n"
 "erabiltzaile izena eta pasahitza."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Inprimatze zerbitzaria"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Inprimatze isatsaren izena"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "Socket-eko irarkolaren aukerak"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"Socket irarkolan inprimitzeko, irarkolaren ostalari izena\n"
+"eta aukeran, kaiaren zenbakia."
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "Irarkolaren ostalari izena"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "Kaia"
+
+#: ../../printerdrake.pm_.c:155
+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:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Zein da zure irarkola mota?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Inprimaketaren testa egin nahi duzu?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Test orria(k) inprimatzen ..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\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"
+"Inprimatze egoera:\n"
+"%s\n"
+"\n"
+"Egokiro dabil?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"Inprimatze deabrura bialdu da/dira test orria/k.\n"
+"Irarkola lanean hasteko denboratxoa behar lezake.\n"
+"Egokiro dabil?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Bai, ASCII orria inprimatu test modura"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Bai, PostScript orria inprimatu test modura"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Bai, orri biak inprimatu"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Konfiguratu irarkola"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Zein da zure irarkola mota?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Irarkolaren aukerak"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Paperaren tamaina"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Lana bukatzerakoan papera kanporatu?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Uniprint driver-aren aukerak"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Kolore sakontzsunaren aukerak"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
-msgstr ""
+msgstr "Testua PostScript bezala inprimatu?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
-msgstr ""
+msgstr "Orriak atzetik aurrerako ordenean"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Mailada-hurrats testu finkoa?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
-msgstr ""
+msgstr "Orrialdeen kopurua, irtendako orrialdeen arabera"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
-msgstr ""
+msgstr "Eskubi/Ezker marginak puntuetan (erpuruaren 1/72)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr ""
+msgstr "Goi/Beheko marginak puntutan (erpuruaren 1/72)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
-msgstr ""
+msgstr "GostScript aukera estrak"
 
-#: ../../printerdrake.pm_.c:187
-#, fuzzy
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
-msgstr "Kolore sakontzsunaren aukerak"
-
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Inprimaketaren testa egin nahi duzu?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Test orria(k) inprimatzen ..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\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"
-"Inprimatze egoera:\n"
-"%s\n"
-"\n"
-"Egokiro dabil?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"Inprimatze deabrura bialdu da/dira test orria/k.\n"
-"Irarkola lanean hasteko denboratxoa behar lezake.\n"
-"Egokiro dabil?"
+msgstr "Testu aukera estrak"
 
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Irarkola"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Irarkolarik konfiguratu nahi duzu?"
 
-#: ../../printerdrake.pm_.c:243
-#, fuzzy
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
 msgstr ""
-"Hemen daude LILOko hurrengo sarrerak.\n"
+"Hemen daude  hurrengo irarkola isatsak.\n"
 "Zenbait gehitu edo daudenak aldatu dezakezu."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "CUPS abiarazten"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr "CUPSen gidari databasea irakurtzen..."
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Irarkolaren konexioa hautatu"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Zelan dago irarkola konektatua?"
 
-#: ../../printerdrake.pm_.c:272
-#, fuzzy
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "Irarkolaren urrutiko konexioa hautatu"
+
+#: ../../printerdrake.pm_.c:388
+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\"."
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
-msgstr "Urrutiko isatsa"
+msgstr "Kendu isatsa"
 
-#: ../../printerdrake.pm_.c:273
-#, fuzzy
+#: ../../printerdrake.pm_.c:400
+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?"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "Irarkolaren izena"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "Deskripzioa"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "Kokapena"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4365,50 +5621,47 @@ msgid ""
 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 behaur dira isats honetarako?"
+"izen eta direktorio erabili behar dira isats honetarako?"
 
-#: ../../printerdrake.pm_.c:276
-#, fuzzy
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
-msgstr "Isatsaren izena:"
+msgstr "Isatsaren izena"
 
-#: ../../printerdrake.pm_.c:277
-#, fuzzy
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
-msgstr "Metaketa direktorioa:"
+msgstr "Metaketa direktorioa"
 
-#: ../../printerdrake.pm_.c:278
-#, fuzzy
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
-msgstr "Irarkolaren konexioa hautatu"
+msgstr "Irarkolaren konexioa"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, 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:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Fitxategia ezin idatz: $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid-ek huts egin du"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid-ek huts egin du (agian raidtools-ak galdu egin dira?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ez dago partizio nahikorik %d RAID mailarako\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, aldiroko komando programatzailea"
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4416,7 +5669,7 @@ msgstr ""
 "apmd bateriaren egoera aztertzeko da eta syslog-en bitartez lortzeko.\n"
 "Bateria gutxi dagoenean makina itzaltzeko erabil daiteke ere."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4424,7 +5677,7 @@ msgstr ""
 "atindarrean dagoenean at komandoan esan bezala, komandoak abiarazten ditu,\n"
 "eta batch komandoak abiarazten ditu karga gutxi dagoenean."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4436,7 +5689,7 @@ msgstr ""
 "UNIX programa standarra da. vixie cron ezaugarriak gehitzen dituoinarriko\n"
 "UNIX cron-era, segurtasun hobea eta konfigurazio tresna ahalmentsuak."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4448,7 +5701,7 @@ msgstr ""
 "ebaki-eta-itsatsi operazioak,\n"
 "eta konsolako pop-up menuentzako soportea ematen du."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4457,7 +5710,7 @@ msgstr ""
 "zerbitzatzeko\n"
 "erabilgarri."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4473,7 +5726,7 @@ msgstr ""
 "erantzunkizun\n"
 "diren zerbitzu guztiak etetzen ditu."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4484,7 +5737,7 @@ msgstr ""
 "erabiliaz hauta genezake.\n"
 "Makina gehienentzako ezinbestekoa da."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4493,7 +5746,7 @@ msgstr ""
 "Irarkolara\n"
 "doazen lanak kudeatzen duen zerbitzaria da."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4501,7 +5754,7 @@ msgstr ""
 "named (BIND) Domain Name Server-a (DNS) da, honek ostalarien izenak\n"
 "IP helbidetan bihurtzen ditu."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4509,7 +5762,7 @@ msgstr ""
 "Network File System-ak (NFS) muntatu eta desmontatzen ditu, SMB (Lan\n"
 "Manager/Windows), eta NCP (NetWare) muntai puntuak."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4517,7 +5770,7 @@ msgstr ""
 "Abiaratzekoan hasteko dauden sare interfazeak aktibatu/desaktibatu\n"
 "egiten ditu."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4527,7 +5780,7 @@ msgstr ""
 "Zerbitzu honek, NFS zerbitzariaren funtzioa ematen du,\n"
 "/etc/exports fitxategiak konfiguratua."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4535,7 +5788,7 @@ msgstr ""
 "NFS, TCP/IP sareetan fitxategiak banatzeko protokoloa da.\n"
 "Zerbitzu honek, NFS fitxategi-giltza funtzioa ematen du."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4546,7 +5799,7 @@ msgstr ""
 "da. Ez da hasiko ez badago konfiguratua, beraz gomendagarria da\n"
 "beharrezko ez duten maniketan instalatzea."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4557,7 +5810,7 @@ msgstr ""
 "erabiltzen dutena. Portmap zerbitzaria erabili beharda\n"
 "RPC mekanismoa erabiltzen duten zerbitzarietan."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4565,7 +5818,7 @@ msgstr ""
 "Postfix Mail Transport Agentea da, makinen arteko postari\n"
 "lana egiten duen porgrama da."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4574,7 +5827,7 @@ msgstr ""
 "zenbakien\n"
 "sorrerarako."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4585,7 +5838,7 @@ msgstr ""
 "handientzako\n"
 "routing protokolo konplexuagoak behar dira."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4593,7 +5846,7 @@ msgstr ""
 "Rstat protokoloak sareko edozein makinaren\n"
 "funtzionamendua neur lezake."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4601,7 +5854,7 @@ msgstr ""
 "Rusers protokoloak sareko edozein makina darabilen\n"
 "erabiltzaileak identifikatu lezake."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4609,7 +5862,7 @@ msgstr ""
 "Rwho protokoloak kanpoko erabiltzaileei, rwho deabrua erabiltzen dutenen\n"
 "zerrenda lortzen du (finger-en antzekoa)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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."
@@ -4617,58 +5870,213 @@ msgstr ""
 "Syslog-a deabruek erabiltzen dute sistemen log fitxategietan\n"
 "log mezuak uzteko. Komenigarria da beti indarrean izatea."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr ""
 "Abiatzeko script honek zure usb saguarentzako moduluak kargatzen saiatuko da."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
 "X Font Zerbitzaria piztu eta itzali egiten du, pizterakoan eta itzaltzerakoan"
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Hautatu zein zerbitzu hasiko den automatikoki abiatzerakoan"
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
+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 ""
+"Partizio taula ezin irakurri, zeharo galduta:(\n"
+"Partizio txarrak hustutzen saiatuko naiz"
+
+#: ../../standalone/drakboot_.c:25
+msgid "Configure LILO/GRUB"
+msgstr "Konfiguratu LILO/GRUB"
+
+#: ../../standalone/drakboot_.c:26
+msgid "Create a boot floppy"
+msgstr "Abiaratze flppy-a eraiki"
+
+#: ../../standalone/drakboot_.c:28
+msgid "Format floppy"
+msgstr "Formateatu floppy-a"
+
+#: ../../standalone/drakboot_.c:40
+msgid "Choice"
+msgstr "Aukera"
+
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "LILOren instalazioak porrot egin du. Errore hau izan da:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Internet konexioare banaketa gaitua"
+
+#: ../../standalone/drakgw_.c:104
+#, fuzzy
 msgid ""
-"Welcome to SILO the operating system chooser!\n"
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently enabled.\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"What would you like to do?"
+msgstr "Internet konexiaren banaketaren egokierak eginda.\n"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Taula"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Konfiguratu X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Internet konexioaren banaketa ezgaitua"
+
+#: ../../standalone/drakgw_.c:123
+#, fuzzy
+msgid ""
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently disabled.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or\n"
-"wait %d seconds for default boot.\n"
+"What would you like to do?"
+msgstr "Internet konexiaren banaketaren egokierak eginda.\n"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Taula"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "Config fitxategia ezin ulertu."
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "Internet konexio banatua"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
 msgstr ""
-"Ongi etorria SILOra, sistema eragilearen hautatzailera!\n"
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Markatze modua"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "Ez duzu sare-egokitzailerik zure sisteman!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Ez duzu konfiguratutako Ethernet egokitzailerik zure sisteman. Mesedez "
+"harwarearen konfigurazio tresna erabili."
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
 "\n"
-"Aukeren zerrenda ikusteko <TAB> sakatu.\n"
+"$interface\n"
 "\n"
-"Kargatzeko, izena idatzi eta <ENTER> sakatu <ENTER> edo itxaron %d segundu "
-"jatorriz hautatutakoa abiatzeko.\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"Konfiguratutako sare-egokitzaile bakarra duzu:\n"
 "\n"
+"$interfazea\n"
+"\n"
+"Zure LANa egokitzaile horrekin konfiguratu nahi?"
 
-#: ../../standalone/drakboot_.c:24
-#, fuzzy
-msgid "Configure LILO/GRUB"
-msgstr "Konfiguratu X"
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr "Mesedez hauta zein sare-egokitzaile izango duzuzure LANerako."
 
-#: ../../standalone/drakboot_.c:25
-#, fuzzy
-msgid "Create a boot floppy"
-msgstr "Bootdisk-a eraiki"
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"Adi, sare egokitzailea dagoeneko konfiguratua.\n"
+"Berriro konfiguratu nahi duzu?"
 
-#: ../../standalone/drakboot_.c:27
-#, fuzzy
-msgid "Format floppy"
-msgstr "Dena formateatu"
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr "Litekeen LAN helbidearen konfliktoa oraingo $_-ren konfigurazioan!\n"
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "Firewall konfigurazioa aurkitua!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+"Kasu! Esistitzen den firewall konfigurazioa aurkitu da. Agian\n"
+"eskuzko finkapena egin beharko duzu instalazioa eta gero. Aurrera jo?"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+"Konfigurazioko script-ak, softwarea instalatzen, zerbitzariak abiarazten..."
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakgw_.c:282
 #, fuzzy
-msgid "Choice"
-msgstr "ederra"
+msgid "Configuring..."
+msgstr "IDE Konfiguratzen"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "Ezin instalatu ipchains RPM urpmi-z."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "Ezin instalatu dhcp RPM urpmi-z."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "Ezin instalatu linuxconf RPM urpmi-z."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "Ezin instalatu bind RPM urpmi-z."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "Ezin instalatu caching-nameserver RPM urpmi-z"
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Zorionak!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
@@ -4732,23 +6140,35 @@ msgstr "Hautatu segurtasun neurria"
 msgid "Choose the tool you want to use"
 msgstr "Instalatu nahi duzun tresna hautatu"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Zein da zure teklatuaren itxura?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Aldatu erresoluzioa"
+
+#: ../../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 ""
+"Aldatu Cd-Rom-a!\n"
+"\n"
+"Mesedez, \"%s\" izena duen Cd-Rom-a sartu unitatean eta gero Ok sakaegizu.\n"
+"Ez baldin baduzu Etsi sakatu Cd-Rom-etiko instalazioa ezeztatzeko."
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Zein da zure sagu mota?"
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "ez dut aurkitu serieko_usb-rik\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Emulatu hirugarren botoia?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Zure sagua serieko zein kaietara dago konektatua?"
 
@@ -4961,15 +6381,873 @@ msgstr "Oztoak bilatzen"
 msgid "Finding leaves takes some time"
 msgstr "Oztoen bilaketak denbora hartzen du"
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Interneten konfigurazioa"
+
+#, fuzzy
+msgid "Internet"
+msgstr "interesgarria"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+#, fuzzy
+msgid "Office"
+msgstr "ederra"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multimedia"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multimedia"
+
+#, fuzzy
+msgid "Gnome"
+msgstr "batez"
+
+#, fuzzy
+msgid "Documentation"
+msgstr "Egiaztapena"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Instalatu nahi duzunaren tamaina hautatu"
+
+#~ msgid "Total size: "
+#~ msgstr "Tamaina guztira: "
+
+#~ msgid "Reconfigure local network"
+#~ msgstr "Berkonfiguratu bertoko sarea"
+
+#~ msgid ""
+#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Zure konputagailuaren Internet konexioa banatu dezakezu.\n"
+#~ "\n"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "Dana konfiguratua izan da.\n"
+
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Internetera konektatu modem arruntaz"
+
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Interentera konektatu ISDN-z"
+
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Internetera konektatu DSL-z (edo ADSL-z)"
+
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Internetera konektatu kablez"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Zein partizio mota nahi duzu?"
+
+#~ 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Hautatu \"Instalatu\" GNU/Linux-en aurretiko bertsiorik ez badago "
+#~ "instalatuta,\n"
+#~ "edo distribuzio edo bertsio bat baino gehiago erabili nahi baduzu.\n"
+#~ "\n"
+#~ "Hautatu \"Eguneratu\" Mandrake-ren aurretiko bertsioren bat eguneratu nahi "
+#~ "izanez gero.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hauta:\n"
+#~ "\n"
+#~ "  - Gomendatua: inoiz ez baduzu Linux-ik instalatu.\n"
+#~ "\n"
+#~ "  - Norberarena: GNU/Linux ezagutzen baduzu, gero makinaren erabilera "
+#~ "nagusia hauta\n"
+#~ " dezakezu. behean ikus.\n"
+#~ "\n"
+#~ "  - Aditua: GNU/Linux menperatzen duzula suposatzen da eta\n"
+#~ "    oso berezitua de instalazioa egin nahi duzula. \"Norberarena\"\n"
+#~ "    instalazio motan bezala, zure makinaren erabilera hautatu ahal izango "
+#~ "duzu zure sistemarako.\n"
+#~ "    Baina mesedez, EZ HAUTA HAU ZERTAN ZABIZENEN EZ BADAKIZU!\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "Orain, Linux-Mandrake 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 egindakoak).\n"
+#~ "Bestera, disko zurrunaren partizioak definitu behar dira. Hau egoterakoan\n"
+#~ "konputagailuaren disko zurruna erabilera desberdinetarako area "
+#~ "desberdinetan\n"
+#~ "zatitzen da.\n"
+#~ "\n"
+#~ "\n"
+#~ "Partizio berriak egin nahi izanez gero, erabili \"Auto allocate\" "
+#~ "etahorrela\n"
+#~ "Linux-ek partizio berriak egingo ditu automatikoki. Zatitu beharreko diskoa\n"
+#~ "hautatzuko \"hda\" kliklatu lehenengo IDE diskorako,\n"
+#~ "\"hdb\" bigarrenerako edo \"sda\" lehenengo SCSI diskorako eta horrela ere "
+#~ "urrengokoak.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ohiko partizioak dira: root (/), direktorioen ierarkian sistemaren "
+#~ "fitxategien hasiera\n"
+#~ "puntua dena, eta /boot,konputagailua pizterakoan\n"
+#~ "sistema eragilea abiarazteko beharrezko diren\n"
+#~ "fitxategiak duena.\n"
+#~ "\n"
+#~ "\n"
+#~ "Partizio prozeduraren ekintzak atzerako biderik izan ohi ez dutenez,\n"
+#~ "esperientziarik ez duenarengan beldurra eta larritasuna eragin diezaioke. "
+#~ "DiskDrake-k\n"
+#~ "prozedura errazten du izua uxatzeko. Dokumentazioa kontsultatu eta\n"
+#~ "har ezazu behar duzun denbora hasi aurretik.\n"
+#~ "Teklatua erabiliz edozien aukeraz baliatu zaitezke: partizioetatiknabigatu\n"
+#~ "Tab eta Gora/Bera geziez. Behin partizioa hautatua, zera erabil zenezake:\n"
+#~ "\n"
+#~ "- Ctrl-c  partizio berria eraikitzeko (partizio hutsa hautatzekotan)\n"
+#~ "\n"
+#~ "- Ctrl-d  partizioa ezabatzeko\n"
+#~ "\n"
+#~ "- Ctrl-m  muntai puntua ezartzeko\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."
+#~ msgstr ""
+#~ "Berriki ezarritako edozein partizio formateatu beharko da erabilgarria\n"
+#~ "izateko (formateatu esan nahi du sistemen fitxategiak ezartzea). Orain, "
+#~ "agian\n"
+#~ "esistitzen direnetako zenbait partizio formateatu nahiko duzu, bertako "
+#~ "datuak\n"
+#~ "ezabatzeko. Oharra: aurretik zeuden partizioak formateatzea ez da "
+#~ "beharrezkoa\n"
+#~ "batez ere, mantendu nahi dituzun fitxategi eta datuak gordetzen baditu.\n"
+#~ "Normalean /home eta /usr/local dira gordetzen direnak."
+
+#~ 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."
+#~ msgstr ""
+#~ "Hautatutako paketeak instalatzen ari dira. Operazio honek\n"
+#~ "minutu gutxi batzuk iraun lezake, baina sistema eguneratzea hautatu\n"
+#~ "baduzu are gehiago iraun lezake operazioak eguneratzea egin beharko\n"
+#~ "delako."
+
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "DrakX-ek ez du sagurik aurkitzen ez badu, edo egindakoa\n"
+#~ "aztertu nahi baduzu, gainean duzun saguen zerrenda duzu\n"
+#~ "eskura.\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX'-en aukerekin ados bazaude settings, 'Ados' sakatu.\n"
+#~ "Bestela, zure saguarekin antza handiena zukeen sagua hautatu\n"
+#~ "menuan.\n"
+#~ "\n"
+#~ "\n"
+#~ "Seriean konektatutako sagua izanez gero, DrakX-i\n"
+#~ "serie-kaia adierazi beharko diozu."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "Atal hau bertoko sarea (LAN) edo modem-a konfiguratzeko\n"
+#~ "da\n"
+#~ "\n"
+#~ "Hautatu \"Bertoko LAN\" eta DrakX-ek\n"
+#~ "zure makinako Ethernet egokitzailea bilatzen saiatuko da. PCI egokitzaileak\n"
+#~ "automatikoki bilatu eta abiarazten dira.\n"
+#~ "Dena den, zure periferikoa ISA bada, autodetekzioak huts egingo du,\n"
+#~ "eta orduan agertuko zaizun zerrendatik hautatu beharko duzu driver-a.\n"
+#~ "\n"
+#~ "\n"
+#~ "SCSI egokitzaileentzat gertatzen den moduan, lehen aldian driverrak\n"
+#~ "egokitzailea frogatu lezake bere kabuz, bestela aukerak adierazi\n"
+#~ "beharko dizkiozu driver-ari, aukerak dokumentazioan edo harwarean\n"
+#~ "aurki ditzakezu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Linux-Mandrake sistema sare batean dagoen konputagailuan\n"
+#~ "instalatuz gero, sare administrariak beharrezko duzun informazioa eman "
+#~ "beharko dizu\n"
+#~ "(IP helbidea, sareko submaskara\n"
+#~ "edo netmask, eta ostalariaren izena). Zure sare pribatua\n"
+#~ "instalatzen ari bazara helbidea hautatu beharko\n"
+#~ "duzu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hautatu \"Deitu modem-ez\" eta modem bitarteko internet\n"
+#~ "konexioa konfiguratuko da. DrakX-ek, zure modem-a bilatzen saiatuko da\n"
+#~ "hau huts eginez gero aukeratu beharko duzu modem-aren serieko kaia\n"
+#~ "zein den."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "GNU/Linux-ek irarkola mota ugari erabil ditzake. Bakoitzak\n"
+#~ "bere egokiera behar du. Dena den kontuan izan irarkolaren isatsak\n"
+#~ " 'lp' izena jatorriz ezartzen duela; beraz izen hau duen irarkola\n"
+#~ "beharko duzu; baina zenbait izen eman ditzakezu irarkola berari\n"
+#~ "izenok '|' karaktereaz banatuz gero.\n"
+#~ "Beraz esanguratsua egingo zaizun izena eman nahi badiozu irarkolari "
+#~ "aurretik\n"
+#~ "jarri, adibidea: \"Nire irarkola|lp\".\n"
+#~ "Izenean \"lp\" duen irarkola jatorrizkoa izanen da.\n"
+#~ "\n"
+#~ "\n"
+#~ "Irarkola zuzenean konputagailuari lotuta egonez gero hautatu\n"
+#~ "\"Bertoko irarkola\". Gero zein kaietara lotuta dagoen adierazi\n"
+#~ "beharko duzu, eta iragazki egokia hautatu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Urruneko Unix makinari lotutako irarkola erabili nahi izanez gero,\n"
+#~ "hautatu \"Urruneko lpd\". Indarrean sartzeko\n"
+#~ ", ez da beharrezko erabiltzaile izena ez eta pasahitzik, baina\n"
+#~ "zerbitzariaren inprimitze isatsaren izena jakin beharko duzu.\n"
+#~ "\n"
+#~ "\n"
+#~ "SMB irarkola erabili nahi izanez gero (hau da,\n"
+#~ "urruneko Windows 9x/NT makinan kokatutakoa),\n"
+#~ "SMB izena (ez TCP/IP izena)eman beharko duzu, eta agian IP helbidea ere,\n"
+#~ "gehi erabiltzaile izena, lantaldea eta irakola erabiltzeko beharrezkoa\n"
+#~ "den pasahitza, eta, nola ez, irarkolaren izena. Bardin\n"
+#~ "NetWare irarkolentzako, baina kasu honetan ez duzu lantalde izenik eman "
+#~ "beharrik."
+
+#~ 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."
+#~ msgstr ""
+#~ "Oso gomendatua da hemen \"Bai\" erantzutea. Microsoft Windows\n"
+#~ "gerorago instalatzekotan boot sektorea ezabatuko dizu.\n"
+#~ "Esan zaizun bezala boot diskorik egin ez baduzu ezin izango duzu\n"
+#~ "GNU/Linux abiatu."
+
+#~ msgid "Move your wheel!"
+#~ msgstr "Higiarazi pilotatxoa!"
+
+#~ msgid "Install/Rescue"
+#~ msgstr "Instalatu/Berreskuratu"
+
+#~ msgid "Rescue"
+#~ msgstr "Berreskuratu"
+
+#~ msgid "Germany"
+#~ msgstr "Germaniarra"
+
+#~ msgid "Germany (1TR6)"
+#~ msgstr "Germaniarra (1TR6)"
+
+#~ msgid "What do you wish to do?"
+#~ msgstr "Zer egin nahiko zenuke?"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Aldaketak ahaztu?"
+
+#~ msgid "Cable connection"
+#~ msgstr "Kablearen konexioa"
+
+#~ msgid "Host name:"
+#~ msgstr "Ostalariaren izena:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Zein da zure sagu mota?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Erresoluzio automatikoak"
+
+#~ 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"
+#~ msgstr ""
+#~ "Eskuragarri dauden erresoluzioak bilatzearren, zenbaitzuk frogatuko ditut.\n"
+#~ "Pantailak kliskatuko du...\n"
+#~ "Irten zaitezke nahi baduzu, bukatzerakoan beep-a entzengo duzu"
+
+#~ 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?"
+#~ msgstr ""
+#~ "Eskuragarri dauden erresoluzioak aurkitzen saia naiteke (eg: 800x600).\n"
+#~ "Batzutan honen ondorioz makina eskegi daiteke.\n"
+#~ "Saiatuko naiz??"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Modu egokirik ezin aurkitu\n"
+#~ "Bestelako txartel edo monitoreaz saia zaitez"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Bilatu erresoluzio automatikoak"
+
+#~ msgid "curly"
+#~ msgstr "kizkurra"
+
+#~ msgid "default"
+#~ msgstr "Jatorrizkoa"
+
+#~ msgid "tie"
+#~ msgstr "gorbata"
+
+#~ msgid "brunette"
+#~ msgstr "brunette"
+
+#~ msgid "girl"
+#~ msgstr "neska"
+
+#~ msgid "woman-blond"
+#~ msgstr "ile-horia"
+
+#~ msgid "automagic"
+#~ msgstr "automagikoa"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "nfs-aren muntaiak porrot egin du"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Enkriptatua"
+
+#~ msgid "Take over the hard drive"
+#~ msgstr "Hartu disko zurrun osoa"
+
+#~ msgid "Normal"
+#~ msgstr "Arrunta"
+
+#~ msgid "Do not set up networking"
+#~ msgstr "Sare lana ez egokitu"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "Zure sistemarako bertoko LAN sarea konfiguratu nahi duzu?"
+
+#~ 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?"
+#~ msgstr ""
+#~ "DrakX-ek, XFree 3.3 eta XFree 4.0.-rako konfigurazio fitxategiak eratuko "
+#~ "ditu.\n"
+#~ "Jatorriz, 4.0 zerbitzaria erabiltzen da zure txartelak berau jasanez gero.\n"
+#~ "\n"
+#~ "XFree 3.3 mantendu nahi?"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB Sagua"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB sagua (2 botoi)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB sagua(3 botoi edo gehiago)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB sagua"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "USB sagua (2 botoi)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB sagua (3 botoi edo gehiago)"
+
+#~ msgid "Logitech MouseMan/FirstMouse"
+#~ msgstr "Logitech MouseMan/FirstMouse"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus Mouse"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Bus Mouse"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech Bus Mouse"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB Mouse"
+
+#~ 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?"
+
+#~ msgid "Show less"
+#~ msgstr "Gutxiago erakutsi"
+
+#~ msgid "Show more"
+#~ msgstr "Gehiago erakutsi"
+
+#~ msgid "Local Area Network specification"
+#~ msgstr "LANen espezifikazioak"
+
+#~ msgid "You may now decide which class C network to use.\n"
+#~ msgstr "Orain erabaki dezakezu zein C motako sarea erabili.\n"
+
+#~ msgid "Network:"
+#~ msgstr "Sarea:"
+
+#~ msgid "Internet Connection Sharing - setup of $device"
+#~ msgstr "Internet konexioaren banaketa - $tresnaren egokiera"
+
+#~ msgid ""
+#~ "The following interface is about to be configured:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Hurrengo interfacea konfiguratuko da:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+
+#~ msgid "Everything configured!"
+#~ msgstr "Dana konfiguratua!"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Zein da zure teklatuaren itxura?"
+
+#~ msgid "Configure my card"
+#~ msgstr "Konfiguratu nire txartela"
+
+#~ msgid "pptp alcatel"
+#~ msgstr "pptp alcatel"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Saiatuko naiz PCMCIA txartelak bilatzen?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "Saiatuko naiz %s unitateen bilaketan?"
+
+#~ msgid "Small(%dMB)"
+#~ msgstr "Txikia (%dMB)"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "Modem-aren konfigurazioa"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr ""
+#~ "Zure sistemarako modem-markazioaren bitartezko sare-lana konfiguratu nahi "
+#~ "duzu?"
+
+#~ msgid "Do you want to configure a ISDN connection for your system?"
+#~ msgstr "Zure sistemarako bertoko ISDN konexioa konfiguratu nahi duzu?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "Saiatuko naiz PCI unitateen bilaketan?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "root partizioaren bila."
+
+#~ 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 "Can't use broadcast with no NIS domain"
+#~ msgstr "NIS domeinurik gabe ezin erabili broadcast"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "Mesedez hauta zein partizio erabili nahi duzu root partizio modura."
+
+#~ msgid "Autologin at startup"
+#~ msgstr "Autologin abiatzerakoan"
+
+#~ msgid "Autologin - Choose default user"
+#~ msgstr "Autologin - Hauta jatorrizko erabiltzailea"
+
+#~ msgid "You don't have any windows partitions!"
+#~ msgstr "Windows partiziorik ez duzu!"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "Linux4win-erako leku nahikorik ez duzu"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "Automatikoa"
+
+#~ 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 ""
+#~ "Ongi etorria LILOra, sistema eragilearen hautatzailera!\n"
+#~ "\n"
+#~ "Aukeren zerrenda ikusteko <TAB> sakatu.\n"
+#~ "\n"
+#~ "Kargatzeko, izena idatzi eta <ENTER> sakatu <ENTER> edo itxaron %d segundu "
+#~ "jatorriz hautatutakoa abiatzeko.\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
+#
+#~ 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 ""
+#~ "Ongi etorria SILOra, sistema eragilearen hautatzailera!\n"
+#~ "\n"
+#~ "Aukeren zerrenda ikusteko <TAB> sakatu.\n"
+#~ "\n"
+#~ "Kargatzeko, izena idatzi eta <ENTER> sakatu <ENTER> edo itxaron %d segundu "
+#~ "jatorriz hautatutakoa abiatzeko.\n"
+#~ "\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "SILOren aukera nagusiak"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "Hemen daude SILOko hurrengo sarrerak.\n"
+#~ "Zenbait gehitu edo daudenak aldatu dezakezu."
+
+#~ msgid "This label is already in use"
+#~ msgstr "Etiketa hau dagoeneko erabiltzen da"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "SILOren instalazioak porrot egin du. Errore hau izan da:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX-ek PCI edo SCSI egokitzaileak bilatzen saiatuko da aldez aurretik.\n"
+#~ "Aurkitzekotan eta drivera(k) ezagutz geronautomatikoki ezarriko ditu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Zure SCSI egokitzailea ISA bada, edo DrakX-ek ezagutzen ez duen\n"
+#~ "PCIa bada, edo SCSI egokitzailerik ez baduzu, orduan zera galdetuko zaizu;\n"
+#~ "ia SCSI egokitzailerik duzun ala ez.\n"
+#~ "Ez badaukazu \"Ez\" erantzun. Bat edo gehiago baduzu,\n"
+#~ "erantzun \"Bai\". driver zerrenda agertuko zaizu, eta bertatik bat hautatu\n"
+#~ "beharko duzu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Driver-a hautatu ondoren, DrakX-ek aukerak eman nahi badiozu\n"
+#~ "galdetuko dizu. Lehenengo, utzi driver-ari harwarea frogatzen:\n"
+#~ "gehienetan ongi dabil.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ez badabil, zure Windows-aren (hau bada zure sistema) harwarearen "
+#~ "informazioa\n"
+#~ "dokumentaziotik lor dezakezu, instalazio gidan iradokitzen denez.\n"
+#~ "Hor izango dira driver-ari eman beharreko\n"
+#~ "aukerak."
+
+#~ msgid "Shutting down"
+#~ msgstr "Itzaltzen"
+
 #~ msgid "useless"
 #~ msgstr "erabileza"
 
 #~ msgid "garbage"
 #~ msgstr "zarama"
 
-#~ msgid "Recommended"
-#~ msgstr "Gomendatua"
-
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
@@ -5134,18 +7412,12 @@ msgstr "Oztoen bilaketak denbora hartzen du"
 #~ msgid "Hurt me plenty"
 #~ msgstr "Dena niretzat"
 
-#~ msgid "Which usage do you want?"
-#~ msgstr "Zein erabilera nahi duzu?"
-
 #~ msgid "Which packages do you want to install"
 #~ msgstr "Zeintzuk pakete instalatu nahi duzu"
 
 #~ msgid "Local LAN"
 #~ msgstr "Bertoko LAN"
 
-#~ msgid "Dialup with modem"
-#~ msgstr "Modemarekin markatu"
-
 #~ msgid "Installation CD Nr 1"
 #~ msgstr "Instalazioko CD Nr 1"
 
@@ -5155,9 +7427,6 @@ msgstr "Oztoen bilaketak denbora hartzen du"
 #~ msgid "User name:"
 #~ msgstr "Erabiltzailearen izena"
 
-#~ msgid "Partitioning failed: no root filesystem"
-#~ msgstr "Partizioak huts egin du: root fitxategi-sistemik ez"
-
 #~ msgid "Going to install %d MB. You can choose to install more programs"
 #~ msgstr ""
 #~ "%d MB instalatzera noa. Programa gehiago instalatzea hautatu dezakezu"
@@ -5201,9 +7470,6 @@ msgstr "Oztoen bilaketak denbora hartzen du"
 #~ msgid "server"
 #~ msgstr "zerbitzaria"
 
-#~ msgid "Local Printer Options"
-#~ msgstr "Bertoko irarkolaren aukerak"
-
 #~ msgid ""
 #~ "Failed to create an HTP boot floppy.\n"
 #~ "You may have to restart installation and give ``%s'' at the prompt"
diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po
index 12fa50673..581777785 100644
--- a/perl-install/share/po/fi.po
+++ b/perl-install/share/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 17:14+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 2000-05-06 12:42GMT+0200\n"
 "Last-Translator: Kim Enkovaara <kim.enkovaara@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -14,43 +14,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.5(devel)\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "Yleinen"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "N�yt�nohjain"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Valitse n�yt�nohjain"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Valitse X-palvelin:"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X-palvelin"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, fuzzy, c-format
+msgid "XFree %s"
+msgstr "XFree86 palvelin: %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Mink�tyyppisen tietueen haluat lis�t�"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+#, fuzzy
+msgid "XFree configuration"
+msgstr "Asennuksen j�lkeiset toiminnot"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Valitse n�yt�nohjaimen muistim��r�"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Valitse optioita palvelimelle"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Valitse monitori"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "N�ytt�"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -73,39 +121,40 @@ msgstr ""
 "vaakavirkistystaajuus\n"
 "on suurempi kuin oman n�ytt�si. Jos ep�r�it, valitse pienempi taajuus."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Vaakavirkistystaajuus"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Pystyvirkistystaajuus"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "N�ytt�� ei ole asetettu"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "N�yt�nohjainta ei ole viel� asetettu"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "N�yt�n resoluutiota ei ole viel� valittu"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Haluatko kokeilla asetuksia?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+#, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Varoitus: kokeileminen on vaarallista t�ll� n�yt�nohjaimella"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Kokeile asetuksia"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -113,186 +162,168 @@ msgstr ""
 "\n"
 "kokeile joidenkin parametrien muuttamista"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Tapahtui virhe:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Lopetan %d sekunnissa"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "Onko t�m� oikea asetus?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Tapahtui virhe, kokeile joidenkin parametrien vaihtamista"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Automaattiset resoluutiot"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Jotta olemassaolevat resoluutiot l�ydet��n ohjelma kokeilee eri "
-"resoluutioita.\n"
-"N�ytt�si v�l�htelee t�m�n aikana...\n"
-"Voit laittaa n�yt�n pois p��lt� jos haluat, kun haku on valmis ohjelma "
-"piippaa."
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Resoluutio"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Valitse resoluutio ja v�risyvyys"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "N�yt�nohjain: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 palvelin: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "N�yt� kaikki"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Resoluutiot"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Ohjelma voi etsi� olemassaolevat resoluutiot (esim: 800x600).\n"
-"T�m� voi joskus lukita koneen.\n"
-"Haluatko yritt��?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Toimivia n�ytt�tiloja ei l�ytynyt\n"
-"Yrit� toista n�yt�nohjainta tai n�ytt��."
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "N�pp�imist�n j�rjestys: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Hiiren tyyppi: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Hiiren laite: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "N�ytt�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "N�yt�n vaakapoikkeutus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "N�yt�n pystypoikkeutus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "N�yt�nohjain: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Grafiikkamuisti: %s kt\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "V�risyvyysasetukset"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Resoluutiot"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 palvelin: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 palvelin: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Valmistelen X-Window:n asetuksia"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Vaihda n�ytt��"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Vaihda n�yt�nohjainta"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Vaihda palvelimen optioita"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Automaattinen resoluutioiden haku"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "N�yt� tiedot"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Kokeile uudelleen"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Mit� haluat tehd�?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Unohda muutokset?"
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "S�ilyt� nykyiset IP-verkon asetukset"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Kirjaudu uudelleen %s:n aktivoidaksesi muutokset"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Kirjaudu ulos ja k�yt� sitten Ctrl-Alt-BackSpace yhdistelm��"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X k�ynnistyksess�"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -300,227 +331,227 @@ msgstr ""
 "X voidaan laittaa k�ynnistym��n automaattisesti k�ynnistyksen yhteydess�.\n"
 "Haluatko k�ynnist�� X:n automaattisesti?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1152
+#, 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."
+msgstr ""
+"X voidaan laittaa k�ynnistym��n automaattisesti k�ynnistyksen yhteydess�.\n"
+"Haluatko k�ynnist�� X:n automaattisesti?"
+
+#: ../../Xconfigurator.pm_.c:1154
+#, fuzzy
+msgid "Choose the default user:"
+msgstr "Valitse uusi koko"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Valitse haluamasi ty�kalu"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 v�ri� (8 bitti�)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tuhatta v�ri� (15 bitti�)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tuhatta v�ri� (16 bitti�)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 miljoonaa v�ri� (24 bitti�)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 miljardia v�ri� (32 bitti�)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kt"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kt"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 Mt"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 Mt"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 Mt"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 Mt"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 Mt tai enemm�n"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Perus-VGA,  640x480 @ 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 @ 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514-yhteensopiva, 1024x768 @ 87 Hz lomitettu (ei 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 @ 87 Hz lomitettu, 800x600 @ 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Laajennettu Super VGA, 800x600 @ 60 Hz, 640x480 @ 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Korkeataajuuksinen SVGA, 1024x768 @ 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "N�ytt�, joka pystyy 1280x1024 @ 60 Hz tilaan"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "N�ytt�, joka pystyy 1280x1024 @ 74 Hz tilaan"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "N�ytt�, joka pystyy 1280x1024 @ 76 Hz tilaan"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "N�ytt�, joka pystyy 1600x1200 @ 70 Hz tilaan"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "N�ytt�, joka pystyy 1600x1200 @ 76 Hz tilaan"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "cirly"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "oletus"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "tie"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "brunetti"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "girl"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "nainen-blondi"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "automaattinen"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Ensimm�inen sektori k�ynnistysosiolla"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Ensimm�inen levyn sektori (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
+#: ../../any.pm_.c:95
+#, fuzzy
+msgid "SILO Installation"
 msgstr "LILO/grub asennus"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Minne haluat asentaa k�ytt�j�rjestelm�n lataajan?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub asennus"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Ei mik��n"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Mit� k�ynnistysohjelmaa haluat k�ytt��?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+#, fuzzy
+msgid "Bootloader installation"
+msgstr "K�ynnistyslataajan p��asetukset"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "K�ynnistyslaite"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (ei toimi vanhoissa BIOS:ssa)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Tiivis"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "tiivis"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Odota ennen oletusk�ynnistyst�"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "N�ytt�tila"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Odota ennen oletusk�ynnistyst�"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Salasana"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Rajoita komentorivioptioita"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "rajoita"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "K�ynnistyslataajan p��asetukset"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Yrit� uudelleen"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Salasanat poikkeavat toisistaan"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -528,167 +559,386 @@ msgstr ""
 "Eri asetustietueet.\n"
 "Voit lis�t� uusia tai muuttaa olemassaolevia."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Lis��"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Valmis"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Mink�tyyppisen tietueen haluat lis�t�"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
-msgid "Other OS (windows...)"
+#: ../../any.pm_.c:175
+#, fuzzy
+msgid "Other OS (SunOS...)"
 msgstr "Muu k�ytt�j�rjestelm�"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Mink�tyyppisen tietueen haluat lis�t�"
+#: ../../any.pm_.c:175
+msgid "Other OS (windows...)"
+msgstr "Muu k�ytt�j�rjestelm�"
 
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "`Kuva'-tiedosto"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Juuri"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Liit�"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Luku-kirjoitus"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Taulukko"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Turvaton"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Otsikko"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Oletus"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Poista tietue"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Tyhj�� otsikkoa ei sallita"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Otsikko on jo k�yt�ss�"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "L�ysin %s %s liit�nt��"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Onko sinulla muita?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Onko koneessa %s liitynt��?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Ei"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Kyll�"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Asetan ajuria %s ohjaimelle %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(moduli %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Mit� %s:n ajuria kokeillaan?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"Joissakin tapauksissa %s-ajuri tarvitsee lis�tietoja toimiakseen kunnolla,\n"
+"joskin tavallisesti se toimii hyvin ilmankin. Haluaisitko antaa ajurille\n"
+"lis�m��reit� vai annatko sen itse etsi� tarvitsemansa tiedot? Joskus haku\n"
+"voi jumittaa tietokoneen, mutta se ei aiheuta vahinkoa."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Automaattihaku"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Lis�asetukset"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Voit antaa lis�asetuksia modulille %s."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"Voit antaa lis�asetuksia modulille %s.\n"
+"Asetukset ovat muotoa ``nimi=arvo nimi2=arvo2 ...''.\n"
+"Esimerkiksi, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Moduulin optiot:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Modulin %s lataaminen ep�onnistui.\n"
+"Haluatko yritt�� muilla asetuksilla?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Tervetuloa %s kayttojarjestelmanvalitsijaan!\n"
+"\n"
+"Listataksesi mahdolliset valinnat paina <TAB>.\n"
+"\n"
+"Ladataksesi jonkun niista kirjoita sen nimi ja paina <ENTER>\n"
+"tai odota %d sekuntia oletuskaynnistysta.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Tervetuloa GRUB k�ytt�j�rjestelm�nvalitsijaan!"
+
+# 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
+#
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "K�yt� %c ja %c n�pp�imi� valitaksesi korostetun tietueen"
+
+# 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
+#
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr ""
+"Paina enter k�ynnist��ksesi valitun k�ytt�j�rjestelm�n, 'e' muokataksesi"
+
+# 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
+#
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "komennot ennen k�ynnistyst�, tai 'c' komentoriville"
+
+# 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
+#
+#: ../../bootloader.pm_.c:600
+#, 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:604
+msgid "not enough room in /boot"
+msgstr ""
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Ty�p�yt�"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "K�ynnistysvalikko"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "Lopetan %d sekunnissa"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Luo"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Irroita"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Poista"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Alusta"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Uusi koko"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Liitospaikka"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Kirjoita /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Vaihda eksperttitilaan"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Vaihda normaalitilaan"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Palauta tiedostosta"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Tallenna tiedostoon"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Palauta levykkeelt�"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Tallenna levykkeelle"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Tyhjenn� kaikki"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Alusta kaikki"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Automaattinen varaus"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Kaikki prim��riosiot k�ytetty"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Uusia osioita ei voida lis�t�"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -696,59 +946,63 @@ msgstr ""
 "Voidaksesi luoda lis�� osioita tuhoa yksi olemassaoleva osio jotta voisit "
 "luoda laajennetun osion"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Pelasta osiotaulu"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Peruuta"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Kirjoita osiotaulu"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Uudelleenlataa"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Tyhj�"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Muu"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Tyhj�"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Muu"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Tiedostoj�rjestelmien tyypit:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -760,17 +1014,17 @@ msgstr ""
 "Ensim�iseksi suositellaan sen koon muutamista\n"
 "(klikkaa osiota ja valitse sitten \"Uusi koko\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Tee ensin varmuuskopio tiedoistasi"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Lue tarkkaan!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -780,78 +1034,78 @@ msgstr ""
 "sektoria on tarpeeksi)\n"
 "levyn alkuun"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Varo: t�m� on vaarallinen toiminto"
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Virhe"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Liitospiste:"
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Laite:"
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS-asema: %s (vain arvaus)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Tyyppi: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Aloita: sektori %s\n"
 
 # mat
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Koko: %d Mt"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektoria"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Sylinterist� %d sylinteriin %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Alustettu\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Ei alustettu\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Liitetty\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Loopback tiedostot: %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -859,80 +1113,80 @@ msgstr ""
 "Osoiolta k�ynnistet��n oletuksena\n"
 "    (MS-DOS k�ynnistys, ei lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Taso %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Palan koko %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-levyt %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Loopback-tiedoston nimi: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Klikkaa osiota"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Koko: %d Mt\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometria: %s sylinteri�, %s lukup��t�, %s sektoria\n"
 
 # mat
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Osion tyyppi: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "v�yl�ss� %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Liit�"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Lis�� RAID:n"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Poista RAID:ta"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Muokkaa RAID:a"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "K�yt� loopback-tiedostoa"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Valitse toiminne"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -944,7 +1198,7 @@ msgstr ""
 "Joko k�yt�t LILO:a ja se ei toimi, tai et k�yt� LILO:a jolloin et tarvitse "
 "/boot hakemistoa"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -955,68 +1209,70 @@ msgstr ""
 "eik� sinulla ole /boot osiota.\n"
 "Jos haluat k�ytt�� LILO k�ynnistyksenhallintaa, lis�� /boot osio."
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
+#, fuzzy
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "Olet valinnut ohjelmallisen RAID-osion juuriosioksi (/).\n"
 "Mik��n k�ynnistyslataaja ei osaa k�sitell� t�t� ilman /boot osiota.\n"
 "Varmista ett� lis�sit /boot osion jos haluat k�ytt�� liloa tai grub:a"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "K�yt� sijalla ``%s'':��"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "K�yt� ensin ``Irroita'' komentoa"
 
 # mat
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "Osion %s tyypin vaihtamisen j�lkeen kaikki tiedot h�vi�v�t"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Jatka kuitenkin?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Lopeta tallentamatta"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Lopeta kirjoittamatta osiotalua?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Muuta osiotyyppi�"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
 msgstr "Mink� osiotyypin haluat?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
-msgid "You can't use ReiserFS for partition smaller than 32MB"
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr ""
 
 # mat
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Minne haluat liitt�� loopback-tiedoston %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Minne haluat liitt�� laitteen %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1025,140 +1281,145 @@ msgstr ""
 "Poista loopback-tiedosto ensin"
 
 # mat
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Osion %s alustuksen j�lkeen kaikki tiedot h�vi�v�t"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Alustan"
 
 # mat
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Alustan loopback-osiota %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Alustan osiota %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Kaikkien osioiden alustuksen j�lkeen,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "kaikki tieto osioilla tuhoutuu"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Siirr�"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Mille levylle haluat siirt��?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sektori"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Mille sektorille haluat siirt��?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Siirr�n"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Siirr�n osiota..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Levyn %s osiotaulu kirjotetaan levylle!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Sinun t�ytyy k�ynnist�� kone uudelleen jotta muutos tulee voimaan"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Lasken fat-tiedostoj�rjestelm�n rajoja"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Muutan kokoa"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Mink� osiotyypin haluat?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "kaikki osion tiedot tulee varmuuskopioida"
 
 # mat
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "Osion %s koon muutoksen j�lkeen kaikki osion tiedot tuhoutuvat"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Valitse uusi koko"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "Mt"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Luo uusi osio"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Aloitussektori: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Koko Mt: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Tiedostoj�rjestelm�: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Etuoikeus: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Osiota ei voida k�ytt�� loopback-osiona"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Loopback tiedostonimi: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "Tiedosto on jo k�yt�ss� toiselle loopbackille, valitse toinen"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "Tiedosto on jo olemassa. K�yt� sit�?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Valitse tiedosto"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1166,11 +1427,11 @@ msgstr ""
 "Varmuskopio-osiotaululla ei ole samaa kokoa\n"
 "Jatka silti?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1178,78 +1439,78 @@ msgstr ""
 "Aseta levyke asemaan\n"
 "Kaikki levykkeen tiedot h�vi�v�t"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Yrit�n osiotalulun palautusta"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "laite"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "taso"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "palan koko"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Valitse olemassaoleva RAID johon lis�t��n"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "uusi"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s:n alustus %s:ta ep�onnistui"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "en osaa alustaa %s:�� tyyppi� %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "nfs:n liitt�minen ep�onnistui"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "liitt�minen ep�onnistui: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "virhe irroitettaessa %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Liitospisteen pit�� alkaa /-merkill�."
 
 # mat
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Osiolla on jo liitospiste %s\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Rengasmaisia liitoksia %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Virhe avattaessa tiedostoa %s kirjotettavaksi: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1257,75 +1518,81 @@ msgstr ""
 "On tapahtunut virhe - ei l�ytynyt laitteita joille luotaisiin uusi "
 "tiedostoj�rjestelm�. Tarkista laitteistosi korjataksesi ongelman"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Sinulla ei ole yht��n osiota!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "Valitse haluttu kieli asnnukseen ja j�rjestelm�n k�ytt��n."
 
-#: ../../help.pm_.c:10
+#: ../../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 "Valitse n�pp�imist�n j�rjestys allaolevasta listasta"
 
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:25
 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"
-"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).\n"
-"\n"
+"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
+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"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\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"
-msgstr ""
-"Valitse \"Asenna\" jos sinulla ei ole Linuxia ennest��n asennettuna,\n"
-"tai jos haluat k�ytt�� useita eri levitysversioita.\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"
-"Valitse \"P�ivit�\", jos haluat p�ivitt�� vanhaa Mandraken versiota Linux:\n"
-"5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios),\n"
-"Gold 2000 tai 7.0 (Air).\n"
+"\t* Recommanded: 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"
-"Valitse:\n"
-"  - Automaattinen (suositeltu): Jos et ole koskaan asentanut linuxia ennen, "
-"valitse t�m�. HUOMAA:\n"
-"    verkkoa ei aseteta t�ss� asennuksessa, k�yt� \"LinuxConf\" asettaaksesi "
-"verkon\n"
-"    asennuksen j�lkeen.\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - Muokattu: Jos tunnet GNU/Linuxin ennest��n, voit valita erikseen koneen "
-"k�ytt�tarkoituksen.\n"
-"    Katso alta lis�tietoja.\n"
 "\n"
-"  - Ekspertti: 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 TIED� MIT� TEET!\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1333,12 +1600,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Valitse:\n"
 "\n"
@@ -1346,190 +1614,378 @@ msgstr ""
 "k�ytt�tarkoituksen.\n"
 "    Katso alta lis�tietoja.\n"
 "\n"
+"\n"
 "  - Ekspertti: 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 TIED� MIT� TEET!\n"
+"    Mutta �l� valitse t�t�, JOS ET TIED� MIT� TEET!"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
+msgstr ""
+
+#: ../../help.pm_.c:84
+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 ""
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:108
 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"
+"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"
-"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"
+"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"
-"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"
+"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 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."
+"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."
 msgstr ""
-"DrakX yritt�� ensin etsi� yht� tai useampaa PCI\n"
-"SCSI-ohjainta. Jos ohjelma l�yt�� ohjaimia ja tiet�� mit�\n"
-"ajureita ne k�ytt�v�t ohjaimet otetaan k�ytt��n automaattisesti.\n"
+
+#: ../../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"
+"\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"
-"Jos SCSI-ohjaimesi on ISA-v�yl�ss�, tai PCI-v�yl�ss�, mutta\n"
-"DrakX ei tied� mit� ajuria k�ytt�isi ohjaimelle, tai jos sinulla ei ole\n"
-"SCSI ohjaimia ollenkaan, sinulta kysyt��n erikseen onko sinulla\n"
-"ohjaimia vai ei. Jos ohjaimia ei ole, vastaa \"Ei\". Jos sinulla on yksi\n"
-"tai useampia, vastaa \"Kyll�\". Saat t�m�n j�lkeen listan ajureista, joista\n"
-"sinun tulee valita yksi.\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"
-"Valittuasi ajurin DrakX kysyy haluatko m��ritell� ajurille\n"
-"optioita. Anna ajurin ensin itse hakea laitteita:\n"
-"t�m� toimii yleens� hienosti.\n"
+"   * Undo: you can use this option to cancel your changes.\n"
 "\n"
 "\n"
-"Jos t�m�k��n ei toimi �l� unohda tietoja laitteistasi joita voit saada\n"
-"ohjeista tai Windowsista (jos sinulla on se asennettuna),\n"
-"kuten asennusohje neuvoo. N�m� ovat asetuksia joita sinun tulee\n"
-"antaa ajurille."
+"   * 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"
+msgstr ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:218
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"For information, each partition is listed as follows: \"Name\", "
+"\"Capacity\".\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"
+"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\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"
+"\"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"
-"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"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
+"hard drives:\n"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-d  to delete a partition\n"
+"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-m  to set the mount point\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 ""
+
+#: ../../help.pm_.c:252
+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 ""
-"T�ss� vaiheessa sinun tulee valita partitio tai partitiot joille haluat\n"
-"asentaa Linux-Mandrake j�rjestelm�si, jos ne ovat jo olemassa\n"
-"(edellisest� Linux asennuksesta tai jostain muusta osiointity�kalusta).\n"
-"Muissa tapauksissa kiintolevy tulee osioida. Operaatiossa kiintolevy\n"
-"loogisesti osioidaan eri k�ytt�tarkoituksiin.\n"
+
+#: ../../help.pm_.c:257
+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"
-"Jos sinun t�ytyy luoda uusia osioita k�yt� \"Automaattinen varaus\"\n"
-"toimintoa osioiden luonnin automatisoimiseksi. Voit valita osioitavan levyn\n"
-"klikkaamalla \"hda\":ta ensimm�iselle IDE-levylle, \"hdb\":ta toiselle\n"
-"tai \"sda\":ta ensimm�iselle SCSI-levylle jne.\n"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
+msgstr ""
+
+#: ../../help.pm_.c:267
+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"
-"Kaksi yleist� osiota ovat: juurosio (/), joka on j�rjestelm�n\n"
-"k�ynnistymispiste tiedostoj�rjestelm�ss�, ja /boot joka sis�lt�� kaikki\n"
-"tarpeelliset tiedostot j�rjestelm�n k�ynnist�miseksi, kun se laitetaan\n"
-"k�yntiin.\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"
-"Koska toimenpiteen muutoksia ei yleens� voida peruuttaa, osiointi voi\n"
-"olla pelottavaa ja vaikeaa uudellen k�ytt�j�lle. DiskDrake-ohjelma\n"
-"helpottaa toimenpidett�. Lue dokumentaatiota ja tutki asia huolella\n"
-"ennenkuin jatkat.\n"
 "\n"
+"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
+"IDE hard drives:\n"
 "\n"
-"Voit k�ytt�� kaikkia toimintoja n�pp�imist�lt�: selaa osiota k�ytt�en\n"
-"Tab ja Yl�s/Alas nuolia. Kun osio on valittu, voit k�ytt��:\n"
+"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-c  luodakdesi uuden osion (kun tyhj� osio on valittu)\n"
+"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-d  tuhotaksesi osion\n"
+"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"- Ctrl-m  asettaaksesi liitospisteen\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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
+
+#: ../../help.pm_.c:303
 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."
+"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 ""
-"Kaikki uudelleenm��ritellyt uudet osiot tulee alustaa, jotta niit� voidaan\n"
-"k�ytt�� (alustus tarkoittaa tiedostoj�rjestelm�n luomista). Samalla\n"
-"voit uudelleenalustaa joitain osioita joilta haluat poistaa tiedot.\n"
-"Huomaa: Olemassaolevien partitioiden alustus ei ole pakollista,\n"
-"varsinkin jos ne sis�lt�v�t ennest��n tiedostoja jotka haluat s�ilytt��.\n"
-"Normaalisti s�ilytett�vi� ovat /home ja /usr/local."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
+#, 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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 pakettien ryhm�n joita haluat asentaa\n"
 "tai p�ivitt��.\n"
@@ -1540,133 +1996,153 @@ msgstr ""
 "Listan alaosassa on \"Yksitt�isten pakettien valinta\" optio, jos\n"
 "haluat selata yli 1000 pakettia l�pi."
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:358
+#, 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 ""
 "Jos sinulla on kaikki CD:t allaolevalta listalta, paina Ok.\n"
 "Jos sinulla ei ole yht��n levyist�, paina Peruuta.\n"
 "Jos jotkut levyist� puuttuvat, poista niiden valinnat, ja paina Ok"
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:363
 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."
+"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 ""
-"Valitsemiasi paketteja asennetaan. T�m�n vaiheen tulisi kest��\n"
-"muutamia minuutteja, ellet ole valinnut olemassaolevan j�rjestelm�n\n"
-"p�ivityst�. P�ivitys kest�� kauemmin jopa ennenkuin itse p�ivitys\n"
-"alkaa."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:371
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"Jos DrakX ei l�yt�nyt hiirt�si tai haluat tarkistaa mit� ohjelma\n"
-"teki sinulle, n�et listan hiirist� yl�puolella.\n"
-"\n"
-"\n"
-"Jos olet samaa mielt� DrakX:n asetuksista hypp�� haluamaasi osioon\n"
-"klikkaamalla valikkoa vasemmalla. Muuten valitse valikosta hiiren\n"
-"tyyppi jonka uskot olevan l�hinn� omaa hiirt�si.\n"
-"\n"
-"\n"
-"Jos sinulla on sarjaporttihiiri sinun tulee my�s kertoa DrakX:lle\n"
-"mihin porttiin hiiri on kytketty."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
 "Valitse oikea portti. Esimerkiksi COM1 portti MS Windowsissa\n"
 "on nimelt��n ttyS0 Linuxissa."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
-"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"
+"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 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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"T�m� osio on paikallisverkon tai modeemin asetuksia varten.\n"
-"\n"
-"Valitse \"Paikallinen LAN\" jolloin DrakX yritt�� hakea Ethernet-ohjaimia\n"
-"j�rjestelm�st�si. PCI-ohjaimien tulisi l�yty� ja toimia automaattisesti.\n"
-"Kuitenkin jos laitteesi on ISA-v�yl�ss� automaattitunnsitus ei toimi ja\n"
-"sinun tulee valita ajuri ilmestyv�lt� listalta.\n"
-"\n"
-"\n"
-"Kuten SCSI-ohjaimilla voit antaa ajurin k�ytt�� ohjainta ensin\n"
-"automaattisesti, jos t�m� ei toimi sinun tulee antaa ylim��r�isi�\n"
-"asetuksia jotka olet hakenut Windowsin ohjauspaneelista.\n"
-"\n"
-"\n"
-"Jos asennat Linux-Mandrake j�rjestelm�n osaksi olemassaolevaa\n"
-"verkkoa verkon yll�pit�j� on antanut sinulle kaikki tarvittavat\n"
-"tiedot (IP-osoiteen, verkkopeiteen sek� j�rjestelm�n nimen). Jos\n"
-"esimerkiksi asetat omaa kotiverkkoa sinun tulee itse valita n�m�\n"
-"osoitteet.\n"
-"\n"
-"Valitse \"Soittoyhteys\" modeemilla jolloin internet-yhteys modeemilla\n"
-"asetetaan. DrakX yritt�� ensin etsi� modeemiasi, jos se ei onnistu\n"
-"sinun tulee valita oikea sarjaportti johon modeemisi on kytketty."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"Voit antaa nyt soittoyhteyden asetukset. Jos et ole varma mit� kenttiin\n"
+"kirjotetaan oikeat tiedot saat Internet palveluntarjoajaltasi."
+
+#: ../../help.pm_.c:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
 "Sy�t�:\n"
 "\n"
@@ -1681,7 +2157,23 @@ msgstr ""
 "valitse t�m� optio. Jos t�m� valitaan ei  \"IP-osoite\" kentt�� tarvitse\n"
 "t�ytt��. Jos et ole asiasta varma kysy berkkoyll�pit�k�lt�si.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"Jos verkkosi k�ytt�� NIS:�, valita \"K�yt� NIS:�\". Jos et ole varma "
+"asiasta\n"
+"kysy verkkoyll�pit�j�lt�si."
+
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1689,7 +2181,7 @@ msgstr ""
 "Voit antaa nyt soittoyhteyden asetukset. Jos et ole varma mit� kenttiin\n"
 "kirjotetaan oikeat tiedot saat Internet palveluntarjoajaltasi."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1698,13 +2190,15 @@ msgstr ""
 "v�lityspalvelimia kysy verkkoyll�pit�j�lt�si tai Internet\n"
 "palveluntarjoajaltasi."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1715,13 +2209,19 @@ msgstr ""
 "Huomaa ett� sinun tulee valita peilij�rjestelm� ja paketit oman maasi\n"
 "lains��d�nn�n mukaan."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "Voit valita aikavy�hykkeen sen mukaan miss� asut.\n"
 "\n"
@@ -1730,15 +2230,22 @@ msgstr ""
 "sen\n"
 "paikalliseen aikaan valitsemasi aikavy�hykkeen mukaan."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 valita mit� palveluita haluat k�ynnist�� koneen k�ynnistyess�.\n"
 "Kun siirr�t hiiren osoittimen palvelin p��lle, pieni ohje tulee esiin,\n"
@@ -1748,78 +2255,159 @@ msgstr ""
 "konettasi palvelimena: et varmaankaan halua k�ynnist�� palveluita,\n"
 "joita et k�yt�."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
+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:490
 msgid ""
-"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"
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"Linux osaa k�sitell� monentyyppisi� tulostimia. Jokainen n�ist�\n"
-"vaatii erilaisen asetukset. Huomaa, ett� tulostusjono k�ytt��\n"
-"'lp'-nime� oletustulostimelle, joten sinulla tulee olla yksi tulostin\n"
-"t�ll� nimell�. Voit antaa monia nimi� halutessasi ja erotella ne\n"
-"'|'-merkill�. Eli jos haluat tulostimellesi merkitsev�mm�n nimen\n"
-"sinun tulee vain laittaa se ensin, esim. \"Tulostimeni|lp\".\n"
-"Tulostin jonka nimen� on \"lp\" on oletustulostin.\n"
+
+#: ../../help.pm_.c:505
+msgid ""
+"GNU/Linux can deal with many types of printer. Each of these types requires\n"
+"a different setup.\n"
+"\n"
 "\n"
-"Jos tulostimesi on kytketty suoraan tietokoneeseesi, valitse\n"
-"\"Paikallinen Tulostin\". Sinun tulee kertoa mihin porttiin tulostin\n"
-"on kytketty ja valita sopiva suodatin.\n"
+"If your printer is physically connected to your computer, select \"Local\n"
+"printer\".\n"
 "\n"
 "\n"
-"Jos haluat k�ytt�� tulostinta joka on toisessa Unix-palvelimessa,\n"
-"sinun tulee valita \"Et� lpd\". Saadaksesi tulostimen toimimaan\n"
-"k�ytt�j�nime� tai salasanaa ei tarvita, mutta sinun tulee tiet��\n"
-"et�koneen nimi sek� tulostusjonon nimi.\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 ""
+
+#: ../../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"
+"\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 ""
+
+#: ../../help.pm_.c:542
+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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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"
-"Jos haluat k�ytt�� SMB tulostinta (joka tarkoittaa sit� ett�\n"
-"tulostin on Windows 9x/NT koneella), sinun tulee m��ritell�\n"
-"koneen SMB nimi (joka ei ole sama kuin sen TCP/IP nimi), ja mahdollisesti\n"
-"koneen IP-osoite, k�ytt�j�nimi, ty�ryhm� sek� salasana jotta voisit k�ytt��\n"
-"tulostinta sek� tietysti tulostimen nimi. Sama koskee NetWare tulostimia\n"
-"paitsi et tarvitse ty�ryhm�tietoja."
+"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 ""
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:585
+#, fuzzy
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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 root salasanan Linux-Mandrake j�rjestelm�llesi.\n"
 "Salasana tulee antaa kaksi kertaa jotta salasanan oikeellisuudesta\n"
@@ -1835,7 +2423,7 @@ msgstr ""
 "*koskaan* tule kirjoittaa paperille. �l� tee salasanasta kuitenkaan\n"
 "liian monimutkaista, sinun tulee muistaa se ilman liian suurta vaivaa."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1844,7 +2432,7 @@ msgstr ""
 "shadow-tiedostoa\" ja\n"
 "\"K�yt� MD5-salasanoja\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1853,7 +2441,7 @@ msgstr ""
 "asiasta\n"
 "kysy verkkoyll�pit�j�lt�si."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1892,22 +2480,18 @@ msgstr ""
 "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:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Suosittelemme ett� vastaat t�h�n \"Kyll�\". Jos asennat esimerkiksi\n"
-"Windowsin uudelleen asennusohjelma ylikirjoittaa k�ynnistyslohkon. Jos\n"
-"et ole jo tehnyt k�ynnistyslevykett� et voi k�ynnist�� t�m�n j�lkeen\n"
-"Linuxia uudelleen."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
+#, fuzzy
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
@@ -1920,7 +2504,7 @@ msgstr ""
 "Jos et todella tied� mit� teet, valitse \"Ensimm�inen levyn\n"
 "sektori (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1928,10 +2512,10 @@ 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:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1942,7 +2526,7 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 #, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
@@ -1960,7 +2544,9 @@ msgid ""
 "\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."
 msgstr ""
 "LILO:n p��asetukset ovat:\n"
@@ -2000,10 +2586,77 @@ msgstr ""
 "    * normaali: valitse normaali 80x25 tekstitila.\n"
 "    * <numero>:  k�yt� numeroa vastaavaa tekstitilaa."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 ""
+
+#: ../../help.pm_.c:692
+#, 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 ""
+"LILO:n p��asetukset ovat:\n"
+"  - K�ynnistyslaite: Asettaa laitteen (esim. kiintolevyn osion)\n"
+"joka sis�lt�� k�ynnistyslohkon. Ellet ole varma mit� valitsisit\n"
+"valitse \"/dev/hda\".\n"
+"\n"
+"\n"
+"  - Lineaarinen: Luo lineaarisia sektoriosotteita sektori/lukup��/\n"
+"sylinteri osotteiden sijasta. Lineaariset osoitteet muutetaan ajon\n"
+"aikana eiv�tk� riipu levyn geometriasta. Huomaa ett� k�ynnistyslevyt\n"
+"eiv�t ole siirrett�vi� jos  \"lineaarinen\"-tilaa k�ytet��n, koska\n"
+"BIOS-palvelu jolla levyn geomteria selvitet��n ei toimi luotettavasti\n"
+"levykkeill�. Kun k�yt�t \"lineaarinen\"-tilaa isoilla levyill� voi\n"
+"/sbin/lilo luoda viitteit� saavuttamattomille levyn alueille koska\n"
+"3D sektoriosotteita ei tunneta ennen k�ynnistyst�.\n"
+"\n"
+"\n"
+"  - Kompakti: Yritt�� liitt�� vierekk�isten sektorien luvun yhteen\n"
+"pyynt��n. T�m� pienent�� huomattavasti latausaikoja ja tekee kartta-\n"
+"tiedostosta pienemm�n. \"Kompakti\"-tilan k�ytt�� suositellaan erityisesti\n"
+"jos k�ynnistet��n levykkeelt�.\n"
+"\n"
+"\n"
+"  - Viive ennen oletuslaitteelta k�ynnistyst�: M��rittelee "
+"kymmenesosasekunteina\n"
+"kuinka kauan lataaj odottaa ennenkuin k�ynnist�� ensimm�isen tiedoston.\n"
+"T�m� on hy�dyllinen asetus j�rjestelmiss� joissa halutaan k�ynnistyksen "
+"tapahtuvan\n"
+" heti kun n�pp�imist� on k�ytett�viss�. K�ynnistyslataaja ei odota jos "
+"\"viive\" on\n"
+"nolla tai sit� ei ole ollenkaan.\n"
+"\n"
+"\n"
+"  - Videotila: M��rittelee halutun VGA tekstitilan joka valitaan\n"
+"k�ynnistett�ess�. Seuraavia arvoja voidaan k�ytt��: \n"
+"    * normaali: valitse normaali 80x25 tekstitila.\n"
+"    * <numero>:  k�yt� numeroa vastaavaa tekstitilaa."
+
+#: ../../help.pm_.c:705
+#, fuzzy
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2025,7 +2678,7 @@ msgstr ""
 "miellytt�v�t sinua. Jos eiv�t, voit palata ja muuttaa niit�\n"
 "niin monta kertaa kuin on tarpeen."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2034,7 +2687,7 @@ msgstr ""
 "asettamiseksi\n"
 "oikein."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2042,42 +2695,47 @@ msgstr ""
 "Jos haluat k�ytt�� graafista sis��nkirjoittautumista valitse \"Kyll�\".\n"
 "Muuten valitse \"Ei\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\n"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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"
+"\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."
 msgstr ""
 "Voit nyt asettaa j�rjestelm�n sekalaisia asetuksia.\n"
 "\n"
@@ -2113,7 +2771,7 @@ msgstr ""
 "    k�ynnistyksen j�lkeen valitse t�m� asetus (Huomaa: Num Lock ei toimi\n"
 "     silti X:n alla)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2128,188 +2786,131 @@ msgstr ""
 "Jos haluat my�s k�ynnist�� muita koneessa olevia k�ytt�j�rjestelmi� lue\n"
 "lis�ohjeita."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Valitse kieli"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Valitse asennuksen luokka"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Kiintolevyjen tunnistus"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "M��rittele hiiri"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Valitse n�pp�imist�"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Sekalaista"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Aseta tiedostoj�rjestelm�t"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Alusta osiot"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Valitse asennettavat paketit"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Asenna"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Aseta verkko"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Salakirjoitus"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Aseta aikavy�hyke"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Asetuspalvelut"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Aseta kirjoitin"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Anna root-salasana"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Lis�� k�ytt�j�"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Luo k�ynnistyslevyke"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Asenna lataaja"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Aseta X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Automaattiasennuslevyke"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Lopeta asennus"
 
-#: ../../install2.pm_.c:337
-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 ""
-"Sinulla tulee olla juuriosio.\n"
-"T�t� varten luo osio (tai klikkaa olemassaolevaa).\n"
-"Valitse sitten toiminto ``Liitospiste'' ja aseta se arvoon `/'"
-
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Osiotaulua ei voida lukea, siin� on liikaa virheit� :(\n"
-"Taulu yritet��n korjata nollaamalla se"
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "virhe luettaessa tiedostoa $f"
 
-#: ../../install_any.pm_.c:351
-msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
-msgstr ""
-"DiskDrake ei pystynyt lukemaan osiotaulua oikein.\n"
-"Jatka omalla vastuullasi!"
+#: ../../install_gtk.pm_.c:426
+#, fuzzy
+msgid "Please test the mouse"
+msgstr "Mink� tyyppinen hiiri sinulla on."
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Etsin juuriosiota"
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Mink� tyyppinen hiiri sinulla on."
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Tietoa"
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
+#: ../../install_interactive.pm_.c:23
 #, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: T�m� ei ole juuriosio, valitse joku toinen."
-
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Juuriosiota ei l�ytynyt"
-
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Levitysjakelua ei voida k�ytt�� ilman NIS aluetta"
-
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "virhe luettaessa tiedostoa $f"
-
-#: ../../install_steps.pm_.c:75
 msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
+"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
+"You can find some information about them at: %s"
 msgstr ""
-"Tapahtui virhe, sit� ei voida k�sitell� kunnolla.\n"
-"Jatka omalla riskill�si."
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Kahdentunut liitospiste %s"
-
-#: ../../install_steps.pm_.c:323
+#: ../../install_interactive.pm_.c:41
 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"
+"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 ""
+"Sinulla tulee olla juuriosio.\n"
+"T�t� varten luo osio (tai klikkaa olemassaolevaa).\n"
+"Valitse sitten toiminto ``Liitospiste'' ja aseta se arvoon `/'"
 
-# mat
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Tervetuloa %s:n"
-
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Ei levykeasemaa k�ytett�viss�"
-
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
-#, c-format
-msgid "Entering step `%s'\n"
-msgstr "Siirryn vaiheeseen `%s'\n"
-
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
+#: ../../install_interactive.pm_.c:46
 msgid "You must have a swap partition"
 msgstr "Sinulla tulee olla heittovaihtotiedosto"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:47
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -2319,98 +2920,78 @@ msgstr ""
 "\n"
 "Jatka kuitenkin?"
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Valitse asennuksen koko"
+#: ../../install_interactive.pm_.c:68
+#, fuzzy
+msgid "Use free space"
+msgstr "K�yt� loopback-tiedostoa"
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Kokonaiskoko: "
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Versio: %s\n"
+#: ../../install_interactive.pm_.c:78
+#, fuzzy
+msgid "Use existing partition"
+msgstr "Alustan osioita"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "Koko: %d Kt\n"
+#: ../../install_interactive.pm_.c:80
+#, fuzzy
+msgid "There is no existing partition to use"
+msgstr "Yrit�n osiotalulun palautusta"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Valitse asennettavat paketit"
+#: ../../install_interactive.pm_.c:87
+#, fuzzy
+msgid "Use the Windows partition for loopback"
+msgstr "K�yt� loopback-tiedostoa"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Tietoja"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Mille osiolle haluat laittaa Linux4Win:n"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Asenna"
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Valitse koot"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Asennan"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Juuriosion koko Mt: "
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Odota hetki, "
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Sivutusosion koko Mt: "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "J�ljell� "
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Kokonaisaika "
+#: ../../install_interactive.pm_.c:105
+#, fuzzy
+msgid "Which partition do you want to resize?"
+msgstr "Mink� osiotyypin haluat?"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Valmistelen asennusta"
+#: ../../install_interactive.pm_.c:107
+#, fuzzy
+msgid "Computing Windows filesystem bounds"
+msgstr "Lasken fat-tiedostoj�rjestelm�n rajoja"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Installing package %s"
-msgstr "Asennan pakettia %s"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Jatka kuitenkin?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Tapahtu virhe j�rjestett�ess� paketteja:"
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "K�yt� olemassaolevia asetuksia X11:ta?"
-
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Valitse joku seuraavista asennusluokista:"
-
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Sinulla ei ole yht��n windows osiota!"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Sinulla ei ole tarpeeksi tilaa Lnx4win:lle"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_interactive.pm_.c:113
+#, fuzzy
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
 "dangerous. If you have not already done so, you should first exit the\n"
 "installation, run scandisk under Windows (and optionally run defrag), then\n"
 "restart the installation. You should also backup your data.\n"
@@ -2425,33 +3006,151 @@ msgstr ""
 " t�lle osiolle ja tehd� tiedoistasi varmuuskopio.\n"
 "Kun olet tehnyt n�m� toimenpiteet paina Ok."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
+#: ../../install_interactive.pm_.c:122
+#, fuzzy
+msgid "Which size do you want to keep for windows on"
+msgstr "Mille sektorille haluat siirt��?"
+
+#: ../../install_interactive.pm_.c:123
+#, fuzzy, c-format
+msgid "partition %s"
+msgstr "Osio"
+
+#: ../../install_interactive.pm_.c:129
+#, fuzzy, c-format
+msgid "FAT resizing failed: %s"
 msgstr "Automaattinen koonmuutos ep�onnistui"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Mille osiolle haluat laittaa Linux4Win:n"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Valitse koot"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Juuriosion koko Mt: "
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Sivutusosion koko Mt: "
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr ""
+
+# mat
+#: ../../install_interactive.pm_.c:156
+#, fuzzy, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "Osion %s koon muutoksen j�lkeen kaikki osion tiedot tuhoutuvat"
+
+#: ../../install_interactive.pm_.c:164
+#, fuzzy
+msgid "Expert mode"
+msgstr "Ekspertti"
+
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:171
+#, fuzzy, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Voit nyt osioda kiintolevysi %s\n"
+"Kun olet valmis, �l� unohda tallettaa komennolla 'w'"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Sinulla ei ole yht��n windows osiota!"
+
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Uusia osioita ei voida lis�t�"
+
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
+
+# mat
+#: ../../install_interactive.pm_.c:218
+#, fuzzy, c-format
+msgid "Partitioning failed: %s"
+msgstr "Osion tyyppi: %s\n"
+
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "K�ynnist�n verkkoa"
+
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Ajan alas verkkoa"
+
+#: ../../install_steps.pm_.c:74
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
+"Tapahtui virhe, sit� ei voida k�sitell� kunnolla.\n"
+"Jatka omalla riskill�si."
+
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Kahdentunut liitospiste %s"
+
+#: ../../install_steps.pm_.c:375
+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 ""
+
+# mat
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Tervetuloa %s:n"
+
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Ei levykeasemaa k�ytett�viss�"
+
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Siirryn vaiheeseen `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Valitse joku seuraavista asennusluokista:"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2465,7 +3164,7 @@ msgstr ""
 "Pieni prosenttiosuus asentaa vain t�rkeimm�t paketit,\n"
 "100%% osuus asentaa kaikki paketit."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2480,59 +3179,102 @@ msgstr ""
 "Pieni prosentti asentaa vain t�rkeimm�t paketit, %d%%\n"
 " prosenttiosuus asentaa niin monta pakettia kuin on mahdollista."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 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:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Prosenttiosuus asennettavista paketeista"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Valitse asennettavat paketit"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Tietoja"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Asenna"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Automaattiset riippuvuudet"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Laajenna puu"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Sulje puu"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Vaihda tasaisen ja ryhm�j�rjestyksen v�lill�"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Viallinen paketti"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nimi: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versio: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Koko: %d Kt\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "T�rkeys: %s\n"
 
 # mat
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Koko yhteens�: %d / %d Mt"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+#, fuzzy
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr "Et voi poistaa t�m�n paketin valintaa. Se on jo asennettu"
+
+#: ../../install_steps_gtk.pm_.c:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "Seuraavat paketit poistetaan"
+
+#: ../../install_steps_gtk.pm_.c:387
+#, fuzzy
+msgid "The following packages are going to be removed"
+msgstr "Seuraavat paketit asennetaan tai poistetaan"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Et voi valita/poistaa t�t� pakettia"
+
+#: ../../install_steps_gtk.pm_.c:416
 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:473
+#: ../../install_steps_gtk.pm_.c:418
 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:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2540,45 +3282,89 @@ msgstr ""
 "T�m� paketti tulee p�ivitt��\n"
 "Oletko varma ett� haluat poistaa valinnan?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 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:493
-#, fuzzy
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr "Et voi poistaa t�m�n paketin valintaa. Se on jo asennettu"
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Seuraavat paketit asennetaan tai poistetaan"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "Et voi valita/poistaa t�t� pakettia"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Asennan"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Arvioin"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Odota hetki, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "J�ljell� "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Kokonaisaika "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Valmistelen asennusta"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pakettia"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U Mt"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Asennan pakettia %s"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Accept"
+msgstr "Hyv�ksy k�ytt�j�"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2593,182 +3379,386 @@ msgstr ""
 "Jos sinulla ei ole levy�, paina Peruuta v�ltt��ksesi asennukset t�lt� "
 "levylt�."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Uusi koko"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Jatka kuitenkin?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Tapahtu virhe j�rjestett�ess� paketteja:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Tapahtu virhe asennettaessa paketteja:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Tapahtui virhe"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Valitse k�ytett�v� kieli."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "N�pp�imist�"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Valitse n�pp�imist�n j�rjestys."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 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:91
-msgid "Root Partition"
-msgstr "Juuriosio"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Mik� on j�rjestelm�si juuriosio (/) ?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Asennusluokka"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Valitse asennuksen luokka?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Asenna/P�ivit�"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "Onko t�m� asennus vai p�ivitys?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Automaattinen"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Mukautettu"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Ekspertti"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
+#, fuzzy
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "Oletko varmasti asiantuntija? \n"
 "Voit tehd� vaarallisia asioita t��ll�."
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "P�ivit�"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Normaali"
+#: ../../install_steps_interactive.pm_.c:222
+#, fuzzy
+msgid "Workstation"
+msgstr "Tietoa"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Kehitys"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Palvelin"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+#, fuzzy
+msgid "What is your system used for?"
 msgstr "Mihin j�rjestelm��si k�ytet��n ?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Mink� tyyppinen hiiri sinulla on."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Hiiren portti"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Mihin sarjaporttiin hiiresi on liitetty."
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Asetan PCMCIA kortteja...."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "Asetan IDE-levy�"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "ei vapaita osioita"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMt)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Mit� osiota haluat k�ytt�� juuriosiona."
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Valitse liitospisteet"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, fuzzy, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Osiotaulua ei voida lukea, siin� on liikaa virheit� :(\n"
+"Taulu yritet��n korjata nollaamalla se"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake ei pystynyt lukemaan osiotaulua oikein.\n"
+"Jatka omalla vastuullasi!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Juuriosio"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Mik� on j�rjestelm�si juuriosio (/) ?"
+
+#: ../../install_steps_interactive.pm_.c:352
 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:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Valitse alustettavat osiot"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Tarkista vialliset lohkot?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Alustan osioita"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Luon ja alustan tiedostoa %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 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:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Etsin saatavilla olevia paketteja"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Etsin p�ivitett�vi� paketteja"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, fuzzy, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr "J�rjestelm�ss�si ei ole riitt�v�sti tilaa asennukseen tai p�ivitykseen"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Complete (%dMB)"
+msgstr "Normaali"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Minimum (%dMB)"
+msgstr "(%dMt)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Recommended (%dMB)"
+msgstr "Normaali"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "Mukautettu"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Valitse asennuksen koko"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Paketin ryhm�valinta"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Yksitt�isten pakettien valinta"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2778,12 +3768,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:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom nimelt��n \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2791,171 +3781,11 @@ msgstr ""
 "Asennan pakettia %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Asennuksen j�lkeiset toiminnot"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "S�ilyt� nykyiset IP-verkon asetukset"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Muuta verkon asetuksia"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "�l� aseta verkkoa"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Verkon asetukset"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "L�hiverkko on jo asetettu. Haluatko:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Haluatko m��ritell� l�hiverkon j�rjestelm��si?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "verkkokorttia ei l�ytynyt"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Modeemin asetukset"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "Haluatko m��ritell� soittoyhteyden modeemilla j�rjestelm��si?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Asetan verkkolaitetta %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Anna koneen IP-asetukset. Kukin kohta tulee sy�tt�� IP-osoitteena,\n"
-"pisteill� eroteltuna nelinumeroisena lukuna (esim. 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Automaattinen IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP-osoite:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Verkkopeite:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP-osoitteen tullee olla muotoa 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Asetan verkkoa"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Sy�t� koneesi nimi.\n"
-"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."
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "Nimipalvelin:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Yhdysk�yt�v�n laite:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Yhdysk�yt�v�:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Koneen nimi:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Yrit� etsi� modeemia?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Mihin sarjaporttiin modeemisi on kytketty."
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Soittoasetukset"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Yhteyden nimi"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Puhelinnumero"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "K�ytt�j� ID"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Tunnistustapa"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Script-pohjainen"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Terminaalipohjainen"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Verkkoalue"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Ensimm�inen nimipalvelin"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Toinen nimipalvelin"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2994,89 +3824,95 @@ msgid ""
 "USA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Valitse peilij�rjestelm� josta paketit haetaan"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 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:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Valitse asennettavat paketit."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
+#, fuzzy
 msgid "Which is your timezone?"
-msgstr "Mik� on aikavy�hykkeesi?"
+msgstr "Mihin j�rjestelm��si k�ytet��n ?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Onko koneen kello asetettu GMT aikaan?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "Mink� osiotyypin haluat?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Ei salasanaa"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "K�yt� shadow-tiedostoa"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "K�yt� MD5 salasanoja"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "K�yt� NIS:�"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "keltaiset sivut"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, 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:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Tunnistus NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS-alue"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS-palvelin"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Hyv�ksy k�ytt�j�"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Lis�� k�ytt�j�"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(jo lis�tty %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3086,61 +3922,88 @@ msgstr ""
 "Aseta k�ytt�j�\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Oikea nimi"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "K�ytt�j�tunnus"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Komentotulkki"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Salasana on liian yksinkertainen"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Anna k�ytt�j�tunnus"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 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 `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "K�ytt�j�tunnus on jo lis�tty"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+#, fuzzy
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Mukautetulla k�ynnistyslevykkeell� voit k�ynnist�� j�rjestelm�n ilman\n"
+"tavanomaisen k�ytt�j�rjestelm�lataajan apua. T�st� on hy�ty�, jos et halua\n"
+"asentaa LILOa (tai grubia) j�rjestelm��si, toinen k�ytt�j�rjestelm� poistaa\n"
+"LILOn, tai LILO ei toimi laitteistossasi. Mukautettua k�ynnistyslevykett� "
+"voidaan\n"
+"k�ytt�� my�s Mandraken vikasietolevykkeen kanssa, jolloin vakavista\n"
+"j�rjestelm�n virhetilanteista on helpompi toipua.\n"
+"Haluatko luoda k�ynnistyslevykkeen j�rjestelm��si?"
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Ensimm�inen levyasema"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Toinen levyasema"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Ohita"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3162,64 +4025,33 @@ msgstr ""
 "j�rjestelm�n virhetilanteista on helpompi toipua.\n"
 "Haluatko luoda k�ynnistyslevykkeen j�rjestelm��si?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Levyajuria ei ole saatavilla"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 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:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Aseta tyhj� levyke levyasemaan %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Luon k�ynnistyslevykett�"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "LILO:n asennus ep�onnistu. Seuraava virhe tapahtui:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Haluatko k�ytt�� SILOa?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "SILOn p��asetukset"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"T�ss� ovat SILO:n asetustietueet.\n"
-"Voit lis�t� uusia tai muuttaa olemassaolevia."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Osio"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Otsikko on jo k�yt�ss�"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "SILO:n asennus ep�onnistu. Seuraava virhe tapahtui:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Valmistelen k�ytt�j�rjestelm�n lataajaa"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
+#, fuzzy
 msgid "Do you want to use aboot?"
-msgstr "Haluatko k�ytt�� aboot:a?"
+msgstr "Haluatko k�ytt�� SILOa?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3227,127 +4059,115 @@ msgstr ""
 "Virhe asennettaessa aboot:a,\n"
 "yrit� pakkoasennusta vaikka se tuhoaa ensimm�isen osion?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "V�lityspalvelimien asetus"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP-v�lityspalvelin:"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP-v�lityspalvelin:"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "V�lityspalvelimen tulee olla muotoa http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "V�lityspalvelimen tulee olla muotoa ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+#, fuzzy
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "LILO:n asennus ep�onnistu. Seuraava virhe tapahtui:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Tervetuloa murtautujat"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Huono"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Matala"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Keski"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Korkea"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoidi"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Sekalaiset kysymykset"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(voi korruptoida tietoja)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "K�yt� kiintolevyn optimointeja?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Valitse turvataso"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Tarkka muistin koko, jos tarpeen (l�ydettiin %d Mt)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Poistettavien medioiden automaattinen liitt�minen"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Tyhjenn� /tmp jokaisessa k�ynnistyksess�"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "K�yt� montaa profiilia"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Num lock p��ll� k�ynistett�ess�"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Anna muistin koko megatavuina"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Supermount ohjelmaa ei voida k�ytt�� korkealla turvatasolla"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX luo asetustiedostot sek� XFree 3.3:lle ett� XFree 4.0:lle.\n"
-"Oletuksena k�ytet��n 3.3 palvelinta, koska se toimii useammilla\n"
-"n�yt�nohjaimilla.\n"
-"\n"
-"Haluatko kokeilla XFree 4.0:aa?"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Etsi PCI laitteita?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "K�yt� olemassaolevia asetuksia X11:ta?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
 # mat
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Aseta tyhj� levyke levyasemaan %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Valmistelen automaattiasennuslevykett�"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3357,7 +4177,7 @@ msgstr ""
 "\n"
 "Haluatko todella lopettaa?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3378,152 +4198,18 @@ msgstr ""
 "J�rjestelm�n asetuksista on tietoja virallisen Linux Mandraken oppaan\n"
 "luvussa \"Asennuksen j�lkeinen konfigurointi\""
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Sammutan"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Asetan ajuria %s ohjaimelle %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(moduli %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Mit� %s:n ajuria kokeillaan?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"Joissakin tapauksissa %s-ajuri tarvitsee lis�tietoja toimiakseen kunnolla,\n"
-"joskin tavallisesti se toimii hyvin ilmankin. Haluaisitko antaa ajurille\n"
-"lis�m��reit� vai annatko sen itse etsi� tarvitsemansa tiedot? Joskus haku\n"
-"voi jumittaa tietokoneen, mutta se ei aiheuta vahinkoa."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Automaattihaku"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Lis�asetukset"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Voit antaa lis�asetuksia modulille %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Voit antaa lis�asetuksia modulille %s.\n"
-"Asetukset ovat muotoa ``nimi=arvo nimi2=arvo2 ...''.\n"
-"Esimerkiksi, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Moduulin optiot:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Modulin %s lataaminen ep�onnistui.\n"
-"Haluatko yritt�� muilla asetuksilla?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Yrit� etsi� PCMCIA kortteja?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Asetan PCMCIA kortteja...."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Etsi %s laitteita?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "L�ysin %s %s liit�nt��"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Onko sinulla muita?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Onko koneessa %s liitynt��?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Ei"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Kyll�"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Katso laitteistotietoja"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "K�ynnist�n verkkoa"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Ajan alas verkkoa"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake Asennus %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> vaihtaa elementti�  | <Space> valitsee | <F12> seuraava "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"Voit nyt osioda kiintolevysi %s\n"
-"Kun olet valmis, �l� unohda tallettaa komennolla 'w'"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Odota hetki"
 
@@ -3533,7 +4219,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Ep�tarkka (%s), ole tarkempi\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Huono valinta, yrit� uudelleen\n"
 
@@ -3547,454 +4233,969 @@ msgstr " ? (oletus %s) "
 msgid "Your choice? (default %s) "
 msgstr "Valintasi? (oletus %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 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:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "Tshekki"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Saksa"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Espanja"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Ranska"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norja"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Puola"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Ven�j�"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "UK n�pp�imist�"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "US n�pp�imist�"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armeenia (vanha)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armeenia (kirjoituskone)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armeenia (foneettinen)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belgia"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulgaria"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasilia"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 #, fuzzy
 msgid "Belarusian"
 msgstr "Bulgaria"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Sveitsi (Saksalainen j�rjestys)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Sveitsi (Ranskalainen j�rjestys)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Saksa (ei kuolleita n�pp�imi�)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Tanska"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+#, fuzzy
+msgid "Dvorak (US)"
+msgstr "Dvorak"
+
+#: ../../keyboard.pm_.c:139
+#, fuzzy
+msgid "Dvorak (Norwegian)"
+msgstr "Norja"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgia (\"Ven�l�inen\"-j�rjestys)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgia (\"Latin\"-j�rjestys)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Kreikka"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Unkari"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Kroatia"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Israeli"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Israeli (Foneettinen)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+#, fuzzy
+msgid "Iranian"
+msgstr "Ukraina"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islanti"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Italia"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Latinalainen amerikka"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Hollanti"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 #, fuzzy
 msgid "Lithuanian AZERTY (old)"
 msgstr "Liettua AZERTY"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 #, fuzzy
 msgid "Lithuanian AZERTY (new)"
 msgstr "Liettua AZERTY"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Liettua \"numerorivi\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Liettua \"foneettinen\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Puola (qwerty j�rjestys)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Puola (qwertz j�rjestys)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugal"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanada (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Ven�j� (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Ruotsi"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Slovenia"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slovakia"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Thai-n�pp�imist�"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turkki (perinteinen \"F\"-malli)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turkki (perinteinen \"Q\"-malli)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukraina"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "US n�pp�imist� (kansainv�linen)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+#, fuzzy
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Liettua \"numerorivi\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Jugoslavia (latin-j�rjestys)"
 
-# 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
-#
-# '\204' is '�' (adiaeresis) in cp437 encoding.
-# '\224' is '�' (odiaeresis) in cp437 encoding.
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - Hiiri"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Yleinen"
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "taso"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "sarja"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Yleinen 2-nappinen hiiri"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Yleinen 3-nappinen hiiri"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (sarja, vanha C7 tyyppi)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Ei hiirt�"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "ei mik��n"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Ei hiirt�"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Onko t�m� oikein?"
+
+#: ../../netconnect.pm_.c:93
+#, fuzzy
+msgid "Internet configuration"
+msgstr "V�lityspalvelimien asetus"
+
+#: ../../netconnect.pm_.c:94
+#, fuzzy
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Haluatko kokeilla asetuksia?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Aseta verkko"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "�l� aseta verkkoa"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Yhteyden nimi"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+#, fuzzy
+msgid "ISDN Configuration"
+msgstr "Asetukset"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "V�lityspalvelimien asetus"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr ""
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr ""
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr ""
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:169
+#, fuzzy
+msgid "Provider phone number"
+msgstr "Puhelinnumero"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr ""
+
+#: ../../netconnect.pm_.c:172
+#, fuzzy
+msgid "Dialing mode"
+msgstr "Verkkoalue"
+
+#: ../../netconnect.pm_.c:174
+#, fuzzy
+msgid "Account Login (user name)"
+msgstr "Liitospaikka"
+
+#: ../../netconnect.pm_.c:175
+#, fuzzy
+msgid "Account Password"
+msgstr "Salasana"
+
+#: ../../netconnect.pm_.c:176
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Salasana"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "Kokeile asetuksia"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:214
+#, fuzzy
+msgid "Which protocol do you want to use ?"
+msgstr "Mink� osiotyypin haluat?"
+
+#: ../../netconnect.pm_.c:224
+#, fuzzy
+msgid "ISA / PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+#, fuzzy
+msgid "PCI"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr ""
+
+#: ../../netconnect.pm_.c:233
+#, fuzzy
+msgid "What kind of card do you have?"
+msgstr "Millainen kirjoitin sinulla on?"
+
+#: ../../netconnect.pm_.c:239
+#, fuzzy
+msgid "Continue"
+msgstr "Jatka kuitenkin?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr ""
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:257
+#, fuzzy
+msgid "Which is your ISDN card ?"
+msgstr "Mik� on aikavy�hykkeesi?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:287
+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 ""
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr ""
+
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "Valitse uusi koko"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Mihin sarjaporttiin hiiresi on liitetty."
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
+"Do you agree?"
 msgstr ""
-"Tervetuloa LILO k�ytt�j�rjestelm�nvalitsijaan!\n"
+
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Haluatko kokeilla asetuksia?"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "Asetukset"
+
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "Haluatko k�ytt�� aboot:a?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Yrit� etsi� modeemia?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Mihin sarjaporttiin modeemisi on kytketty."
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Soittoasetukset"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Yhteyden nimi"
+
+#: ../../netconnect.pm_.c:546
+#, fuzzy
+msgid "Phone number"
+msgstr "Puhelinnumero"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "K�ytt�j� ID"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Tunnistustapa"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Script-pohjainen"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Terminaalipohjainen"
+
+#: ../../netconnect.pm_.c:550
+#, fuzzy
+msgid "Domain name"
+msgstr "Yhteyden nimi"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Ensimm�inen nimipalvelin"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Toinen nimipalvelin"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
 "\n"
-"Listataksesi mahdolliset valinnat paina <TAB>.\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Yhteyden nimi"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
 "\n"
-"Ladataksesi jonkun niist� kirjoita sen nimi ja paina <ENTER>\n"
-"tai odota %d sekuntia oletusk�ynnistyst�.\n"
+"You can reconfigure your connection."
+msgstr "Aseta verkko"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "�l� aseta verkkoa"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
 "\n"
+"You can disconnect or reconfigure your connection."
+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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Tervetuloa GRUB k�ytt�j�rjestelm�nvalitsijaan!"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "�l� aseta verkkoa"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "K�yt� %c ja %c n�pp�imi� valitaksesi korostetun tietueen"
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Yhteyden nimi"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Yhteyden nimi"
+
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Aseta verkko"
+
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "Kirjoitinyhteys"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
-"Paina enter k�ynnist��ksesi valitun k�ytt�j�rjestelm�n, 'e' muokataksesi"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "komennot ennen k�ynnistyst�, tai 'c' komentoriville"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Aseta verkko"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Korostettu tietue k�ynnistet��n automaattisesti %d sekunnissa."
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Aseta verkko"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
 msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Ty�p�yt�"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Ekspertti"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "K�ynnistysvalikko"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+#, fuzzy
+msgid "Connect to the Internet"
+msgstr "Yhteyden nimi"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - Hiiri"
+#: ../../netconnect.pm_.c:672
+#, fuzzy
+msgid "What kind is your ISDN connection?"
+msgstr "Mihin sarjaporttiin hiiresi on liitetty?"
+
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Aseta verkko"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB Hiiri"
+#: ../../netconnect.pm_.c:700
+#, fuzzy
+msgid "France"
+msgstr "Peruuta"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB Hiiri (2 nappia)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr ""
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB Hiiri (3+ nappia)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr ""
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB Hiiri"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr ""
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB Hiiri (2 nappia)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "Ekspertti"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB Hiiri (3+ nappia)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Yleinen hiiri (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Yleinen 3-nappinen hiiri (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Aseta verkko"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Mink� osiotyypin haluat?"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Aseta verkko"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "Aseta verkko"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Verkon asetukset"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Haluatko kokeilla asetuksia?"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "Aseta verkko"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Yhteyden nimi"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus Mouse"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "L�hiverkko on jo asetettu. Haluatko:"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus Mouse"
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "Mille levylle haluat siirt��?"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus Mouse"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Verkon asetukset"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB Hiiri"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB Hiiri (3 nappia tai enemm�n)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "verkkokorttia ei l�ytynyt"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Ei hiirt�"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Asetan verkkoa"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A tai korkeampi (sarja)"
+#: ../../network.pm_.c:274
+#, fuzzy
+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.\n"
+"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."
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (sarja)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+#, fuzzy
+msgid "Host name"
+msgstr "Koneen nimi:"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (sarja)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (sarja)"
+#: ../../network.pm_.c:302
+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 ""
+"Anna koneen IP-asetukset. Kukin kohta tulee sy�tt�� IP-osoitteena,\n"
+"pisteill� eroteltuna nelinumeroisena lukuna (esim. 1.2.3.4)."
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (sarja)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Asetan verkkolaitetta %s"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (sarja)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Automaattinen IP"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (sarja)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "IP address"
+msgstr "IP-osoite:"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (sarja)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Netmask"
+msgstr "Verkkopeite:"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (sarja, vanha C7 tyyppi)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (sarja)"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP-osoitteen tullee olla muotoa 1.2.3.4"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Yleinen hiiri (sarja)"
+#: ../../network.pm_.c:341
+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 ""
+"Sy�t� koneesi nimi.\n"
+"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."
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft yhteensopiva (sarja)"
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "Nimipalvelin:"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Yleinen 3-nappinen hiiri (sarja)"
+#: ../../network.pm_.c:347
+#, fuzzy
+msgid "Gateway"
+msgstr "Yhdysk�yt�v�:"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (sarja)"
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "Yhdysk�yt�v�n laite:"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Onko t�m� oikein?"
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Asennuksen j�lkeiset toiminnot"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP-v�lityspalvelin:"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP-v�lityspalvelin:"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "V�lityspalvelimen tulee olla muotoa http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "V�lityspalvelimen tulee olla muotoa ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4004,21 +5205,21 @@ msgstr ""
 "Ainoa ratkaisu on siirt�� prim��riosioita siten ett� reik� on ennen "
 "laajennettuja osioita"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Virhe lukiessa tiedostoa %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Palautus tiedostosta %s ep�onnistui: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Huono varmuuskopiotiedosto"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Virhe kirjoitettaessa tiedostoon %s"
@@ -4052,42 +5253,56 @@ msgstr "kiinnostava"
 msgid "maybe"
 msgstr "ehk�"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (t�rke�)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (hyv�)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (hyv�)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "N�yt� v�hemm�n"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "N�yt� lis��"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Paikallinen kirjoitin"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+#, fuzzy
+msgid "Remote printer"
+msgstr "Palvelimen lpd:n tulostinparametrit"
+
+#: ../../printer.pm_.c:21
+#, fuzzy
+msgid "Remote CUPS server"
+msgstr "Et�jonon nimi:"
+
+#: ../../printer.pm_.c:22
+#, fuzzy
+msgid "Remote lpd server"
 msgstr "lpd-palvelin"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "NetWare-kirjoittimen parametrit"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Tulostinlaite"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Etsin laitteita...."
@@ -4101,11 +5316,11 @@ msgstr "Kokeile portteja"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Tulostin mallia \"%s\" l�ydettiin "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Paikallinen tulostin"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4113,15 +5328,15 @@ msgstr ""
 "Mihin laitteeseen tulostin on kytketty  \n"
 "(huomaa, ett� /dev/lp0 vastaa LPT1:t�)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Tulostinlaite"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Palvelimen lpd:n tulostinparametrit"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4131,19 +5346,19 @@ msgstr ""
 "tulee sy�tt�� tulostuspalvelimen ja jonon nimi jolle ty�t\n"
 "siirret��n."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Palvelimen nimi"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Et�jonon nimi:"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) -tulostimen parametrit"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4156,27 +5371,27 @@ msgstr ""
 "ja mahdollisesti tulostinpalvelimen IP-osoite, kirjoittimen jakonimi\n"
 "sek� soveltuva k�ytt�j�tunnus, salasana ja ty�ryhm�-tieto."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "SMB-palvelimen nimi"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "SMB-palvelimen IP"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Jakonimi"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Ty�ryhm�"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "NetWare-kirjoittimen parametrit"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4188,130 +5403,155 @@ msgstr ""
 "ja mahdollisesti tulostusjonon nimi sille kirjoittimelle, jota haluat\n"
 "k�ytt��, sek� soveltuva k�ytt�j�tunnus ja salasana."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Tulostuspalvelin"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Tulostusjonon nimi"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "NetWare-kirjoittimen parametrit"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "Tulostimen asetukset"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "Huono"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Millainen kirjoitin sinulla on?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Haluatko kokeilla tulostusta?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Tulostan testisivua..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"Testisivu on l�hetetty tulostinpalvelimelle.\n"
+"Voi kest�� hetken ennenkuin tulostus alkaa.\n"
+"Tulostustila:\n"
+"%s\n"
+"\n"
+"Toimiko tulostus oikein?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"Testisivu on l�hetetty tulostinpalvelimelle.\n"
+"Voi kest�� hetken ennenkuin tulostus alkaa.\n"
+"Toimiko tulostus oikein?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Kyll�, tulosta ASCII-testisivu"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Kyll�, tulosta PostScript-testisivu"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Kyll�, tulosta molemmat sivut"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Aseta kirjoitin"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Millainen kirjoitin sinulla on?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Tulostimen asetukset"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Paperikoko"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Poista sivu ty�n j�lkeen?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Uniprint ajurin asetukset"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "V�risyvyysasetukset"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Tulosta teksti postscript muodossa?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "K��nteinen sivuj�rjestys"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Korjaa askelmainen rivinvaihto?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Sivujen m��r� tulostettavalla sivulla"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Vasen/Oikea mariginaali pistein� (1/72 tuuma)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Yl�/Ala-mariginaalit pistein� (1/72 tuumina)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Lis�asetukset GhostScriptille"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Lis�tekstiasetukset"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Haluatko kokeilla tulostusta?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Tulostan testisivua..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"Testisivu on l�hetetty tulostinpalvelimelle.\n"
-"Voi kest�� hetken ennenkuin tulostus alkaa.\n"
-"Tulostustila:\n"
-"%s\n"
-"\n"
-"Toimiko tulostus oikein?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"Testisivu on l�hetetty tulostinpalvelimelle.\n"
-"Voi kest�� hetken ennenkuin tulostus alkaa.\n"
-"Toimiko tulostus oikein?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Tulostin"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Haluatko asettaa tulostimen?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4319,19 +5559,69 @@ msgstr ""
 "T�ss� ovat tulostusjonot.\n"
 "Voit lis�t� uusia tai muuttaa olemassaolevia."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "Arvioin"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Valitse tulostinyhteys"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Miten tulostin on liitetty?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+#, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "Valitse tulostinyhteys"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Poista jono"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+#, fuzzy
+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 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 tulostin\n"
+"on liitetty?"
+
+#: ../../printerdrake.pm_.c:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "Paikallinen kirjoitin"
+
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "Lis�asetukset"
+
+#: ../../printerdrake.pm_.c:406
+#, fuzzy
+msgid "Location"
+msgstr "Tietoa"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4343,45 +5633,45 @@ msgstr ""
 "nime� ja hakemistoa k�ytet��n t�lle jonolle ja miten tulostin\n"
 "on liitetty?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Jonon nimi"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Jonohakemisto"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Kirjoitinyhteys"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, 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:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "En voi kirjoittaa tiedostoa $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid ep�onnistui"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid ep�onnistui (ehk� raid-ty�kalut puuttuvat?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ei riitt�v�sti osioita RAID tasolle %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron on jaksottainen komentojen ajastaja."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4389,7 +5679,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:17
+#: ../../services.pm_.c:18
 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."
@@ -4397,7 +5687,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:19
+#: ../../services.pm_.c:20
 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 "
@@ -4408,7 +5698,7 @@ msgstr ""
 "ajanhetkill�. vixie cron lis�� monia omianisuuksia verrattuna normaaliin\n"
 "UNIX:n cron ohjelmaan, kuten paremman turvallisuuden ja laajemmat asetukset."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4419,7 +5709,7 @@ msgstr ""
 "Commander. GPM mahdollistaa my�s leikkaa/liimaa toiminnot hiirell�,\n"
 "ja sis�lt�� tuen valikoille konsolissa."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4427,7 +5717,7 @@ msgstr ""
 "Apache on WWW-palvelin. Palvelinta k�ytet��n jakamaan HTML-\n"
 "tiedostoja ja ajamaan CGI-ohjelmia."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4441,7 +5731,7 @@ msgstr ""
 "palveluita, kuten telnet, ftp, rsh ja rlogin. inetd:n poistaminen\n"
 "poistaa my�s n�m� palvelut k�yt�st�."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4452,7 +5742,7 @@ msgstr ""
 "ty�kalulla.\n"
 "T�m� tulisi ottaa k�ytt��n l�hes kaikissa j�rjestelmiss�."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4460,7 +5750,7 @@ msgstr ""
 "lpd on tulostuspalvelin, jonka lpr ohjelma vaatii toimiakseen.\n"
 "lpd on palvelin joka jakaa tulostust�it� tulostimille."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4468,7 +5758,7 @@ msgstr ""
 "named (BIND) on nimipalvelin (DNS) jota k�ytet��n selvitt�m��n\n"
 "koneen nimi� sek� IP-osoitteita."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4476,7 +5766,7 @@ msgstr ""
 "Liitt�� ja irroittaa NFS (Network File System), SMB (Lan\n"
 "Manager/Windows) ja NCP (NetWare) liitospisteit�"
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4484,7 +5774,7 @@ msgstr ""
 "Aktivoi/Poistaa kaikki verkkoliittym�t jotka on asetettu\n"
 "k�ynnistyksess�."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4494,7 +5784,7 @@ msgstr ""
 "verkoissa. T�m� palvelu mahdollistaa NFS-palvelimen\n"
 "k�ynnistyksen, jakoa ohjataan tiedostosta /etc/exports."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4502,7 +5792,7 @@ msgstr ""
 "NFS on yleinen protokolla tiedostojen jakoon TCP/IP-\n"
 "verkoissa. T�m� palvelu mahdollistaa NSF-tiedostolukot."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4513,7 +5803,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:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4524,7 +5814,7 @@ msgstr ""
 "NFS ja NIS-protokollat. portmap-palvelin on oltava k�ynniss�\n"
 "j�rjestelmiss� jotka haluavat tarjota n�it� protokollia."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4532,7 +5822,7 @@ msgstr ""
 "Postfix on s�hk�postinv�litysohjelma, eli ohjelma joka\n"
 "v�litt�� postia koneelta toiselle."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4540,7 +5830,7 @@ msgstr ""
 "Tallentaa ja palauttaa j�rjestelm�n satunnaislukualtaan, t�m� parantaa\n"
 "satunnaislukujen laatua."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4551,7 +5841,7 @@ msgstr ""
 "verkoissa,\n"
 "monimutkaisemmat verkot vaativat parempia reititysprotokollia."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4559,7 +5849,7 @@ msgstr ""
 "rstart-protokolla mahdollistaa verkkok�ytt�jille\n"
 "eri koneiden tilatietojen haun."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4567,7 +5857,7 @@ msgstr ""
 "rusers-protokolla verkon k�ytt�jille mahdollisuuden tunnistaa, ketk�\n"
 "ovat sis�ll� eri koneissa."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4575,7 +5865,7 @@ msgstr ""
 "rwho-protokollalla et�k�ytt�j�t voivat listata kaikki koneella\n"
 "olevat k�ytt�j�t (vastaa fingeri�)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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."
@@ -4583,58 +5873,201 @@ msgstr ""
 "Syslog on tapa jolla monet palvelimet kirjottavat viestins� talteen\n"
 "useisiin lokitiedostoihin.  On j�rkev�� k�ytt�� syslog-ohjelmaa."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr "T�m� k�ynnistysskripti yritt�� ladata modulit usb hiirellesi."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
 "K�ynnist�� ja pys�ytt�� X kirjasinpalvelimen k�ynnistyksess� ja lopetuksessa"
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Valitse mitk� palvelut k�ynnistet��n automaattisesti"
 
-# 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
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Tervetuloa SILO k?ytt?j?rjestelm?nvalitsijaan!\n"
-"\n"
-"Listataksesi mahdolliset valinnat paina <TAB>.\n"
-"\n"
-"Ladataksesi jonkun niist? kirjoita sen nimi ja paina <ENTER>\n"
-"tai odota %d sekuntia oletusk?ynnistyst?.\n"
-"\n"
+"Osiotaulua ei voida lukea, siin� on liikaa virheit� :(\n"
+"Taulu yritet��n korjata nollaamalla se"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Aseta LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Luo k�ynnistyslevyke"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Alusta levyke"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Valinta"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "LILO:n asennus ep�onnistu. Seuraava virhe tapahtui:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Taulukko"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Aseta X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Taulukko"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+#, fuzzy
+msgid "Internet Connection Sharing"
+msgstr "Kirjoitinyhteys"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Verkkoalue"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "luen asetuksia"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Asetan IDE-levy�"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Onnittelut!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4698,23 +6131,36 @@ msgstr "Asetan turvatasoa"
 msgid "Choose the tool you want to use"
 msgstr "Valitse haluamasi ty�kalu"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Millainen n�pp�imist� sinulla on?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Vaihda resoluutiota"
+
+#: ../../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 ""
+"Vaihda CD-levy�!\n"
+"\n"
+"Aseta CD-levy nimelt��n \"%s\" CD-asemaan ja paina Ok kun olet valmis.\n"
+"Jos sinulla ei ole levy�, paina Peruuta v�ltt��ksesi asennukset t�lt� "
+"levylt�."
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Mink� tyyppinen hiiri sinulla on?"
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "serial_usb:ta ei l�ytynyt\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Emuloi kolmatta n�pp�int�?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Mihin sarjaporttiin hiiresi on liitetty?"
 
@@ -4929,6 +6375,888 @@ msgstr "Etsin lehti�"
 msgid "Finding leaves takes some time"
 msgstr "Lehtien haku kest�� jonkin aikaa"
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "V�lityspalvelimien asetus"
+
+#, fuzzy
+msgid "Internet"
+msgstr "kiinnostava"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Toimistosovellukset"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multimedia"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multimedia"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Dokumentaatio"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Valitse asennuksen koko"
+
+#~ msgid "Total size: "
+#~ msgstr "Kokonaiskoko: "
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "Muuta verkon asetuksia"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Yhteyden nimi"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Yhteyden nimi"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Yhteyden nimi"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Yhteyden nimi"
+
+#, fuzzy
+#~ msgid "Germany"
+#~ msgstr "Saksa"
+
+#, fuzzy
+#~ msgid "Germany (1TR6)"
+#~ msgstr "Saksa"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "Mit� haluat tehd�?"
+
+#, fuzzy
+#~ msgid "Install/Rescue"
+#~ msgstr "Asenna"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "Uusi koko"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Mink� osiotyypin haluat?"
+
+#, 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Valitse \"Asenna\" jos sinulla ei ole Linuxia ennest��n asennettuna,\n"
+#~ "tai jos haluat k�ytt�� useita eri levitysversioita.\n"
+#~ "\n"
+#~ "Valitse \"P�ivit�\", jos haluat p�ivitt�� vanhaa Mandraken versiota Linux:\n"
+#~ "%s tai %s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Valitse:\n"
+#~ "  - Automaattinen (suositeltu): Jos et ole koskaan asentanut linuxia ennen, "
+#~ "valitse t�m�. HUOMAA:\n"
+#~ "    verkkoa ei aseteta t�ss� asennuksessa, k�yt� \"LinuxConf\" asettaaksesi "
+#~ "verkon\n"
+#~ "    asennuksen j�lkeen.\n"
+#~ "\n"
+#~ "  - Muokattu: Jos tunnet GNU/Linuxin ennest��n, voit valita erikseen koneen "
+#~ "k�ytt�tarkoituksen.\n"
+#~ "    Katso alta lis�tietoja.\n"
+#~ "\n"
+#~ "  - Ekspertti: 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 TIED� MIT� TEET!\n"
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "T�ss� vaiheessa sinun tulee valita partitio tai partitiot joille haluat\n"
+#~ "asentaa Linux-Mandrake j�rjestelm�si, jos ne ovat jo olemassa\n"
+#~ "(edellisest� Linux asennuksesta tai jostain muusta osiointity�kalusta).\n"
+#~ "Muissa tapauksissa kiintolevy tulee osioida. Operaatiossa kiintolevy\n"
+#~ "loogisesti osioidaan eri k�ytt�tarkoituksiin.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jos sinun t�ytyy luoda uusia osioita k�yt� \"Automaattinen varaus\"\n"
+#~ "toimintoa osioiden luonnin automatisoimiseksi. Voit valita osioitavan levyn\n"
+#~ "klikkaamalla \"hda\":ta ensimm�iselle IDE-levylle, \"hdb\":ta toiselle\n"
+#~ "tai \"sda\":ta ensimm�iselle SCSI-levylle jne.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kaksi yleist� osiota ovat: juurosio (/), joka on j�rjestelm�n\n"
+#~ "k�ynnistymispiste tiedostoj�rjestelm�ss�, ja /boot joka sis�lt�� kaikki\n"
+#~ "tarpeelliset tiedostot j�rjestelm�n k�ynnist�miseksi, kun se laitetaan\n"
+#~ "k�yntiin.\n"
+#~ "\n"
+#~ "\n"
+#~ "Koska toimenpiteen muutoksia ei yleens� voida peruuttaa, osiointi voi\n"
+#~ "olla pelottavaa ja vaikeaa uudellen k�ytt�j�lle. DiskDrake-ohjelma\n"
+#~ "helpottaa toimenpidett�. Lue dokumentaatiota ja tutki asia huolella\n"
+#~ "ennenkuin jatkat.\n"
+#~ "\n"
+#~ "\n"
+#~ "Voit k�ytt�� kaikkia toimintoja n�pp�imist�lt�: selaa osiota k�ytt�en\n"
+#~ "Tab ja Yl�s/Alas nuolia. Kun osio on valittu, voit k�ytt��:\n"
+#~ "\n"
+#~ "- Ctrl-c  luodakdesi uuden osion (kun tyhj� osio on valittu)\n"
+#~ "\n"
+#~ "- Ctrl-d  tuhotaksesi osion\n"
+#~ "\n"
+#~ "- Ctrl-m  asettaaksesi liitospisteen\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."
+#~ msgstr ""
+#~ "Kaikki uudelleenm��ritellyt uudet osiot tulee alustaa, jotta niit� voidaan\n"
+#~ "k�ytt�� (alustus tarkoittaa tiedostoj�rjestelm�n luomista). Samalla\n"
+#~ "voit uudelleenalustaa joitain osioita joilta haluat poistaa tiedot.\n"
+#~ "Huomaa: Olemassaolevien partitioiden alustus ei ole pakollista,\n"
+#~ "varsinkin jos ne sis�lt�v�t ennest��n tiedostoja jotka haluat s�ilytt��.\n"
+#~ "Normaalisti s�ilytett�vi� ovat /home ja /usr/local."
+
+#~ 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."
+#~ msgstr ""
+#~ "Valitsemiasi paketteja asennetaan. T�m�n vaiheen tulisi kest��\n"
+#~ "muutamia minuutteja, ellet ole valinnut olemassaolevan j�rjestelm�n\n"
+#~ "p�ivityst�. P�ivitys kest�� kauemmin jopa ennenkuin itse p�ivitys\n"
+#~ "alkaa."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Jos DrakX ei l�yt�nyt hiirt�si tai haluat tarkistaa mit� ohjelma\n"
+#~ "teki sinulle, n�et listan hiirist� yl�puolella.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jos olet samaa mielt� DrakX:n asetuksista hypp�� haluamaasi osioon\n"
+#~ "klikkaamalla valikkoa vasemmalla. Muuten valitse valikosta hiiren\n"
+#~ "tyyppi jonka uskot olevan l�hinn� omaa hiirt�si.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jos sinulla on sarjaporttihiiri sinun tulee my�s kertoa DrakX:lle\n"
+#~ "mihin porttiin hiiri on kytketty."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "T�m� osio on paikallisverkon tai modeemin asetuksia varten.\n"
+#~ "\n"
+#~ "Valitse \"Paikallinen LAN\" jolloin DrakX yritt�� hakea Ethernet-ohjaimia\n"
+#~ "j�rjestelm�st�si. PCI-ohjaimien tulisi l�yty� ja toimia automaattisesti.\n"
+#~ "Kuitenkin jos laitteesi on ISA-v�yl�ss� automaattitunnsitus ei toimi ja\n"
+#~ "sinun tulee valita ajuri ilmestyv�lt� listalta.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kuten SCSI-ohjaimilla voit antaa ajurin k�ytt�� ohjainta ensin\n"
+#~ "automaattisesti, jos t�m� ei toimi sinun tulee antaa ylim��r�isi�\n"
+#~ "asetuksia jotka olet hakenut Windowsin ohjauspaneelista.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jos asennat Linux-Mandrake j�rjestelm�n osaksi olemassaolevaa\n"
+#~ "verkkoa verkon yll�pit�j� on antanut sinulle kaikki tarvittavat\n"
+#~ "tiedot (IP-osoiteen, verkkopeiteen sek� j�rjestelm�n nimen). Jos\n"
+#~ "esimerkiksi asetat omaa kotiverkkoa sinun tulee itse valita n�m�\n"
+#~ "osoitteet.\n"
+#~ "\n"
+#~ "Valitse \"Soittoyhteys\" modeemilla jolloin internet-yhteys modeemilla\n"
+#~ "asetetaan. DrakX yritt�� ensin etsi� modeemiasi, jos se ei onnistu\n"
+#~ "sinun tulee valita oikea sarjaportti johon modeemisi on kytketty."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "Linux osaa k�sitell� monentyyppisi� tulostimia. Jokainen n�ist�\n"
+#~ "vaatii erilaisen asetukset. Huomaa, ett� tulostusjono k�ytt��\n"
+#~ "'lp'-nime� oletustulostimelle, joten sinulla tulee olla yksi tulostin\n"
+#~ "t�ll� nimell�. Voit antaa monia nimi� halutessasi ja erotella ne\n"
+#~ "'|'-merkill�. Eli jos haluat tulostimellesi merkitsev�mm�n nimen\n"
+#~ "sinun tulee vain laittaa se ensin, esim. \"Tulostimeni|lp\".\n"
+#~ "Tulostin jonka nimen� on \"lp\" on oletustulostin.\n"
+#~ "\n"
+#~ "Jos tulostimesi on kytketty suoraan tietokoneeseesi, valitse\n"
+#~ "\"Paikallinen Tulostin\". Sinun tulee kertoa mihin porttiin tulostin\n"
+#~ "on kytketty ja valita sopiva suodatin.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jos haluat k�ytt�� tulostinta joka on toisessa Unix-palvelimessa,\n"
+#~ "sinun tulee valita \"Et� lpd\". Saadaksesi tulostimen toimimaan\n"
+#~ "k�ytt�j�nime� tai salasanaa ei tarvita, mutta sinun tulee tiet��\n"
+#~ "et�koneen nimi sek� tulostusjonon nimi.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jos haluat k�ytt�� SMB tulostinta (joka tarkoittaa sit� ett�\n"
+#~ "tulostin on Windows 9x/NT koneella), sinun tulee m��ritell�\n"
+#~ "koneen SMB nimi (joka ei ole sama kuin sen TCP/IP nimi), ja mahdollisesti\n"
+#~ "koneen IP-osoite, k�ytt�j�nimi, ty�ryhm� sek� salasana jotta voisit k�ytt��\n"
+#~ "tulostinta sek� tietysti tulostimen nimi. Sama koskee NetWare tulostimia\n"
+#~ "paitsi et tarvitse ty�ryhm�tietoja."
+
+#, fuzzy
+#~ 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."
+#~ msgstr ""
+#~ "Suosittelemme ett� vastaat t�h�n \"Kyll�\". Jos asennat esimerkiksi\n"
+#~ "Windowsin uudelleen asennusohjelma ylikirjoittaa k�ynnistyslohkon. Jos\n"
+#~ "et ole jo tehnyt k�ynnistyslevykett� et voi k�ynnist�� t�m�n j�lkeen\n"
+#~ "Linuxia uudelleen."
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Unohda muutokset?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "Kirjoitinyhteys"
+
+#~ msgid "Host name:"
+#~ msgstr "Koneen nimi:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Mink� tyyppinen hiiri sinulla on?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Automaattiset resoluutiot"
+
+#~ 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"
+#~ msgstr ""
+#~ "Jotta olemassaolevat resoluutiot l�ydet��n ohjelma kokeilee eri "
+#~ "resoluutioita.\n"
+#~ "N�ytt�si v�l�htelee t�m�n aikana...\n"
+#~ "Voit laittaa n�yt�n pois p��lt� jos haluat, kun haku on valmis ohjelma "
+#~ "piippaa."
+
+#~ 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?"
+#~ msgstr ""
+#~ "Ohjelma voi etsi� olemassaolevat resoluutiot (esim: 800x600).\n"
+#~ "T�m� voi joskus lukita koneen.\n"
+#~ "Haluatko yritt��?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Toimivia n�ytt�tiloja ei l�ytynyt\n"
+#~ "Yrit� toista n�yt�nohjainta tai n�ytt��."
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Automaattinen resoluutioiden haku"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB Hiiri"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB Hiiri (2 nappia)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB Hiiri (3+ nappia)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB Hiiri"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB Hiiri (2 nappia)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB Hiiri (3+ nappia)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Yleinen hiiri"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus Mouse"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Bus Mouse"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech Bus Mouse"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB Hiiri"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB Hiiri (3 nappia tai enemm�n)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A tai korkeampi (sarja)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (sarja)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (sarja)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (sarja)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Yleinen hiiri (sarja)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsoft yhteensopiva (sarja)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Yleinen 3-nappinen hiiri (sarja)"
+
+#, fuzzy
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "nfs:n liitt�minen ep�onnistui"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#, fuzzy
+#~ 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?"
+#~ msgstr ""
+#~ "DrakX luo asetustiedostot sek� XFree 3.3:lle ett� XFree 4.0:lle.\n"
+#~ "Oletuksena k�ytet��n 3.3 palvelinta, koska se toimii useammilla\n"
+#~ "n�yt�nohjaimilla.\n"
+#~ "\n"
+#~ "Haluatko kokeilla XFree 4.0:aa?"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Salakirjoitus"
+
+#, fuzzy
+#~ msgid "Configure LAN"
+#~ msgstr "Aseta X"
+
+#, fuzzy
+#~ msgid "End configuration"
+#~ msgstr "Asetukset"
+
+#, fuzzy
+#~ msgid "Do not set up networking"
+#~ msgstr "Aseta verkko"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "Haluatko m��ritell� l�hiverkon j�rjestelm��si?"
+
+#~ msgid "Show less"
+#~ msgstr "N�yt� v�hemm�n"
+
+#~ msgid "Show more"
+#~ msgstr "N�yt� lis��"
+
+#, fuzzy
+#~ msgid "URI for Local printer"
+#~ msgstr "Paikallinen kirjoitin"
+
+#, fuzzy
+#~ msgid "Local Printer Device (URI)"
+#~ msgstr "Paikallinen tulostin"
+
+#, fuzzy
+#~ msgid ""
+#~ "What URI device is your printer connected to\n"
+#~ "(note that parallel:/dev/lp0 is equivalent to LPT1:)?"
+#~ msgstr ""
+#~ "Mihin laitteeseen tulostin on kytketty  \n"
+#~ "(huomaa, ett� /dev/lp0 vastaa LPT1:t�)?\n"
+
+#~ msgid "curly"
+#~ msgstr "cirly"
+
+#~ msgid "default"
+#~ msgstr "oletus"
+
+#~ msgid "tie"
+#~ msgstr "tie"
+
+#~ msgid "brunette"
+#~ msgstr "brunetti"
+
+#~ msgid "girl"
+#~ msgstr "girl"
+
+#~ msgid "woman-blond"
+#~ msgstr "nainen-blondi"
+
+#~ msgid "automagic"
+#~ msgstr "automaattinen"
+
+#, fuzzy
+#~ msgid "Network:"
+#~ msgstr "Verkkopeite:"
+
+#, fuzzy
+#~ msgid "Everything configured!"
+#~ msgstr "luen asetuksia"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Millainen n�pp�imist� sinulla on?"
+
+#~ msgid "Normal"
+#~ msgstr "Normaali"
+
+#, fuzzy
+#~ msgid "Configure my card"
+#~ msgstr "Aseta X"
+
+#, fuzzy
+#~ msgid "pptp alcatel"
+#~ msgstr "Automaattinen varaus"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Yrit� etsi� PCMCIA kortteja?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "Etsi %s laitteita?"
+
+#, fuzzy
+#~ msgid "Small(%dMB)"
+#~ msgstr "(%dMt)"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "Modeemin asetukset"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "Haluatko m��ritell� soittoyhteyden modeemilla j�rjestelm��si?"
+
+#, fuzzy
+#~ msgid "Do you want to configure a ISDN connection for your system?"
+#~ msgstr "Haluatko m��ritell� l�hiverkon j�rjestelm��si?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "Etsi PCI laitteita?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "Etsin juuriosiota"
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: T�m� ei ole juuriosio, valitse joku toinen."
+
+#~ msgid "No root partition found"
+#~ msgstr "Juuriosiota ei l�ytynyt"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "Levitysjakelua ei voida k�ytt�� ilman NIS aluetta"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "Mit� osiota haluat k�ytt�� juuriosiona."
+
+#, fuzzy
+#~ msgid "Autologin at startup"
+#~ msgstr "X k�ynnistyksess�"
+
+#, fuzzy
+#~ msgid "Autologin - Choose default user"
+#~ msgstr "Valitse uusi koko"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "Sinulla ei ole tarpeeksi tilaa Lnx4win:lle"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U Mt"
+
+#~ msgid "Automated"
+#~ msgstr "Automaattinen"
+
+# 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
+#
+# '\204' is '�' (adiaeresis) in cp437 encoding.
+# '\224' is '�' (odiaeresis) in cp437 encoding.
+#
+#~ 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 ""
+#~ "Tervetuloa LILO k�ytt�j�rjestelm�nvalitsijaan!\n"
+#~ "\n"
+#~ "Listataksesi mahdolliset valinnat paina <TAB>.\n"
+#~ "\n"
+#~ "Ladataksesi jonkun niist� kirjoita sen nimi ja paina <ENTER>\n"
+#~ "tai odota %d sekuntia oletusk�ynnistyst�.\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
+#
+#~ 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 ""
+#~ "Tervetuloa SILO kayttojarjestelmanvalitsijaan!\n"
+#~ "\n"
+#~ "Listataksesi mahdolliset valinnat paina <TAB>.\n"
+#~ "\n"
+#~ "Ladataksesi jonkun niista kirjoita sen nimi ja paina <ENTER>\n"
+#~ "tai odota %d sekuntia oletuskaynnistysta.\n"
+#~ "\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "SILOn p��asetukset"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "T�ss� ovat SILO:n asetustietueet.\n"
+#~ "Voit lis�t� uusia tai muuttaa olemassaolevia."
+
+#~ msgid "This label is already in use"
+#~ msgstr "Otsikko on jo k�yt�ss�"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "SILO:n asennus ep�onnistu. Seuraava virhe tapahtui:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX yritt�� ensin etsi� yht� tai useampaa PCI\n"
+#~ "SCSI-ohjainta. Jos ohjelma l�yt�� ohjaimia ja tiet�� mit�\n"
+#~ "ajureita ne k�ytt�v�t ohjaimet otetaan k�ytt��n automaattisesti.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jos SCSI-ohjaimesi on ISA-v�yl�ss�, tai PCI-v�yl�ss�, mutta\n"
+#~ "DrakX ei tied� mit� ajuria k�ytt�isi ohjaimelle, tai jos sinulla ei ole\n"
+#~ "SCSI ohjaimia ollenkaan, sinulta kysyt��n erikseen onko sinulla\n"
+#~ "ohjaimia vai ei. Jos ohjaimia ei ole, vastaa \"Ei\". Jos sinulla on yksi\n"
+#~ "tai useampia, vastaa \"Kyll�\". Saat t�m�n j�lkeen listan ajureista, joista\n"
+#~ "sinun tulee valita yksi.\n"
+#~ "\n"
+#~ "\n"
+#~ "Valittuasi ajurin DrakX kysyy haluatko m��ritell� ajurille\n"
+#~ "optioita. Anna ajurin ensin itse hakea laitteita:\n"
+#~ "t�m� toimii yleens� hienosti.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jos t�m�k��n ei toimi �l� unohda tietoja laitteistasi joita voit saada\n"
+#~ "ohjeista tai Windowsista (jos sinulla on se asennettuna),\n"
+#~ "kuten asennusohje neuvoo. N�m� ovat asetuksia joita sinun tulee\n"
+#~ "antaa ajurille."
+
+#~ msgid "Shutting down"
+#~ msgstr "Sammutan"
+
 #~ msgid "useless"
 #~ msgstr "k�ytt�kelvoton"
 
diff --git a/perl-install/share/po/ga.po b/perl-install/share/po/ga.po
index feb9f1f9f..2aff585a1 100644
--- a/perl-install/share/po/ga.po
+++ b/perl-install/share/po/ga.po
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# Irish translations for DrakX, the Mandrake Installer.
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Irish Linux Users Group <ilug@linux.ie>, 1999
 #
@@ -7,13 +7,14 @@
 #   Donncha �'Caoimh <donncha.ocaoimh@tradesignals.com-nospam>
 #   Barra �'Caoimh <Care of donncha.ocaoimh@tradesignals.com-nospam>
 #   John McDonnell <johnmc@student.nuigalway.ie-nospam>
+#   Alastair McKinstry <mckinstry@computer.org>
 # Who've all contributed so far. 
 # Proinnsias 16-Dec-1999
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 1999-12-16 10:33+0100\n"
 "Last-Translator: Proinnsias Breathnach <breatpro@dublin.ml.com>\n"
 "Language-Team: Gaeilge <ga@li.org>\n"
@@ -21,44 +22,90 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Carta Grafach"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Roghnaigh carta grafachach"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Roghnaigh freastala� X"
 
-#: ../../Xconfigurator.pm_.c:174
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
-msgstr "freastala�"
+msgstr "X freastala�"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree86 %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "C�n sort iontr�il a suimigh do"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "Cumra�ocht XFree"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Roghnaigh an m�id cuimhne at� id' charta grafachach"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Roghnaigh cumra�ocht an freastala�"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Roghnaigh sc�ile�n"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Sc�ile�n"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -72,39 +119,39 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "R�ta athnuachana cothrom�nach"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "R�ta athnuachana ingearach"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "N�l aon sc�ile�n cumraithe"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "N�l aon carta grafachach cumraithe"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
-msgstr ""
+msgstr "N�l aoin r�iteach cumraithe"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "An bhfuil t� ag iarraidh an cumra�ocht a thrial?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Trialaigh an cumra�ocht"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -112,177 +159,168 @@ msgstr ""
 "\n"
 "bain trial as roinnt paraim�adair a athr�"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
-msgstr "Tharla Earr�id"
+msgstr "Tharla Earr�id:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Ag �al� i %d siocand"
 
-#: ../../Xconfigurator.pm_.c:378
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "An bhfuil seo ceart?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Tharla earr�id, bain trial as roinnt paraim�adair a athr�"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
-msgstr ""
+msgstr "R�iteach"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Carta Grafach: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Freastala� XFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Taisp�an gach ceann"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
+msgstr "R�iteacha�"
 
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Leagan amach eocharchl�ra: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Cine�l luch�g: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Gaireas luch�ige: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Sc�ile�n: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
-msgstr ""
+msgstr "Sc�ile�n HorizSync: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
-msgstr ""
+msgstr "Sc�ile�n VertRefresh: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Carta Grafach: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Cuimhne grafach: %s kb\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Sc�ile�n VertRefresh: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "R�iteacha�"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Freastala� XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "Freastala� XFree86: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Ag ullmh� cumra�ocht X-Windows"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Athraigh Sc�ile�n"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Athraigh carta grafach"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Athraigh cumra�ocht an freastala�"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr ""
+msgstr "Athraigh R�iteach"
 
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Taispe�n Eolas"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Bain trial as ar�s"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "�alaigh"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "C�ard a theasta�onn uait a dh�anamh?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr ""
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Coimead an cumra�ocht IP at� ann"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X ag t�s"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -290,398 +328,554 @@ msgstr ""
 "Is f�idir linn do r�omhaire a shocr� le X a thosn� i ndhiadh boot�il.\n"
 "An dteasta�onn uait go dtosn�far X nuair a aththosn�tear an r�omhaire?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Uath-Logann"
+
+#: ../../Xconfigurator.pm_.c:1152
+#, 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."
+msgstr ""
+"Is f�idir linn do r�omhaire a shocr� le X a thosn� i ndhiadh boot�il.\n"
+"An dteasta�onn uait go dtosn�far X nuair a aththosn�tear an r�omhaire?"
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Roghnagih an �s�idoer gne�s:"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Roghnaigh an Bainist�oir Fhuinneoga a �s�sd:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 dath (8 giot�in)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 m�le dath (15 giot�in)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 m�le dath (16 giot�in)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 milli�n dath (24 giot�in)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 billi�n dath (32 giot�in)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB n� n�os m�"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Gn�th VGA, 640x480 ag 60Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 ag 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
-msgstr ""
+msgstr "Cin�al 8514, 1024x768 ag 87 Hz Idirdhuillith (gan 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 ag 87 Hz Idirdhuillithe, 800x600 ag 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "SVGA Leathnaithe, 800x600 ag 60 Hz, 640x480 ag 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "SVGA Neamh-idirdhuillithe, 1024x768 ag 60 Hz, 800x600 ag 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "SVGA d'�rd minic�ocht, 1024x768 ag 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Sc�ile�n ilmhinic�ocht a bhfuil in ann do 1280x1024 ag 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Sc�ile�n ilmhinic�ocht a bhfuil in ann do 1280x1024 ag 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Sc�ile�n ilmhinic�ocht a bhfuil in ann do 1280x1024 ag 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Sc�ile�n a bhfuil in ann do 1600x1200 ag 70Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Sc�ile�n a bhfuil in ann do 1600x1200 ag 76Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr ""
-
-#: ../../any.pm_.c:17
-#, fuzzy
-msgid "default"
-msgstr " ? (gn�s %s)"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-#, fuzzy
-msgid "tie"
-msgstr "Gn�omhach"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr ""
-
-#: ../../any.pm_.c:19
-#, fuzzy
-msgid "automagic"
-msgstr "Uath-IP"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr ""
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr ""
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr ""
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "Roghnaigh rang feisti�"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
-#: ../../any.pm_.c:73
-#, fuzzy
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "Feisti� LILO/grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
-msgstr "Cr�ochnithe"
+msgstr "Ar bith"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 #, fuzzy
 msgid "Which bootloader(s) do you want to use?"
 msgstr "C�n tesc�n ag a dteasta�onn uait � a bhogadh?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Feisti� c�d tosnaithe"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
-msgstr ""
+msgstr "Gaireas boot�il"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr ""
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
-msgstr ""
+msgstr "Compact"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
-msgstr ""
+msgstr "compact"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr ""
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
+msgstr "M�d f�s"
+
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
 msgstr ""
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Pasfhocal"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Pasfhocal (ar�s)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr ""
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
-msgstr ""
+msgstr "teorannaigh"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
-msgstr ""
+msgstr "Pr�omhroghanna boot�il"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Aththrialaigh"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "N� mar a ch�ile na pasfhocail"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
 msgstr ""
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
-msgstr ""
+msgstr "Suim"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Cr�ochnithe"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "C�n sort iontr�il a suimigh do?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "CO Eile (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "CO Eile (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr ""
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
-msgstr ""
+msgstr "Iomha"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
-msgstr ""
+msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
-msgstr ""
+msgstr "Append"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
-msgstr ""
+msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
-msgstr ""
+msgstr "L�amh-Scr�obh"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
-msgstr ""
+msgstr "Table"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
-msgstr ""
+msgstr "Baolach"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
-msgstr ""
+msgstr "Lip�ad"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
-msgstr ""
+msgstr "Gn�th"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
-msgstr ""
+msgstr "Scrios iontr�il"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
-msgstr ""
+msgstr "N�l ceadaigh an lip�ad folamh ann"
 
-#: ../../any.pm_.c:167
-#, fuzzy
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Is ann cheana don ainm �s�ideora seo"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Fuair %s %s comh�adan"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "An bhfuil ceann eile agat?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "An bhfuil comh�adan %s agat?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "N�l"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "T�"
+
+#: ../../any.pm_.c:505
+msgid "See hardware info"
+msgstr "Le�mh an t-eolais crua-earra"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Ag feist�il tiomana� do %s, carta %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(mod�l %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr ""
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr ""
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Cumraigh roghanna"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr ""
+
+#: ../../any.pm_.c:557
+#, 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 ""
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Roghachais mod�il:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+
+#: ../../bootloader.pm_.c:234
+#, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr ""
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr ""
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr ""
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr ""
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr ""
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr ""
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr ""
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Cl�r Tosn�"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d noim�aid"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 noim�ad"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d soic�nd"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Cruthaigh"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Dealaigh"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Form�idigh"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Athm�idigh"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Cine�l"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Scr�obh /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Aisig � comhad"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Sabh�il i gcomhad"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Aisig � dhiosca flapach"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Sabh�il ar dhiosca flapach"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Glan gach ceann"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Form�idigh gach ceann"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "T� na ranna pr�ofa uilig �s�idthe"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "N� f�idir liom rann eile a cur isteach"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -689,61 +883,63 @@ msgstr ""
 "Le breis ranna a bheith agat, dealaigh ceann amh�in le bheith in ann "
 "ranns�nithe a cruth�"
 
-#: ../../diskdrake.pm_.c:53
-#, fuzzy
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
-msgstr "Scriobh cl�r-ranna"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Cealaigh"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Scriobh cl�r-ranna"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Athl�daigh"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Folamh"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
-msgstr ""
+msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Eile"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Malairte"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Folamh"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Eile"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Cine�l c�rais-comhadlanna"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Sonra�"
 
-#: ../../diskdrake.pm_.c:138
-#, fuzzy
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -754,94 +950,94 @@ msgstr ""
 "Molaim dhuit an rann sin a athmh�ad� ar dt�s\n"
 "(roghnaigh an rann agus br� ar \"Athm�idigh\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "L�igh go curamach"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 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:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Earr�id"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Gaireas: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Litir Dioscthiom�nt DOS: %s (buile faoi thuraim)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Cine�l: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "T�s: teasc�n %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "M�id: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s teasc�in"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Sorc�ir %d go sorc�ir %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Form�idithe\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Neamhform�idithe\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -849,81 +1045,79 @@ msgstr ""
 "Rann tosaithe de ghn�th\n"
 "    (do thosn� MS-DOS, n� lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Leibh�al %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "M�id smut�n %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "Diosca� RAID %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:259
-#, fuzzy
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
-msgstr "Cruthaigh rann nua"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "M�id: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "C�imseasamh: %s sorc�ir, %s ceann, %s teasc�n\n"
 
-#: ../../diskdrake.pm_.c:267
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:273
+#, c-format
 msgid "Partition table type: %s\n"
-msgstr "Rann Fr�amhach"
+msgstr "Cin�al tabla rann: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "ar bh�s %d, id %d\n"
 
-#: ../../diskdrake.pm_.c:281
-#, fuzzy
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
-msgstr "Sc�ile�n"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Gn�omhach"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Cur le RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Bain � RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Athraigh RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Roghnaigh gn�omh"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -935,7 +1129,7 @@ msgstr ""
 "M� t� t� ag �s�id LILO n� oibr�idh s�, n� n�l /boot uait muna n-�s�ideann t� "
 "LILO"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -946,201 +1140,207 @@ msgstr ""
 "sorc�ir ar an dhiosca, agus n�l aon rann /boot agat.\n"
 "M� t� t� chun LILO a �s�id, beidh ort rann /boot a cruth� ar ball."
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
+#, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
-msgstr "caillfear gach sonra ar an rann seo"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Lean ar aghaidh ar aon n�s?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "�alaigh gan sabh�il"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "�alaigh gan an cl�r-ranna a scr�obh?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Athraigh cine�l ranna"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
 msgstr "C�n rann at� uait?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:484
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:490
+#, c-format
 msgid "Where do you want to mount loopback file %s?"
-msgstr "C�n tesc�n ag a dteasta�onn uait � a bhogadh?"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:485
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:491
+#, c-format
 msgid "Where do you want to mount device %s?"
-msgstr "C�n tesc�n ag a dteasta�onn uait � a bhogadh?"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:509
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:515
+#, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "caillfear gach sonra ar an rann seo"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Ag form�idi�"
 
-#: ../../diskdrake.pm_.c:512
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:518
+#, c-format
 msgid "Formatting loopback file %s"
-msgstr "Ag form�idi� rann %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Ag form�idi� rann %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "I ndhiadh na rann ar fad form�idi�,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "caillfear gach sonra ar na ranna"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Bog"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "C�n diosca ag a dteasta�onn uait � a bhogadh?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Teasc�n"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "C�n tesc�n ag a dteasta�onn uait � a bhogadh?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Ag bogadh"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Ag bogadh rann..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Scr�obhfar cl�r diosca %s go dhiosca!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Beidh ort an r�omhaire a aththosn� sula nd�anfar an athr�"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Ag r�omhadh teorainn na c�rais-comhadlanna FAT"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Ag athm�ad�"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Scriobh cl�r-ranna"
+
+#: ../../diskdrake.pm_.c:597
 #, fuzzy
 msgid "All data on this partition should be backed-up"
 msgstr "caillfear gach sonra ar an rann seo"
 
-#: ../../diskdrake.pm_.c:588
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:599
+#, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "caillfear gach sonra ar an rann seo"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Roghnaigh an m�id nua"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Cruthaigh rann nua"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Teasc�n tosasch: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "M�id i MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Cine�l c�ras-comhadlanna"
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Tosa�ocht: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Roghnaigh Comhad"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1148,11 +1348,11 @@ msgstr ""
 "N�l an m�id c�anna ar an rann c�ltaca\n"
 "Lean ar aghaidh ar aon n�s?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1160,77 +1360,77 @@ msgstr ""
 "Cur diosca flapach sa dioscthiomant\n"
 "Caillfear gach sonra ar an dhiosca seo"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Ag iarraidh an cl�r-ranna a tarrth�il"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "gaireas"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "leibh�al"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "m�id smut�n"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Roghnaigh RAID at� ann le m�ad�"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "nua"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "Form�idi� %s de %s teipithe"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "n�l a fhios agam conas %s a form�idi� go %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr ""
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr ""
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr ""
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr ""
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Earr�id ag oscailt %s do scr�obh: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1239,51 +1439,80 @@ msgstr ""
 "nua a cruthu. Ba ch�ir duit do chuid crua-earra� a seice�il le c�is an fadhb "
 "a aimsi�"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "N�l aon ranna agat!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr ""
 
-#: ../../help.pm_.c:10
+#: ../../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 ""
 
-#: ../../help.pm_.c:13
+#: ../../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
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"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"
-"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).\n"
 "\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
-"  - 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"
+"\t* Recommanded: 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"
-"  - 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"
+"\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1291,325 +1520,753 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 ""
+
+#: ../../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"
+"\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 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"
+"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"
-"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"
+"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"
-"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."
+"\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."
 msgstr ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:160
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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"
 "\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"
-"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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\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"
+msgstr ""
+
+#: ../../help.pm_.c:218
+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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:252
 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."
+"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:139
+#: ../../help.pm_.c:257
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"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"
-"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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"\n"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:267
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
 
-#: ../../help.pm_.c:155
-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."
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:303
 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"
+"Any partitions that have been newly defined must be\n"
+"formatted for use (formatting meaning creating a filesystem).\n"
 "\n"
 "\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\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"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:329
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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:180
+#: ../../help.pm_.c:341
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"You can now choose individually all the packages you\n"
+"wish to install.\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"
+"You can expand or collapse the tree by clicking on options in the left "
+"corner of\n"
+"the packages window.\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"
+"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
+"\"Toggle flat and group sorted\".\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"
+"\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:358
+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:363
+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"
-"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."
+"Please be patient."
+msgstr ""
+
+#: ../../help.pm_.c:371
+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:376
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:380
 msgid ""
-"Enter:\n"
+"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"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
+"\n"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\n"
 "\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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:393
+msgid ""
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
 "\n"
-"  - Automatic IP: If your network uses bootp or dhcp protocol, select \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
 msgstr ""
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+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:425
+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 ""
+
+#: ../../help.pm_.c:437
+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:441
+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:445
 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:229
+#: ../../help.pm_.c:449
 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:233
+#: ../../help.pm_.c:453
 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 ""
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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:257
+#: ../../help.pm_.c:486
+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:490
+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:505
+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 ""
+
+#: ../../help.pm_.c:521
 msgid ""
-"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"
+"Please turn on your printer before continuing to let DrakX detect it.\n"
 "\n"
+"You have to enter some informations here.\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"
 "\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"
-"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"
 "\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"
-"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."
+"\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:286
+#: ../../help.pm_.c:542
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
 msgstr ""
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
 msgstr ""
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1633,34 +2290,33 @@ msgid ""
 "and maintenance purposes."
 msgstr ""
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
 msgstr ""
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1671,7 +2327,7 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1688,14 +2344,45 @@ msgid ""
 "\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."
 msgstr ""
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 ""
+
+#: ../../help.pm_.c:692
+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 ""
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -1707,57 +2394,61 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
 msgstr ""
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
 msgstr ""
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"\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"
+"\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"
+"\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"
+"\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."
 msgstr ""
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -1766,324 +2457,346 @@ msgid ""
 "the additional instructions."
 msgstr ""
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Roghnaigh do theanga"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Roghnaigh rang feisti�"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr ""
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Cumraigh luch�g"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Roghnaigh mh�archl�r"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Eile"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Socraigh c�ras chomhad"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Form�idigh ranna"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Roghnaigh pac�ist� ..."
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Feistigh c�ras"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Cumraigh gr�as�n�"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "R�nscr�obhach"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Cumraigh crios ama"
 
-#: ../../install2.pm_.c:56
-#, fuzzy
+#: ../../install2.pm_.c:53
 msgid "Configure services"
-msgstr "Cumraigh print�ir"
+msgstr "Cumraigh seirbhis�"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Cumraigh print�ir"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Socraigh pasfhocal root"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
-msgstr "�s�ideoir Nua ..."
+msgstr "Suimigh �s�ideoir"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
-msgstr ""
+msgstr "Cruthaigh an diosca "
 
-#: ../../install2.pm_.c:63
-#, fuzzy
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
-msgstr "Feistigh c�ras"
+msgstr "Feistigh c�d tosnaithe"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Cumraigh X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr ""
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Eirigh as Feisti�"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Earr�id ag l�amh comhad $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr ""
+
+#: ../../install_gtk.pm_.c:427
+msgid "To activate the mouse,"
+msgstr ""
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
 "Then choose action ``Mount point'' and set it to `/'"
 msgstr ""
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-msgid ""
-"I can't read your partition table, it's too corrupted for me :(\n"
-"I'll try to go on blanking bad partitions"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
 msgstr ""
-"Ni f�idir liom an t�bla rainn a l�amh, t� m�chaill� ann :(\n"
-"Leanfaidh m� orm ag ceal� droch rainn"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"Theip ar DiskDrake an tabla rainn a l�amh i gceart.\n"
-"Lean ort, ar do phriacal f�in!"
+"N�l aon ranna malairte agat\n"
+"\n"
+"x1Lean ar aghaidh ar aon n�s?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Ag c�rdach an rann fr�amhach."
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "�s�id sp�s saor"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Eolas"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: N� rann fr�amhach at� anseo, roghnaigh ceann eile."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr ""
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "N� fuaireathas rann fr�amhach"
+#: ../../install_interactive.pm_.c:80
+#, fuzzy
+msgid "There is no existing partition to use"
+msgstr "Ag iarraidh an cl�r-ranna a tarrth�il"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Ni feidir craoladh gan fearann NIS"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr ""
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Earr�id ag l�amh comhad $f"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "C�n rann a bhfuil t� ag iarraidh �s�id mar rann fr�amhach"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Ta earraid ann, n�l a fhios agam conas � a cheart�.\n"
-"Lean ort, ar do phriacal f�in."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Roghnaigh an m�id nua"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Pointe taca dublach %s"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "M�id i MB do Rhann Fr�amhach:"
 
-#: ../../install_steps.pm_.c:323
-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"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "M�id i MB do rhann malairte:"
+
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
 msgstr ""
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
 msgstr ""
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "N�l dioscthiom�nt flapach ar f�il"
+#: ../../install_interactive.pm_.c:107
+#, fuzzy
+msgid "Computing Windows filesystem bounds"
+msgstr "Ag r�omhadh teorainn na c�rais-comhadlanna FAT"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "Ag tosn� ar c�im `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:287
-#, fuzzy
-msgid "Choose the size you want to install"
-msgstr "Roghnaigh pac�ist� ..."
-
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "M�id ioml�n: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "Leagan: %s\n"
+msgid "partition %s"
+msgstr "rann %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "M�id: %d KB\n"
+msgid "FAT resizing failed: %s"
+msgstr "Theip ar uathathmh�ad� FAT: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Eolas"
-
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Fan tamall, "
-
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Am fagtha "
-
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Am ioml�n "
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Dealaigh Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:156
 #, c-format
-msgid "Installing package %s"
+msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Lean ar aghaidh ar aon n�s?"
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "M�d Saineola�"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr ""
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "�s�id diskdrake"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Bain �s�id as an cumra�ocht X11 at� ann?"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "�s�id fdisk"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
+#: ../../install_interactive.pm_.c:171
+#, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:199
+#: ../../install_interactive.pm_.c:195
 #, fuzzy
-msgid "You don't have any windows partitions!"
+msgid "You don't have enough free space on your Windows partition"
 msgstr "N�l aon ranna agat!"
 
-#: ../../install_steps_gtk.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 #, fuzzy
-msgid "You don't have any enough room for Lnx4win"
-msgstr "N�l aon ranna agat!"
+msgid "I can't find any room for installing"
+msgstr "N� f�idir liom rann eile a cur isteach"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Theip ar rann�: %s"
+
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Ag tosn� suas an ghr�as�n"
+
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Ag d�nadh s�os an ghreas�n"
+
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
+"Ta earraid ann, n�l a fhios agam conas � a cheart�.\n"
+"Lean ort, ar do phriacal f�in."
+
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Pointe taca dublach %s"
+
+#: ../../install_steps.pm_.c:375
+msgid ""
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Theip ar uathathmh�ad�"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "F�ilte go %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-#, fuzzy
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "C�n rann a bhfuil t� ag iarraidh �s�id mar rann fr�amhach"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "N�l dioscthiom�nt flapach ar f�il"
 
-#: ../../install_steps_gtk.pm_.c:284
-#, fuzzy
-msgid "Choose the sizes"
-msgstr "Roghnaigh an m�id nua"
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Ag tosn� ar c�im `%s'\n"
 
-#: ../../install_steps_gtk.pm_.c:286
-#, fuzzy
-msgid "Root partition size in MB: "
-msgstr "Rann Fr�amhach"
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:288
-#, fuzzy
-msgid "Swap partition size in MB: "
-msgstr "M�id i MB: "
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2092,7 +2805,7 @@ msgid ""
 "a percentage of 100%% will install all selected packages."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2102,104 +2815,186 @@ msgid ""
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:335
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
-msgstr "Roghnaigh pac�ist� ..."
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Eolas"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Feisti�"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:449
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
-msgstr "%d pac�ist�"
+msgstr "Pac�iste m�cheart"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
-msgstr ""
+msgstr "Ainm: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Leagan: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "M�id: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
-msgstr ""
+msgstr "T�bhacht: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
-#, fuzzy, c-format
+#: ../../install_steps_gtk.pm_.c:363
+#, c-format
 msgid "Total size: %d / %d MB"
-msgstr "M�id ioml�n: "
+msgstr "M�id ioml�n: %d / %d MB"
+
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "Roghnaigh pac�ist� ..."
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:496
-#, fuzzy
-msgid "The following packages are going to be installed/removed"
-msgstr "Roghnaigh pac�ist� ..."
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr ""
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Ag Feisti�"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Ag meast�"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Fan tamall, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Am fagtha "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Am ioml�n "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pac�ist�"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Ag feisti�l  pac�iste %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2209,368 +3004,403 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Athm�idigh"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Lean ar aghaidh ar aon n�s?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Tharla earr�id"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Eocharcl�r"
 
-#: ../../install_steps_interactive.pm_.c:73
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "C�n leagan amach at� ar d'eocharchl�rsa"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Rann Fr�amhach"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "C�ard � an rann fr�amhach (/) ded' ch�ras?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
-msgstr ""
+msgstr "Rann Feisti�"
 
-#: ../../install_steps_interactive.pm_.c:100
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
-msgstr "C�n teanga at� uait?"
-
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
-msgstr ""
+msgstr "C�n rann feisti� at� uait?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr ""
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
+msgstr "Feisti�"
 
-#: ../../install_steps_interactive.pm_.c:110
+#: ../../install_steps_interactive.pm_.c:183
 #, fuzzy
-msgid "Automated"
-msgstr "Uath-IP"
+msgid "Is this an install or an update?"
+msgstr "Is iad an Feistigh n� tarrth�il ?"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Molta"
+
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Socraithe"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Saineola�"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
-msgstr "Uasgr�d�"
+#: ../../install_steps_interactive.pm_.c:216
+msgid "Update"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Gn�th"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "St�isi�n Oibre"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Forbairt"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Freastala�"
 
-#: ../../install_steps_interactive.pm_.c:141
+#: ../../install_steps_interactive.pm_.c:228
 #, fuzzy
-msgid "Which usage is your system used for ?"
+msgid "What is your system used for?"
 msgstr "C�n ceann do chrois ama"
 
-#: ../../install_steps_interactive.pm_.c:152
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "C�n cin�al luch�g at� agat?"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Gaireas luch�ige"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:172
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Cumraigh C�rta� PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
-msgstr "Trialaigh an cumra�ocht"
+msgstr "Ag cumraigh IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
-msgstr ""
+msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "n�l aon ranna saora ann"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-#, fuzzy
-msgid "Please choose a partition to use as your root partition."
-msgstr "C�n rann a bhfuil t� ag iarraidh �s�id mar rann fr�amhach"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:210
-msgid "You need to reboot for the partition table modifications to take place"
+#: ../../install_steps_interactive.pm_.c:316
+#, fuzzy, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
 msgstr ""
+"Ni f�idir liom an t�bla rainn a l�amh, t� m�chaill� ann :(\n"
+"Leanfaidh m� orm ag ceal� droch rainn"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"Theip ar DiskDrake an tabla rainn a l�amh i gceart.\n"
+"Lean ort, ar do phriacal f�in!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Rann Fr�amhach"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "C�ard � an rann fr�amhach (/) ded' ch�ras?"
+
+#: ../../install_steps_interactive.pm_.c:352
+msgid "You need to reboot for the partition table modifications to take place"
+msgstr "Beidh ort an r�omhaire a aththosn� sula nd�anfar an athr�"
+
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Roghnaigh na ranna at� le form�idi�"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:248
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
-msgstr "Ag form�idi� rann %s"
+msgstr "Ag form�idi� ranna"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Nil dothain spas malartu chun insealbhu, chuir leis an spas"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Ag curdach do na pac�ist� at� ar f�il"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Ag c�rdach pac�ist� le h�asgr�d�"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "Cr�ochnaithe (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "�osta (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Molta (%d MB)"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "Socraithe"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Roghn� Gr�pa Pac�ist�"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
+"Ag feiste�il pac�iste %s\n"
+"%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
-msgstr "Trialaigh an cumra�ocht"
-
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Coimead an cumra�ocht IP at� ann"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Athchumraigh an gr�as�n� anois"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "N� cumraigh gr�as�n� anois"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Cumra�ocht Gr�as�n�"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "T� gr�as�n� l�ganta cumraithe cheana f�in. An dteasta�onn uait:"
-
-#: ../../install_steps_interactive.pm_.c:421
-#, fuzzy
-msgid "Do you want to configure a local network for your system?"
-msgstr "An dteasta�onn uait gr�as�n� a chumr� ded' ch�ras?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "n� fuaireathas c�rta gr�as�n�"
-
-#: ../../install_steps_interactive.pm_.c:449
-#, fuzzy
-msgid "Modem Configuration"
-msgstr "Trialaigh an cumra�ocht"
-
-#: ../../install_steps_interactive.pm_.c:450
-#, fuzzy
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "An dteasta�onn uait gr�as�n� a chumr� ded' ch�ras?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Ag cumr� gl�as gr�as�n� %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Uath-IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "Seoladh IP:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Ag cumr� an ghr�as�n"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "D�an iarracht m�ideam a aimsi�?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Uimhir f�n"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Script-bhunaithe"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2609,89 +3439,92 @@ msgid ""
 "USA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:592
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
-msgstr "Roghnaigh pac�ist� ..."
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
 msgstr "C�n ceann do chrois ama"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "An bhfuil an clog cruaearrach ar GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Gan pasfhocal"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Bain �s�id as sc�ilcomhad"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "sc�il"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Bain �s�id as pasfhocail MD5"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Bain �s�id as NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "leathanaigh bu�"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
-msgstr ""
+msgstr "Fearannas NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
-msgstr ""
+msgstr "Freastala� NIS"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
-msgstr ""
+msgstr "Suimigh �s�ideoir"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -2699,62 +3532,79 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "F�or ainm"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Ainm �s�ideora"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
-msgstr ""
+msgstr "Blaosc"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
-msgstr ""
+msgstr "Dealbh"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "T� an pasfhocal seo ro-shimpl�"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Is ann cheana don ainm �s�ideora seo"
 
-#: ../../install_steps_interactive.pm_.c:747
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
-msgstr "Cur isteach diosca sa dioscthiomant %s"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 #, fuzzy
 msgid "Second floppy drive"
-msgstr "Sabh�il ar dhiosca flapach"
+msgstr "Cur isteach diosca sa dioscthiomant %s"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
-msgstr ""
+msgstr "Scipe�il"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -2768,192 +3618,156 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Br�n orm, n�l aon dioscthiom�nt flapach ar f�il"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
+#, fuzzy
 msgid "Choose the floppy drive you want to use to make the bootdisk"
-msgstr ""
+msgstr "Roghnaigh na ranna at� le form�idi�"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Cur isteach diosca sa dioscthiomant %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:806
+#: ../../install_steps_interactive.pm_.c:904
 #, fuzzy
-msgid "Do you want to use SILO?"
-msgstr "C�ard a theasta�onn uait a dh�anamh?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:858
-#, fuzzy
-msgid "Partition"
-msgstr "Rann Fr�amhach"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:902
 msgid "Preparing bootloader"
-msgstr ""
+msgstr "Feistigh c�ras"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 #, fuzzy
 msgid "Do you want to use aboot?"
 msgstr "C�ard a theasta�onn uait a dh�anamh?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
-msgstr ""
+msgstr "Bocht"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
-msgstr ""
+msgstr "Bun"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
-msgstr ""
+msgstr "Gn�th"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
-msgstr ""
+msgstr "�rd"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
-msgstr ""
+msgstr "Paran�id"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Ceisteanna eile"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
+#, fuzzy
 msgid "Use hard drive optimisations?"
-msgstr ""
+msgstr "Athraigh cumra�ocht an freastala�"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
-msgstr ""
+msgstr "Glan /tmp nuair a thosnaigh an cor�is"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
+#, fuzzy
 msgid "Enable num lock at startup"
-msgstr ""
+msgstr "X ag t�s"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Bain �s�id as an cumra�ocht X11 at� ann?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1038
-#, fuzzy, c-format
+#: ../../install_steps_interactive.pm_.c:1030
+#, c-format
 msgid "Insert a blank floppy in drive %s"
-msgstr "Cur isteach diosca sa dioscthiomant %s"
+msgstr "Cur isteach diosca folamh sa dioscthiomant %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -2966,140 +3780,17 @@ msgid ""
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Ag d�nadh s�os"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "D�an iarracht carta� PCMCIA a lorg?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Cumraigh C�rta� PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, fuzzy, c-format
-msgid "Try to find %s devices?"
-msgstr "D�an iarracht m�ideam a aimsi�?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "An bhfuil ceann eile agat?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "An bhfuil comh�adan %s agat?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr ""
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
-msgstr ""
+msgstr "Feisti� Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Fan tamall"
 
@@ -3109,7 +3800,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "D�bhr�och (%s), b� n�os cruinn\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Droch rogha, aththrialaigh\n"
 
@@ -3123,533 +3814,1037 @@ msgstr " ? (gn�s %s)"
 msgid "Your choice? (default %s) "
 msgstr "Do rogha? (gn�s %s)"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Do rogha? (gn�s %s �s�id `none' do ceann ar bith) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
-msgstr ""
+msgstr "Ceich�s"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
-msgstr ""
+msgstr "Gearm�inis"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
-msgstr ""
+msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
-msgstr ""
+msgstr "Sp�innis"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
-msgstr ""
+msgstr "Fionnlainnis"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
-msgstr ""
+msgstr "Francais"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
-msgstr ""
+msgstr "Ioruais"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
-msgstr ""
+msgstr "Polainnis"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
-msgstr ""
+msgstr "Ruisl�s"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
-msgstr ""
+msgstr "M�archl�r UK"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
-msgstr ""
+msgstr "Me�rchl�r US"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
-msgstr ""
+msgstr "Airm�inis (sean)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
+#, fuzzy
 msgid "Armenian (typewriter)"
-msgstr ""
+msgstr "Airm�inis (typewriter)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
+#, fuzzy
 msgid "Armenian (phonetic)"
-msgstr ""
+msgstr "Airm�inis (phonetic)"
+
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "Asarbaidse�nais (laidin)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:127
+#, fuzzy
+msgid "Azerbaidjani (cyrillic)"
+msgstr "Asarbaidse�nais (cyrillic)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
-msgstr ""
+msgstr "Beilgeach"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
-msgstr ""
+msgstr "Bulg�iris"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
-msgstr ""
+msgstr "Bealar�isis"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr ""
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak (Meirice�)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
-msgstr ""
+msgstr "Greic�s"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
-msgstr ""
+msgstr "Ung�iris"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
-msgstr ""
+msgstr "Cr�itis"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr ""
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Peirsis"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
-msgstr ""
+msgstr "�oslainnis"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
-msgstr ""
+msgstr "Iod�ilis"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "Seap�inis (106 eochair)"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr ""
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
-msgstr ""
+msgstr "�silt�ris"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
-msgstr ""
+msgstr "Liotu�inis AZERTY (nua)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
+#, fuzzy
 msgid "Lithuanian \"number row\" QWERTY"
-msgstr ""
+msgstr "Liotu�inis \"number row\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
-msgstr ""
+msgstr "Liotu�inis \"phonetic\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
-msgstr ""
+msgstr "Polainnis (qwerty)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
-msgstr ""
+msgstr "Polainnis (qwertz)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
-msgstr ""
+msgstr "Portaing�ilis"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
-msgstr ""
+msgstr "R�isis (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
-msgstr ""
+msgstr "Sualainnis"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
-msgstr ""
+msgstr "Sl�bh�inis"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
-msgstr ""
+msgstr "Sl�baicis"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
-msgstr ""
+msgstr "T�alainnis"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
+#, fuzzy
 msgid "Turkish (traditional \"F\" model)"
-msgstr ""
+msgstr "TUircis (traditional \"F\" model)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
+#, fuzzy
 msgid "Turkish (modern \"Q\" model)"
-msgstr ""
+msgstr "Tuircis (modern \"Q\" model)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
-msgstr ""
+msgstr "�cr�inis"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
-msgstr ""
+msgstr "Mearchl�r US (idirnaisi�nta)"
+
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Bh�tneamis"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr ""
 
-# 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
-#
-#: ../../lilo.pm_.c:176
-#, c-format
-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 ""
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Luch�g - Sun"
 
-# 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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
+#: ../../mouse.pm_.c:31
+msgid "Standard"
 msgstr ""
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr ""
+#: ../../mouse.pm_.c:32
+#, fuzzy
+msgid "Logitech MouseMan+"
+msgstr "Luch�g Bus Logitech"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+#, fuzzy
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse (PS/2)"
+
+#: ../../mouse.pm_.c:34
+#, fuzzy
+msgid "GlidePoint"
+msgstr "ALPS GlidePoint (PS/2)"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+#, fuzzy
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse (PS/2)"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+#, fuzzy
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse (PS/2)"
+
+#: ../../mouse.pm_.c:38
+#, fuzzy
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll (PS/2)"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Gn�th"
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "leibh�al"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
 msgstr ""
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
+#: ../../mouse.pm_.c:49
+#, fuzzy
+msgid "Generic 2 Button Mouse"
+msgstr "Luch�g 3-cnaipe (PS/2)"
+
+#: ../../mouse.pm_.c:50
+#, fuzzy
+msgid "Generic 3 Button Mouse"
+msgstr "Luch�g 3-cnaipe (PS/2)"
+
+#: ../../mouse.pm_.c:52
+#, fuzzy
+msgid "Logitech MouseMan"
+msgstr "Luch�g Bus Logitech"
+
+#: ../../mouse.pm_.c:53
+#, fuzzy
+msgid "Mouse Systems"
+msgstr "Mouse Systems (srathach)"
+
+#: ../../mouse.pm_.c:55
+#, fuzzy
+msgid "Logitech CC Series"
+msgstr "Luch�g Logitech CC (srathach)"
+
+#: ../../mouse.pm_.c:56
+#, fuzzy
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+
+#: ../../mouse.pm_.c:58
+#, fuzzy
+msgid "MM Series"
+msgstr "MM Series (srathach)"
+
+#: ../../mouse.pm_.c:59
+#, fuzzy
+msgid "MM HitTablet"
+msgstr "MM HitTablet (srathach)"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Luch�g Logitech (srathach, s�an cin�al C7)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Luch�g ar bith"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
 msgstr ""
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
 msgstr ""
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "ar bith"
+
+#: ../../mouse.pm_.c:72
+#, fuzzy
+msgid "No mouse"
+msgstr "Luch�g ar bith"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
 msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "An bhfuil seo ceart?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Cumraigh Idirl�on"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "An bhfuil t� ag iarraidh an cumra�ocht a thrial?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Cumraigh nasc ghr�as�n"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "An bhfuil t� ag iarraidh an cumra�ocht a thrial?"
+
+#: ../../netconnect.pm_.c:107
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
 msgstr ""
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "Cumraigh ISDN"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
 msgstr ""
 
-#: ../../mouse.pm_.c:21
+#: ../../netconnect.pm_.c:158
 #, fuzzy
-msgid "Sun - Mouse"
-msgstr "Luch�g ar bith"
+msgid "Connection Configuration"
+msgstr "Cumra�ocht Idirl�on."
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
 msgstr ""
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "IRQ na Carta"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "Cuimhne Charta (DMA)"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "I/A Carta"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "I/A_0 Carta"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "I/A_1 Carta"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
 msgstr ""
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Uimhir f�n"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
 msgstr ""
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
 msgstr ""
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
 msgstr ""
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
 msgstr ""
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Pasfhocal"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Pasfhocal (ar�s)"
+
+#: ../../netconnect.pm_.c:208
+#, fuzzy
+msgid "Europe"
+msgstr "Eorap (EDS11)"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Eorap (EDS11)"
+
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "Trialaigh an cumra�ocht"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
 msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
 msgstr ""
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "N�l fh�os agam"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "C�n cin�al c at� uait?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "Lean"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "Tobscoir"
+
+#: ../../netconnect.pm_.c:245
+msgid ""
+"\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
+"\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "C�n sort carta ISDN at� uait?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
 msgstr ""
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:287
+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 ""
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Roghnaigh an cl�r�adan ghr�as�n"
+
+#: ../../netconnect.pm_.c:336
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
 msgstr ""
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "Cl�r�adan Gr�as�n"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
+"\n"
+"Do you agree?"
 msgstr ""
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "An bhfuil t� ag iarraidh an cumra�ocht a thrial?"
+
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "Cumraigh ADSL"
+
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
 msgstr ""
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "D�an iarracht m�ideam a aimsi�?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
 msgstr ""
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Roghanna 'Dialup'"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Ainm Nasc"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "Uimhir f�n"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Ainm Login:"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Deimni�"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Script-bhunaithe"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Teirmin�al-bhunaithe"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Ainm Fearannas"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Cead Freastala� DNS"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Dara Freastala� DNS"
+
+#: ../../netconnect.pm_.c:582
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
 msgstr ""
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "Cumraigh nasc ghr�as�n"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "An bhfuil t� ag iarraidh an cumra�ocht a thrial?"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
 msgstr ""
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "An bhfuil t� ag iarraidh an cumra�ocht a thrial?"
+
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Bainteach le hIdirl�on"
+
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Bainteach le hIdirl�on"
+
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Cumraigh nasc ghr�as�n"
+
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "Nasc na hIdirl�on agus cumra�ocht"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Cumraigh nasc ghr�as�n"
+
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Cumraigh nasc ghr�as�n"
+
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Carta ISDN inmhe�namach"
+
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "M�ideam seantrach"
+
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
 msgstr ""
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Luch�g ar bith"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Cumraigh nasc ghr�as�n"
+
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "Fraince"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "T�r Eile"
+
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
 msgstr ""
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "m�ideim alcatel"
+
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "m�ideim ECI"
+
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
 msgstr ""
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "�s�id pppoe"
+
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "n� �s�id pppoe"
+
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
 msgstr ""
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Cumraigh nasc ghr�as�n"
+
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
 msgstr ""
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Cumraigh nasc ghr�as�n"
+
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "Cumraigh gr�as�n� �iti�l"
+
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Cumra�ocht Gr�as�n�"
+
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "An bhfuil t� ag iarraidh an cumra�ocht a thrial?"
+
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
 msgstr ""
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Nasc na hIdirl�on agus cumra�ocht"
+
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "T� gr�as�n� l�ganta cumraithe cheana f�in. An dteasta�onn uait:"
+
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
 msgstr ""
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Cumra�ocht Gr�as�n�"
+
+#: ../../netconnect.pm_.c:859
+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"
 msgstr ""
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "n� fuaireathas c�rta gr�as�n�"
+
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Cumraigh gr�as�n�"
+
+#: ../../network.pm_.c:274
+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 ""
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "�stainm"
+
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
 msgstr ""
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
+#: ../../network.pm_.c:302
+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 ""
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Ag cumr� gl�as gr�as�n� %s"
+
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Uath-IP"
+
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "Seoladh IP"
+
+#: ../../network.pm_.c:314
+msgid "Netmask"
 msgstr ""
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
+#: ../../network.pm_.c:341
+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 ""
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "freastala� DNS"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "Inneal Geata:"
+
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "Gaireas na hInneal Geata:"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "Cumraigh seach-freastala�"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "Seach-HTTP"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "Seach-FTP"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
 msgstr ""
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "An bhfuil seo ceart?"
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr ""
 
-#: ../../partition_table.pm_.c:528
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions"
 msgstr ""
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Earr�id ag l�amh comhad %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr ""
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
-msgstr ""
+msgstr "Droch comhad ch�ltaca"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
-msgstr ""
+msgstr "Earr�idh ag scr�obh comhad %s"
 
 #: ../../pkgs.pm_.c:20
 msgid "mandatory"
-msgstr ""
+msgstr "sainordaitheach"
 
 #: ../../pkgs.pm_.c:21
 msgid "must have"
-msgstr ""
+msgstr "riachtanas"
 
 #: ../../pkgs.pm_.c:22
 msgid "important"
-msgstr ""
+msgstr "t�bhachtach"
 
 #: ../../pkgs.pm_.c:24
 msgid "very nice"
-msgstr ""
+msgstr "an-dheas"
 
 #: ../../pkgs.pm_.c:25
-#, fuzzy
 msgid "nice"
-msgstr "gaireas"
+msgstr "deas"
 
 #: ../../pkgs.pm_.c:26 ../../pkgs.pm_.c:27
-#, fuzzy
 msgid "interesting"
-msgstr "ag athm�ad�"
+msgstr "suimi�il"
 
 #: ../../pkgs.pm_.c:28 ../../pkgs.pm_.c:29 ../../pkgs.pm_.c:30
 #: ../../pkgs.pm_.c:31
 msgid "maybe"
-msgstr ""
+msgstr "b'fh�idir"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
-msgstr ""
+msgstr "i18n (t�bhachtach)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
-msgstr ""
+msgstr "i18n (an-dheas)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
-msgstr ""
+msgstr "i18n (deas)"
+
+#: ../../printer.pm_.c:19
+msgid "Local printer"
+msgstr "Print�ir �iti�l"
 
-#: ../../placeholder.pm_.c:5
+#: ../../printer.pm_.c:20
 #, fuzzy
-msgid "Show less"
-msgstr "Taisp�an gach ceann"
+msgid "Remote printer"
+msgstr "Scrios iontr�il"
 
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
 msgstr ""
 
-#: ../../printer.pm_.c:244
-msgid "Local printer"
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
 msgstr ""
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr ""
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "Print�ir Gr�as�n (soic�ad)"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
-msgstr ""
+msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
-msgstr ""
+msgstr "NetWare"
+
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "URI Gaireas Print�ir"
 
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
@@ -3664,45 +4859,44 @@ msgstr ""
 msgid "A printer, model \"%s\", has been detected on "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
-msgstr ""
+msgstr "Gaireas na Print�ir �iti�l"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:47
-#, fuzzy
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
-msgstr "Print�ir"
+msgstr "Gaireas Print�ir"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 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."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
-msgstr ""
+msgstr "Scrios ci�"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
-msgstr ""
+msgstr "Roghanna Print�ir SMB (Fuinneoga 9x/NT)"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -3711,30 +4905,27 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:81
-#, fuzzy
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
-msgstr "freastala�"
+msgstr "freastala� �stann SMB"
 
-#: ../../printerdrake.pm_.c:82
-#, fuzzy
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
-msgstr "freastala�"
+msgstr "IP freastala� SMP"
 
-#: ../../printerdrake.pm_.c:83
-#, fuzzy
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
-msgstr "F�or ainm"
+msgstr "Comh. ainm"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
-msgstr ""
+msgstr "Grupa na hOibre"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
-msgstr ""
+msgstr "Roghanna Print�ir NetWare"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -3742,145 +4933,204 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:107
-#, fuzzy
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
-msgstr "Print�ir"
+msgstr "Freastala� Print�ir"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "�stainm Print�ir"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "Poirt"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "C�n sort print�ir at� ort?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+#, fuzzy
+msgid "Do you want to test printing?"
+msgstr "An bhfuil t� ag iarraidh an cumra�ocht a thrial?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr ""
+msgstr "Cumraigh Print�ir"
 
-#: ../../printerdrake.pm_.c:163
-#, fuzzy
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
-msgstr "Print�ir"
+msgstr "Roghanna Print�ir"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
-msgstr ""
+msgstr "M�id P�ip�ir"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:170
-#, fuzzy
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
-msgstr "Athraigh cumra�ocht an freastala�"
+msgstr "Roghanna tiom�na� Uniprint"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:198
-#, fuzzy
-msgid "Do you want to test printing?"
-msgstr "An bhfuil t� ag iarraidh an cumra�ocht a thrial?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr ""
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:238
-#, fuzzy
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Print�ir"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "An dteasta�onn uait print�ir a chumr�?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "Ag meast�"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
 #, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "Nasc Print�ir"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
-msgstr "Bog"
+msgstr "Scrios ci�"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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 ""
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "Ainm Print�ir"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "Cuntas"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "�it"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -3888,59 +5138,57 @@ msgid ""
 "connected?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
-msgstr ""
+msgstr "Ainm ci�"
 
-#: ../../printerdrake.pm_.c:277
-#, fuzzy
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
-msgstr "Teasc�n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:278
-#, fuzzy
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
-msgstr "Print�ir"
+msgstr "Nasc Print�ir"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr ""
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr ""
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
-msgstr ""
+msgstr "teip ar 'mkraid'"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr ""
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr ""
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr ""
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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 ""
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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:19
+#: ../../services.pm_.c:20
 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 "
@@ -3948,7 +5196,7 @@ msgid ""
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -3956,13 +5204,13 @@ msgid ""
 "and includes support for pop-up menus on the console."
 msgstr ""
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
 msgstr ""
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -3972,51 +5220,51 @@ msgid ""
 "all of the services it is responsible for."
 msgstr ""
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
 "You should leave this enabled for most machines."
 msgstr ""
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP networks.\n"
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4024,7 +5272,7 @@ msgid ""
 "it installed on machines that don't need it."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4032,92 +5280,240 @@ msgid ""
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr ""
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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:66
+#: ../../services.pm_.c:67
 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:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr ""
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr ""
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
+msgstr ""
+"Ni f�idir liom an t�bla rainn a l�amh, t� m�chaill� ann :(\n"
+"Leanfaidh m� orm ag ceal� droch rainn"
+
+#: ../../standalone/drakboot_.c:25
+msgid "Configure LILO/GRUB"
+msgstr "Cumraigh LILO/GRUB"
+
+#: ../../standalone/drakboot_.c:26
+msgid "Create a boot floppy"
+msgstr "Cruthaigh flapach boot�il"
+
+#: ../../standalone/drakboot_.c:28
+msgid "Format floppy"
+msgstr "Formadaigh flapach"
+
+#: ../../standalone/drakboot_.c:40
+msgid "Choice"
+msgstr "Rogha"
+
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
 #, fuzzy
-msgid "Configure LILO/GRUB"
+msgid "disable"
+msgstr "Table"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
 msgstr "Cumraigh X"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
 #, fuzzy
-msgid "Create a boot floppy"
-msgstr "Sabh�il ar dhiosca flapach"
+msgid "enable"
+msgstr "Table"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
 #, fuzzy
-msgid "Format floppy"
-msgstr "Form�idigh gach ceann"
+msgid "using module"
+msgstr "Luch�g ar bith"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "N�l aon gaireas ghreas�n san do chor�s!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
 #, fuzzy
-msgid "Choice"
-msgstr "gaireas"
+msgid "Configuring..."
+msgstr "Ag cumraigh IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Comhghairdeas!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
@@ -4166,55 +5562,58 @@ msgstr ""
 msgid "Choose the tool you want to use"
 msgstr ""
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "C�n leagan amach at� ar d'eocharchl�rsa"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Athraigh R�iteach"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "C�n cin�al luch�g at� agat?"
+#: ../../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 ""
+
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr ""
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr ""
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr ""
 
 #: ../../standalone/rpmdrake_.c:25
-#, fuzzy
 msgid "reading configuration"
-msgstr "Trialaigh an cumra�ocht"
+msgstr "ag le�mh cumra�ocht"
 
 #: ../../standalone/rpmdrake_.c:45 ../../standalone/rpmdrake_.c:50
 #: ../../standalone/rpmdrake_.c:253
 msgid "File"
-msgstr ""
+msgstr "Comhad"
 
 #: ../../standalone/rpmdrake_.c:48 ../../standalone/rpmdrake_.c:229
 #: ../../standalone/rpmdrake_.c:253 ../../standalone/rpmdrake_.c:269
 msgid "Search"
-msgstr ""
+msgstr "Cuardaigh"
 
 #: ../../standalone/rpmdrake_.c:49 ../../standalone/rpmdrake_.c:56
-#, fuzzy
 msgid "Package"
-msgstr "%d pac�ist�"
+msgstr "Pac�iste"
 
 #: ../../standalone/rpmdrake_.c:51
-#, fuzzy
 msgid "Text"
-msgstr "saineola�"
+msgstr "Teacs"
 
 #: ../../standalone/rpmdrake_.c:53
-#, fuzzy
 msgid "Tree"
-msgstr "Cruthaigh"
+msgstr "Crann"
 
 #: ../../standalone/rpmdrake_.c:54
 msgid "Sort by"
@@ -4222,41 +5621,35 @@ msgstr ""
 
 #: ../../standalone/rpmdrake_.c:55
 msgid "Category"
-msgstr ""
+msgstr "Saghas"
 
 #: ../../standalone/rpmdrake_.c:58
-#, fuzzy
 msgid "See"
-msgstr "Freastala�"
+msgstr "Amharc"
 
 #: ../../standalone/rpmdrake_.c:59 ../../standalone/rpmdrake_.c:163
-#, fuzzy
 msgid "Installed packages"
-msgstr "%d pac�ist�"
+msgstr "Pac�ist� feisti�"
 
 #: ../../standalone/rpmdrake_.c:60
-#, fuzzy
 msgid "Available packages"
-msgstr "Ag curdach do na pac�ist� at� ar f�il"
+msgstr "Pac�ist� le f�il"
 
 #: ../../standalone/rpmdrake_.c:62
-#, fuzzy
 msgid "Show only leaves"
-msgstr "Taisp�an gach ceann"
+msgstr ""
 
 #: ../../standalone/rpmdrake_.c:67
 msgid "Expand all"
 msgstr ""
 
 #: ../../standalone/rpmdrake_.c:68
-#, fuzzy
 msgid "Collapse all"
-msgstr "Glan gach ceann"
+msgstr ""
 
 #: ../../standalone/rpmdrake_.c:70
-#, fuzzy
 msgid "Configuration"
-msgstr "Trialaigh an cumra�ocht"
+msgstr "cumra�ocht"
 
 #: ../../standalone/rpmdrake_.c:71
 msgid "Add location of packages"
@@ -4267,18 +5660,16 @@ msgid "Update location"
 msgstr ""
 
 #: ../../standalone/rpmdrake_.c:79 ../../standalone/rpmdrake_.c:328
-#, fuzzy
 msgid "Remove"
-msgstr "Bog"
+msgstr "Scr�os"
 
 #: ../../standalone/rpmdrake_.c:100
 msgid "Configuration: Add Location"
 msgstr ""
 
 #: ../../standalone/rpmdrake_.c:103
-#, fuzzy
 msgid "Find Package"
-msgstr "%d pac�ist�"
+msgstr "Cuardaigh Pac�iste"
 
 #: ../../standalone/rpmdrake_.c:104
 msgid "Find Package containing file"
@@ -4290,17 +5681,15 @@ msgstr ""
 
 #: ../../standalone/rpmdrake_.c:139
 msgid "Files:\n"
-msgstr ""
+msgstr "Comhaid:\n"
 
 #: ../../standalone/rpmdrake_.c:161 ../../standalone/rpmdrake_.c:209
-#, fuzzy
 msgid "Uninstall"
 msgstr "Eirigh as Feisti�"
 
 #: ../../standalone/rpmdrake_.c:163
-#, fuzzy
 msgid "Choose package to install"
-msgstr "Roghnaigh pac�ist� ..."
+msgstr "Roghnaigh pac�ist� a feisti� ..."
 
 #: ../../standalone/rpmdrake_.c:190
 msgid "Checking dependencies"
@@ -4308,12 +5697,11 @@ msgstr ""
 
 #: ../../standalone/rpmdrake_.c:190 ../../standalone/rpmdrake_.c:409
 msgid "Wait"
-msgstr ""
+msgstr "Fan tamall"
 
 #: ../../standalone/rpmdrake_.c:209
-#, fuzzy
 msgid "The following packages are going to be uninstalled"
-msgstr "Roghnaigh pac�ist� ..."
+msgstr ""
 
 #: ../../standalone/rpmdrake_.c:210
 msgid "Uninstalling the RPMs"
@@ -4321,7 +5709,7 @@ msgstr ""
 
 #: ../../standalone/rpmdrake_.c:229 ../../standalone/rpmdrake_.c:269
 msgid "Regexp"
-msgstr ""
+msgstr "Regexp"
 
 #: ../../standalone/rpmdrake_.c:229
 msgid "Which package are looking for"
@@ -4331,7 +5719,7 @@ msgstr ""
 #: ../../standalone/rpmdrake_.c:278
 #, c-format
 msgid "%s not found"
-msgstr ""
+msgstr "Teip ag cuardach %s"
 
 #: ../../standalone/rpmdrake_.c:238 ../../standalone/rpmdrake_.c:262
 #: ../../standalone/rpmdrake_.c:278
@@ -4362,9 +5750,8 @@ msgid "Give a name (eg: `extra', `commercial')"
 msgstr ""
 
 #: ../../standalone/rpmdrake_.c:291
-#, fuzzy
 msgid "Directory"
-msgstr "Teasc�n"
+msgstr "Fillte�n"
 
 #: ../../standalone/rpmdrake_.c:294
 msgid "No cdrom available (nothing in /mnt/cdrom)"
@@ -4407,66 +5794,308 @@ msgstr ""
 msgid "Finding leaves takes some time"
 msgstr ""
 
-#~ msgid "Recommended"
-#~ msgstr "Molta"
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Cumraigh Idirl�on"
 
 #, fuzzy
-#~ msgid "Choose other CD to install"
-#~ msgstr "Roghnaigh pac�ist� ..."
+msgid "Internet"
+msgstr "suimi�il"
 
-#~ msgid "Help"
-#~ msgstr "Cabhair"
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
 
-#~ msgid "Downloading cryptographic packages"
-#~ msgstr "Ag th�osl�d�il pac�ist� r�neola�ochta"
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
 
-#~ msgid "Setup SCSI"
-#~ msgstr "Cumraigh SCSI"
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
 
-#~ msgid "Which language do you want?"
-#~ msgstr "C�n teanga at� uait?"
+msgid "Office"
+msgstr "Oifig"
 
-#~ msgid "Local LAN"
-#~ msgstr "Gr�as�n L�g�nta"
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
 
-#~ msgid "Windows(TM)"
-#~ msgstr "Windows(TM)"
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
 
-#~ msgid "Partitioning failed: no root filesystem"
-#~ msgstr "Theip ar rann�: n� ann do comhadchoras fr�amach"
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Ilmhe�nach"
 
-#~ msgid "Bad kickstart file %s (failed %s)"
-#~ msgstr "Droch comhad kickstart %s (theip %s)"
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
 
-#~ msgid "Size: %s MB"
-#~ msgstr "M�id: %s MB"
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
 
-#~ msgid "resizing"
-#~ msgstr "ag athm�ad�"
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
 
-#~ msgid "formatting"
-#~ msgstr "ag form�idi�"
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
 
-#~ msgid "changing type of"
-#~ msgstr "athraigh an cine�l de"
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
 
-#~ msgid "After %s partition %s,"
-#~ msgstr "I ndhiadh %s rann %s,"
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
 
-#~ msgid "server"
-#~ msgstr "freastala�"
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
 
-#~ msgid "expert"
-#~ msgstr "saineola�"
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Ilmhe�nach"
+
+msgid "KDE"
+msgstr "KDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Ilmhe�nach"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Ilmhe�nach"
 
-#~ msgid "developer"
-#~ msgstr "foirbreoir"
+msgid "Gnome"
+msgstr "Gnome"
 
-#~ msgid "beginner"
-#~ msgstr "tosaitheoir"
+msgid "Documentation"
+msgstr "Doicim�id KDE agus Mandrake"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Ilmhe�nach"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Total size: "
+#~ msgstr "M�id ioml�n: "
+
+#~ msgid "Reconfigure local network"
+#~ msgstr "Athchumraigh an gr�as�n� anois"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Bainteach le hIdirl�on"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Bainteach le hIdirl�on"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Bainteach le hIdirl�on"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Bainteach le hIdirl�on"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Uath-R�iteach"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Uath-cuardaigh r�iteach"
+
+#~ msgid "Install/Rescue"
+#~ msgstr "Feisti�/Tarrth�il"
+
+#~ msgid "Rescue"
+#~ msgstr "Tarrth�il"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Luch�g ADB Apple"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Luch�g ADB Apple (2 Cnaip�)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Luch�g Apple ADB (3+ Cnaip�)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Luch�g USB  Apple"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Luch�g USB Apple (2 Cnaip�)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Luch�g USB  Apple (3+ Cnaip�)"
+
+#~ msgid "Generic Mouse (PS/2)"
+#~ msgstr "Mouse Gn�th (PS/2)"
+
+#~ msgid "Logitech MouseMan/FirstMouse (ps/2)"
+#~ msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+
+#~ msgid "ASCII MieMouse (PS/2)"
+#~ msgstr "ASCII MieMouse (PS/2)"
+
+#~ msgid "Genius NetMouse Pro (PS/2)"
+#~ msgstr "Genius NetMouse Pro (PS/2)"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "Luch�g Bus ATI"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Luch�g Bus Microsoft"
+
+#~ msgid "USB Mouse"
+#~ msgstr "Luch�g USB"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "Luch�g USB (3 cnaip� n� n�os m�)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A n� barr (srathach)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (srathach)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (srathach)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (srathach)"
+
+#~ msgid "Microsoft IntelliMouse (serial)"
+#~ msgstr "Microsoft IntelliMouse (srathach)"
+
+#~ msgid "Logitech MouseMan/FirstMouse (serial)"
+#~ msgstr "Logitech MouseMan/FirstMouse (srathach)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Luch�g de gn�th (srathach)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsoft n� comhori�nach (srathach)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Luch�g 3-cnaipe de gn�th (srathach)"
+
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse (srathach)"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "What do you wish to do?"
+#~ msgstr "C�ard a theasta�onn uait a dh�anamh?"
+
+#~ msgid "Host name:"
+#~ msgstr "Ainm �s�ideora"
+
+#~ msgid "dhcpd"
+#~ msgstr "dhcpd"
+
+#~ msgid "pump"
+#~ msgstr "pump"
+
+#~ msgid "dhcpxd"
+#~ msgstr "dhcpxd"
+
+#~ msgid "dhcp-client"
+#~ msgstr "dhcp-client"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "C�n cin�al luch�g at� agat?"
+
+#~ msgid "Cryptographic"
+#~ msgstr "R�nscr�obhach"
+
+#~ msgid "Configure LAN"
+#~ msgstr "Cumraigh LAN"
+
+#~ msgid "End configuration"
+#~ msgstr "�irigh  as cumra�ocht"
+
+#, fuzzy
+#~ msgid "Do not set up networking"
+#~ msgstr "Cumraigh gr�as�n�"
+
+#, fuzzy
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "An dteasta�onn uait gr�as�n� a chumr� ded' ch�ras?"
 
-#~ msgid "Choose install or upgrade"
-#~ msgstr "Feistigh n� uasgr�daigh ?"
+#~ msgid "Show less"
+#~ msgstr "Taisp�an n�os l�"
 
-#~ msgid "What usage do you want?"
-#~ msgstr "C�n �s�id at� uait?"
+#~ msgid "Show more"
+#~ msgstr "Taispe�n n�os mo"
diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po
index 95e8b406f..f83ed203f 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: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+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,43 +15,91 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "Xen�rico"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Tarxeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Elixa unha tarxeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Elixa un servidor X"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "Servidor X"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, fuzzy, c-format
+msgid "XFree %s"
+msgstr "Servidor XFree86: %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "�Que tipo de entrada desexa engadir?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+#, fuzzy
+msgid "XFree configuration"
+msgstr "Configuraci�n despois da instalaci�n"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Seleccione a cantidade de memoria da sua tarxeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Escolla as opci�ns para o servidor"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Elixa o monitor"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -74,39 +122,40 @@ msgstr ""
 "pode da�a-lo seu monitor.\n"
 "No caso de d�bida, elixa unha configuraci�n conservadora."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Frecuencia de recorrido horizontal"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Frecuencia de recorrido vertical"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "O monitor non est� configurado"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "A tarxeta gr�fica a�nda non est� configurada"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Resoluci�ns a�nda non elexidas"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "�Desexa proba-la configuraci�n?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+#, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Aviso: probar � perigoso nesta tarxeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Proba da configuraci�n"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -114,184 +163,168 @@ msgstr ""
 "\n"
 "probe a cambiar alg�ns par�metros"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Ocorreu un erro:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Sa�ndo en %d segundos"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "�� esta a configuraci�n correcta?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Ocorreu un erro, probe a cambiar alg�ns par�metros"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Resoluci�ns autom�ticas"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Para atopa-las resoluci�ns dispo�ibles vanse probar varias.\n"
-"A s�a pantalla vai palpebrexar...\n"
-"Pode apagala se o desexa, escoitar� un pitido cando estea rematado"
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Resoluci�n"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Elixa a resoluci�n e a profundidade de cor"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Tarxeta gr�fica: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Servidor XFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Ver todo"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Resoluci�ns"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Podo tratar de atopa-las resoluci�ns dispo�ibles (ex. 800x600).\n"
-"Non obstante, isto pode ocasionar que a m�quina se bloquee.\n"
-"�Desexa intentalo?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Ning�n modo v�lido atopado\n"
-"Intente con outra tarxeta de video ou monitor"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Elecci�n do tipo de teclado: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipo de rato: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Dispositivo do rato: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Frecuencia horizontal do monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Frecuencia vertical do monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Tarxeta gr�fica: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Memoria da tarxeta gr�fica: %s KB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Opci�ns da profundidade de cor"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Resoluci�ns"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Servidor XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "Servidor XFree86: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Preparando a configuraci�n de X-Window"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Troca-lo monitor"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Troca-la tarxeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Troca-las opci�ns do servidor"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Troca-la resoluci�n"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "B�squeda autom�tica de resoluci�ns"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Amosar informaci�n"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Probar de novo"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Sa�r"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "�Qu� desexa facer?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "�Esquece-los trocos?"
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Conserva-la configuraci�n IP actual"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Por favor, entre de novo en %s para activa-los trocos"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Por favor, saia e ent�n use Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "Lanzar X11 � arrincar"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -299,228 +332,228 @@ msgstr ""
 "P�dese configura-lo seu ordenador para que lance autom�ticamente\n"
 "as X � arrincar. �Desexa que se executen as X � reiniciar?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1152
+#, 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."
+msgstr ""
+"P�dese configura-lo seu ordenador para que lance autom�ticamente\n"
+"as X � arrincar. �Desexa que se executen as X � reiniciar?"
+
+#: ../../Xconfigurator.pm_.c:1154
+#, fuzzy
+msgid "Choose the default user:"
+msgstr "Escoller o tama�o novo"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Elixa a utilidade que quere usar"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 cores (8 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil cores (15 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil cores (16 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 mill�ns de cores (24 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 mil mill�ns de cores (32 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 KB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 KB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB ou m�is"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA est�ndar, 640x480 a 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 a 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "Compatible 8514, 1024x768 a 87 Hz entrelazado (no 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "SVGA alta-frecuencia, 1024x768 a 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Monitor multi-frecuencia soportando 1280x1024 a 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Monitor multi-frecuencia soportando 1280x1024 a 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Monitor multi-frecuencia soportando 1280x1024 a 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor soportando 1600x1200 a 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor soportando 1600x1200 a 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "crecho"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "por omisi�n"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "gravata"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "morena"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "rapaza"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "loira"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "autom�xico"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Primeiro sector da partici�n de arranque"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Primeiro sector do disco (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
+#: ../../any.pm_.c:95
+#, fuzzy
+msgid "SILO Installation"
 msgstr "Instalaci�n de LILO/grub"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "�Onde quere instalar o cargador de arrinque?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "Instalaci�n de LILO/grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Ning�n"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "�Que cargador(es) de arrinque quere usar?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+#, fuzzy
+msgid "Bootloader installation"
+msgstr "Opci�ns principais do cargador de arrinque"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Dispositivo de arrinque"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (non funcion en BIOS antigas)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Compacto"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "compacto"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Retardo antes de arrinca-la imaxe por omisi�n"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Modo de v�deo"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Retardo antes de arrinca-la imaxe por omisi�n"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Contrasinal (de novo)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Restrinxir opci�ns da li�a de comandos"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "restrinxido"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Opci�ns principais do cargador de arrinque"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "T�nteo de novo por favor"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -528,167 +561,357 @@ msgstr ""
 "Estas son as diferentes entradas.\n"
 "Pode engadir algunhas m�is ou cambia-las que xa existen."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Engadir"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Feito"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "�Que tipo de entrada desexa engadir?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
-msgid "Other OS (windows...)"
+#: ../../any.pm_.c:175
+#, fuzzy
+msgid "Other OS (SunOS...)"
 msgstr "Outros SO (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "�Que tipo de entrada desexa engadir?"
+#: ../../any.pm_.c:175
+msgid "Other OS (windows...)"
+msgstr "Outros SO (windows...)"
 
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Imaxe"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Ra�z"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Agregar"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Lectura/escritura"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "T�boa"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Inseguro"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Etiqueta"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Por omisi�n"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Quitar entrada"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Etiqueta baleira non permitida"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Esta etiqueta xa se est� a usar"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "%s interfaces %s atopadas"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "�Ten algunha outra?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "�Ten algunha interface %s?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Non"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Si"
+
+#: ../../any.pm_.c:505
+msgid "See hardware info"
+msgstr "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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Instalando controlador para a tarxeta %s %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(m�dulo %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "�Que controlador de %s desexa que se probe?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"Nalg�ns casos, o controlador de %s necesita informaci�n extra\n"
+"para funcionar correctamente, a�nda que normalmente funcione sin ela.\n"
+"�Desexa especificar informaci�n extra para o controlador ou deixar que el\n"
+"analice o seu equipo e atope a informaci�n que necesita? �s veces,\n"
+"analizar o equipo pode provocar que se pare, pero non deber�a\n"
+"causar ning�n dano."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Autodetecci�n"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Especificar as opci�ns"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Agora pode dar as opci�ns para o m�dulo %s."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"Aqu� deben ir as diferentes opci�ns para o m�dulo %s.\n"
+"As opci�ns son da forma �nome=valor nome2=valor2 ...�.\n"
+"Por exemplo pode ter �io=0x300 irq=7�"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Opci�ns do m�dulo:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Fallo o carga-lo m�dulo %s\n"
+"�Desexa reintentalo con outros par�metros?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Benvido a %s, o selector de sistema operativo!\n"
+"\n"
+"Para mira-las posibles selecci�ns, prema <TAB>.\n"
+"\n"
+"Para arrincar unha delas, teclee o seu nome e prema <ENTER>\n"
+"ou espere %d segundos para que arrinque o sistema por omision.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "�Benvido a GRUB, o escolledor de sistemas operativos!"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "Use as teclas %c e %c para cambiar a entrada marcada."
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Prema enter para arrincar o SO seleccionado, 'e' para editar os"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "comandos antes de arrincar, ou 'c' para unha li�a de comandos."
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "A entrada marcada arrincarase autom�ticamente en %d segundos."
+
+#: ../../bootloader.pm_.c:604
+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
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Escritorio"
+
+# (Puxen o � en cp437 porque creo que as� o garda a FAT)
+#  No, long names are in vfat, that is unicode.
+#  The Linux, according to default locale, will do the proper conversion;
+#  that is, the string must be in the encoding of the 'gl' locale.
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Men� Inicio"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "Sa�ndo en %d segundos"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Crear"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Desmontar"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Formatar"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Punto de montaxe"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Escribir /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Trocar � modo experto"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Trocar � modo normal"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Restaurar a partir dun ficheiro"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Gardar nun ficheiro"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Restaurar a partir dun disquete"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Gardar nun disquete"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Borrar todas"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Formatar todas"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Asignaci�n autom�tica"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "T�dalas partici�ns primarias est�n usadas"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Non podo engadir m�is partici�ns"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -696,59 +919,63 @@ msgstr ""
 "Para ter m�is partici�ns, por favor borre unha para poder crear unha "
 "partici�n estendida"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "T�boa de partici�n de rescate"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Re-Facer"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Escribir t�boa de partici�n"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Re-Cargar"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Valdeiro"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Outros"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Intercambio"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Valdeiro"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Outros"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Tipos de sist. de ficheiros:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Detalles"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -760,17 +987,17 @@ msgstr ""
 "Acons�llaselle que primeiro a redimensione\n"
 "(prema nela, e ent�n en \"Redimensionar\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Por favor, faga primeiro unha copia de seguridade dos seus datos"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "�Lea con cuidado!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -779,77 +1006,77 @@ msgstr ""
 "Se ten pensado usar aboot, te�a coidado de deixar un espacio libre (2048\n"
 "sectores son abondo) no comezo do disco"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Te�a coidado: esta operaci�n � perigosa."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Erro"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Punto de montaxe: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Letra de unidade DOS: %s (aproximaci�n)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Comezo: sector %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Tama�o: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sectores"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Cilindro %d a cilindro %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Formatado\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Non formatado\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Montado\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Ficheiro(s) loopback: %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -857,79 +1084,79 @@ msgstr ""
 "Partici�n de arrinque por omisi�n\n"
 "    (para arrincar en MS-DOS, non para lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Nivel %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Tama�o do bloque de datos %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "Discos RAID %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Nome do ficheiro loopback: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Prema nunha partici�n"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Tama�o: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Xeometr�a: %s cilindros, %s testas, %s sectores\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Tipo de t�boa de partici�n: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "no bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Montar"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Activar"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Engadir � RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Quitar do RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Modifica-lo RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Usar para loopback"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Escolla a acci�n"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -940,7 +1167,7 @@ msgstr ""
 "(nun cilindro > 1024). Se vostede usa LILO, non vai funcionar, e se non o\n"
 "usa, non necesita /boot"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -952,68 +1179,70 @@ msgstr ""
 "Se pensa usar o selector de SO de arranque LILO, tome en conta de\n"
 "engadir unha partici�n /boot"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
+#, fuzzy
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "Vostede seleccionou unha partici�n RAID software como ra�z (/).\n"
 "Non hai ning�n cargador de arrinque que poida manexar isto sen unha\n"
 "partici�n /boot.\n"
 "Lembre por tanto engadir unha partici�n /boot se quere usar lilo ou grub"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Use ``%s'' no seu lugar"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Use ``Desmontar'' primeiro"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
 "� cambia-lo tipo da partici�n %s, perderanse t�dolos datos desta partici�n"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "�Continuar de calquera xeito?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Sa�r sen gardar"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "�Sa�r do programa sen garda-la t�boa de partici�ns?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Trocar tipo de partici�n"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
 msgstr "�Qu� tipo de partici�n desexa?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 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:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "�Onde desexa monta-lo ficheiro loopback %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "�Onde desexa monta-lo dispositivo %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1022,140 +1251,145 @@ msgstr ""
 "usar de loopback.\n"
 "Quite o loopback primeiro"
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "� formata-la partici�n %s, perderanse t�dolos datos desta partici�n"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Formatando"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formatando o ficheiro loopback %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formatando a partici�n %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Logo de formatar t�dalas partici�ns,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "perderanse os datos nesas partici�ns"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Desprazar"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "�A que disco desexa desprazala?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sector"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "�A que sector desexa desprazala?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Desprazando"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Desprazando partici�n..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "�Escribirase � disco a tabla de partici�n da unidade %s!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 "Necesita reinicia-lo equipo para que a modificaci�n sexa tomada en conta"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Calculando os l�mites do sistema de ficheiros FAT"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "�Qu� tipo de partici�n desexa?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "Deber�a facerse unha copia de seguridade dos datos desta partici�n"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "� redimensiona-la partici�n %s, perderanse t�dolos datos desta partici�n"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Escoller o tama�o novo"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Crear unha partici�n nova"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Sector de comezo: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Tama�o en MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Tipo de sist. de ficheiros: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Preferencia: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Esta partici�n non pode usarse para loopback"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Nome do ficheiro loopback: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "O ficheiro xa est� a ser usado por outro loopback, escolla outro"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "O ficheiro xa existe. �Usalo?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Elixa un ficheiro"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1163,11 +1397,11 @@ msgstr ""
 "A t�boa de partici�ns de socorro non ten\n"
 "o mesmo tama�o.  �Desexa continuar igual?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1175,79 +1409,79 @@ msgstr ""
 "Inserte un disquete no lector\n"
 "Perderanse t�dolos datos no disquete"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Tratando de recupera-la t�boa de partici�ns"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "dispositivo"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "nivel"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "tama�o do bloque de datos"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Escolla un dos RAID para engadirlle"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "novo"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "O formato %s de %s fallou"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, 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:186
-msgid "nfs mount failed"
-msgstr "montaxe de nfs fallou"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "mount fallou: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "erro desmontando %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Os puntos de montaxe deben comezar con /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Xa existe unha partici�n con punto de montaxe %s\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Puntos de montaxe circulares %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 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:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Erro o abrir %s para escritura: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1255,76 +1489,81 @@ 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:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "�Non ten ningunha partici�n!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "Escolla o idioma para a instalaci�n e para o sistema."
 
-#: ../../help.pm_.c:10
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Escolla a disposici�n do teclado que corresponde � seu na lista"
-
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "Escolla a disposici�n do teclado que corresponde � seu na lista"
+
+#: ../../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
+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"
-"  - 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"
-msgstr ""
-"Elixa \"Instalaci�n\" se non hai ningunha versi�n de Linux anterior,\n"
-"ou se desexa instalar m�is dunha distribuci�n ou versi�n.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Elixa \"Actualizaci�n\" se desexa actualizar a partir dunha versi�n\n"
-"anterior de Linux Mandrake:\n"
-"5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
-"2000\n"
-"ou 7.0 (Air).\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"
-"Elixa:\n"
+"\t* Recommanded: 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"
-"  - Autom�tica: Se nunca instalou Linux antes, escolla esta. NOTA:\n"
-"    a rede non se configurar� durante a instalaci�n, utilice \"LinuxConf\"\n"
-"    para configurala cando a instalaci�n estea completa.\n"
 "\n"
-"  - Personalizada: Se xa est� familiarizado con GNU/Linux, pode ent�n "
-"escoller\n"
-"    o uso primario da s�a m�quina. Mire abaixo para os detalles.\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - Experto: Isto sup�n que vostede se manexa con GNU/Linux e quere facer\n"
-"    unha instalaci�n altamente personalizada. Do mesmo xeito que coa\n"
-"    clase de instalaci�n \"Personalizada\", poder� escolle-lo uso do seu\n"
-"    sistema. Pero, por favor, �NON ESCOLLA ISTO A MENOS QUE SAIBA O QUE\n"
-"    EST� A FACER!\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1332,12 +1571,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Elixa:\n"
 "\n"
@@ -1345,37 +1585,36 @@ msgstr ""
 "escoller\n"
 "    o uso primario da s�a m�quina. Mire abaixo para os detalles.\n"
 "\n"
+"\n"
 "  - Experto: Isto sup�n que vostede se manexa con GNU/Linux e quere facer\n"
 "    unha instalaci�n altamente personalizada. Do mesmo xeito que coa\n"
 "    clase de instalaci�n \"Personalizada\", poder� escolle-lo uso do seu\n"
 "    sistema. Pero, por favor, �NON ESCOLLA ISTO A MENOS QUE SAIBA O QUE\n"
-"    EST� A FACER!\n"
+"    EST� A FACER!"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "As diferentes posibilidades para o uso da s�a m�quina (supo�endo que "
 "escolleu\n"
@@ -1399,159 +1638,347 @@ msgstr ""
 "    de bases de datos... Como tal, non espere que haxa cousas como KDE ou\n"
 "    GNOME instaladas.\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 tentar� primeiro atopa-lo(s) adaptador(es) SCSI en bus PCI.\n"
-"Se o(s) atopa e sabe que controlador(es) usar, o(s) aplicar�\n"
-"automaticamente.\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"
+"\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"
-"Se o seu adaptador SCSI � ISA, ou se � PCI pero DrakX non sabe\n"
-"que controlador usar para esa tarxeta, ou se non ten adaptadores SCSI,\n"
-"preguntar�selle se ten alg�n ou non. Se non ten ning�n responda �Non�.\n"
-"Se ten un ou varios responda �Si�. Aparecer� ent�n unha lista de\n"
-"controladores, dos que ten que seleccionar un.\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"
-"Unha vez que seleccione o controlador, DrakX preguntaralle se quere\n"
-"especificar alg�n par�metro. Primeiro, probe e deixe que o controlador\n"
-"analice o hardware: normalmente funciona ben.\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"
-"Se non, non esqueza a informaci�n que pode obter da s�a documentaci�n\n"
-"ou a partir de Windows (se o ten instalado no seu sitema), coma se\n"
-"suxire na gu�a de instalaci�n. Eses son os par�metros que ter� que\n"
-"lle dar � controlador."
+"\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."
+msgstr ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:160
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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"
 "\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"
-"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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+"   * Undo: you can use this option to cancel your changes.\n"
 "\n"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\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"
 msgstr ""
-"Neste punto, vostede pode escolle-la(s) partici�n(s) que desexa usar para\n"
-"instala-lo seu sistema Linux-Mandrake, se xa foron definidas (por unha\n"
-"instalaci�n anterior de Linux ou por outra utilidade de particionamento).\n"
-"Noutros casos, deberanse defini-las partici�ns do disco duro. Esta "
-"operaci�n\n"
-"consiste en dividir l�xicamente a capacidade do disco duro en �reas "
-"separadas\n"
-"para o seu uso.\n"
+
+#: ../../help.pm_.c:218
+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"
-"Se ten que crear novas partici�ns, use \"Asignaci�n autom�tica\" para crear\n"
-"autom�ticamente as partici�ns para Linux. Pode escolle-lo disco que quere\n"
-"particionar premendo en \"hda\" para a primeira unidade IDE, \"hdb\" para\n"
-"a segunda, ou \"sda\" para a primeira unidade SCSI, e as� o resto.\n"
+"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
 "\n"
-"D�as partici�ns habituais son: a partici�n ra�z (/), que � o punto inicial\n"
-"da xerarqu�a de directorios do sistema de ficheiros, e /boot, que cont�n\n"
-"t�dolos ficheiros necesarios para principa-lo sistema operativo cando se\n"
-"acende o ordenador.\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"
-"Xa que os efectos deste proceso son normalmente irreversibles, facer\n"
-"partici�ns pode intimidar e po�er nervioso a un usuario non experimentado.\n"
-"A utilidade DiskDrake simplifica o proceso para que o usuario non te�a que\n"
-"selo. Consulte a documentaci�n e t�mese o seu tempo antes de continuar.\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"
-"Pode usar calquera opci�n co teclado: percorra as partici�ns usando Tab e\n"
-"as frechas Arriba/Abaixo. Se unha partici�n est� seleccionada, pode usar:\n"
+"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-c  para crear unha nova partici�n (cando a escollida est� baleira)\n"
+"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"- Ctrl-d  para borrar unha partici�n\n"
+"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"- Ctrl-m  para establece-lo punto de montaxe\n"
+"\n"
+"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
+"\"secondary hard drive\", etc..."
+msgstr ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:252
 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."
+"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 ""
-"As partici�ns rec�n creadas deben ser formatadas para que o sistema\n"
-"poda usalas (formatar significa crear un sistema de ficheiros). Agora\n"
-"tam�n pode formatar partici�ns creadas anteriormente e en uso, se desexa\n"
-"borrar t�dolos datos que conten. Nota: non � necesario formatar as\n"
-"partici�ns que xa existen, en particular se desexa conserva-los datos\n"
-"que conten. T�picamente mant��ense /home e /usr/local."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:257
+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 ""
+
+#: ../../help.pm_.c:267
+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 ""
+
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
+
+#: ../../help.pm_.c:303
+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 ""
+
+#: ../../help.pm_.c:329
+#, 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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"
@@ -1562,139 +1989,153 @@ msgstr ""
 "� 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:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:358
+#, 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 ""
 "Se ten t�dolos CDs na lista superior, prema Aceptar.\n"
 "Se non ten ning�n deses CDs, prema Cancelar.\n"
 "Se s� faltan alg�ns dos CDs, desm�rqueos, e prema Aceptar."
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:363
 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."
+"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 ""
-"Os paquetes escollidos est�n agora a seren instalados. Esta\n"
-"operaci�n deber�a levar alg�ns minutos, ag�s que vostede escollese\n"
-"actualizar un sistema que xa existe, neste caso pode que lle leve\n"
-"m�is tempo incluso antes de que a actualizaci�n comece."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:371
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"Se DrakX non puido atopa-lo seu rato, ou se vostede quere\n"
-"comprobar qu� � o que fixo, presentar�selle a lista de ratos\n"
-"enriba.\n"
-"\n"
-"\n"
-"Se vostede est� de acordo cos par�metros do DrakX, vaia �\n"
-"seguinte secci�n que queira, premendo no men� da esquerda. Noutro\n"
-"caso, escolla no men� un tipo de rato que vostede pense que � o\n"
-"mellor para o seu.\n"
-"\n"
-"\n"
-"No caso dun rato de porto serie, ter� que lle dicir � DrakX o\n"
-"porto serie � que est� conectado."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
 "Por favor, escolla o porto correcto. Por exemplo, o porto COM1 en MS\n"
 "Windows ch�mase ttyS0 en Linux."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
+"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"
-"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"
-"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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"Esta secci�n ad�case a configurar unha rede de �rea local (LAN)\n"
-"ou un m�dem.\n"
-"\n"
-"Escolla \"Rede local\" e DrakX tentar� atopar un adaptador Ethernet\n"
-"na s�a m�quina. Os adaptadores PCI deber�an ser atopados e inicializados\n"
-"autom�ticamente. Nembargantes, se o seu perif�rico � ISA, a\n"
-"autodetecci�n non funcionar�, e ter� que escoller un controlador\n"
-"da lista que aparecer� ent�n.\n"
-"\n"
-"\n"
-"Do mesmo xeito que para os adaptadores SCSI, vostede pode deixar que o\n"
-"controlador analice o adaptador de primeiras, ou sen�n vostede ter� que\n"
-"indica-las opci�ns � controlador que vostede ter� que obter da\n"
-"documentaci�n do seu aparato.\n"
-"\n"
-"\n"
-"Se instala un sistema Linux-Mandrake nunha m�quina que � parte dunha\n"
-"rede que xa existe, o administrador da rede xa lle dar�a toda a\n"
-"informaci�n necesaria (direcci�n IP, subm�scara ou simplemente m�scara\n"
-"de rede, e o nome da m�quina). Se est� activando unha rede privada na\n"
-"s�a casa, por exemplo, ter� que escolle-las direcci�ns.\n"
-"\n"
-"\n"
-"Escolla \"Chamar cun m�dem\" e configurarase unha conexi�n a Internet\n"
-"cun m�dem. DrakX tentar� atopa-lo seu m�dem, e se non pode, vostede ter�\n"
-"que indica-lo porto serie correcto onde est� conectado o seu m�dem."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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"
@@ -1710,7 +2151,22 @@ msgstr ""
 "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:225
+#: ../../help.pm_.c:437
+#, 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:441
+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:445
 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."
@@ -1718,7 +2174,7 @@ 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:229
+#: ../../help.pm_.c:449
 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."
@@ -1726,13 +2182,15 @@ 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:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1743,13 +2201,19 @@ msgstr ""
 "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:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"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"
@@ -1757,15 +2221,22 @@ msgstr ""
 "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:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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"
@@ -1775,81 +2246,159 @@ msgstr ""
 "coma un servidor: probablemente non querer� iniciar servicios que non "
 "precisa."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
 msgid ""
-"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"
+"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:490
+msgid ""
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"Linux pode utilizar varios tipos de impresoras. Cada un deles\n"
-"necesita unha configuraci�n diferente. Dese conta que o spooler\n"
-"de impresi�n usa 'lp' como o nome por omisi�n da impresora;\n"
-"por tanto ten que ter unha impresora con ese nome; pero pode\n"
-"darlle varios nomes a unha impresora, separados por caracteres '|'.\n"
-"De xeito que se vostede prefere ter un nome m�is significativo, s� ten\n"
-"que po�elo � principio, p.ex: \"Impresora|lp\".\n"
-"A impresora que te�a \"lp\" nos seus nomes ser� a impresora por defecto.\n"
+
+#: ../../help.pm_.c:505
+msgid ""
+"GNU/Linux can deal with many types of printer. Each of these types requires\n"
+"a different setup.\n"
 "\n"
 "\n"
-"Se a s�a impresora est� conectada directamente � seu ordenador,\n"
-"elixa �Impresora local�. Logo ter� que indicar o porto no que est�\n"
-"conectada a s�a impresora, e escolle-lo filtro de impresi�n adecuado.\n"
+"If your printer is physically connected to your computer, select \"Local\n"
+"printer\".\n"
 "\n"
 "\n"
-"Se desexa acceder a unha impresora situada nunha m�quina Unix remota,\n"
-"elixa �Impresora remota�. Para que poida utilizala non � necesario\n"
-"un nome de usuario ou contrasinal, pero necesitar� sabe-lo nome da\n"
-"fila de impresi�n no servidor de impresi�n remoto.\n"
+"If you want to access a printer located on a remote Unix machine, select\n"
+"\"Remote printer\".\n"
 "\n"
 "\n"
-"Se desexa acceder a unha impresora SMB (� dicir, a unha impresora conectada\n"
-"a unha m�quina remota con Windows 9x/NT), deber� especifica-lo seu nome\n"
-"SMB (que non � o seu nome TCP/IP), e posiblemente tam�n a s�a direcci�n IP,\n"
-"as� como o nome de usuario, de grupo de traballo e o contrasinal necesarios\n"
-"para acceder � impresora; e, por suposto, o nome da impresora mesma.\n"
-"O mesmo serve para unha impresora Netware, ag�s que non necesita a\n"
-"informaci�n sobre o grupo de traballo."
+"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:286
+#: ../../help.pm_.c:521
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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 ""
+
+#: ../../help.pm_.c:542
+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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
+"\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"
@@ -1865,7 +2414,7 @@ msgstr ""
 "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:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1874,7 +2423,7 @@ msgstr ""
 "shadow\"\n"
 "e \"Usar contrasinais MD5\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1882,7 +2431,7 @@ 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:310
+#: ../../help.pm_.c:611
 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"
@@ -1925,22 +2474,18 @@ msgstr ""
 "vai crear aqu�, e conectarse como root s� para as tarefas de administraci�n\n"
 "que o precisen."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Recom�ndase encarecidamente que responda \"Si\" aqu�. Se vostede instala\n"
-"Microsoft Windows m�is adiante, sobrescribirase o sector de arrinque.\n"
-"A menos que fixese un disquete de arrinque coma se lle suxere, non ser�\n"
-"capaz de voltar a arrincar Linux."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
+#, fuzzy
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
@@ -1953,7 +2498,7 @@ msgstr ""
 "A menos que sepa exactamente o que fai, elixa sempre\n"
 "\"Primeiro sector do disco (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1963,10 +2508,11 @@ msgstr ""
 "\"/dev/hda\" (a unidade mestra da canle primaria) ou \"/dev/sda\" (primeiro\n"
 "disco SCSI)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1989,7 +2535,8 @@ msgstr ""
 "poidendo borrar as entradas correspondentes. Pero neste caso, precisar�\n"
 "un disquete de arrinque para poder usalos."
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -2006,7 +2553,9 @@ msgid ""
 "\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."
 msgstr ""
 "As opci�ns principais do LILO e do grub son:\n"
@@ -2028,10 +2577,72 @@ msgstr ""
 "    * normal: escoller modo de texto normal 80x25.\n"
 "    * <n�mero>: usa-lo modo de texto correspondente."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+#, 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."
+
+#: ../../help.pm_.c:692
+#, 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:705
+#, fuzzy
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2055,7 +2666,7 @@ msgstr ""
 "Se non, pode voltar atr�s e troca-la configuraci�n; tantas\n"
 "veces como sexa necesario."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2063,7 +2674,7 @@ msgstr ""
 "Se algo vai mal coa configuraci�n das X, use estas opci�ns para configurar\n"
 "correctamente o Sistema X Window."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2071,42 +2682,47 @@ msgstr ""
 "Se vostede prefere usar un login gr�fico, escolla \"Si\". Doutro xeito,\n"
 "escolla \"Non\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\n"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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"
+"\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"
+"\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."
 msgstr ""
 "Vostede pode agora escoller algunhas opci�ns diversas para o sistema.\n"
 "\n"
@@ -2144,7 +2760,7 @@ msgstr ""
 "    tralo arrinque, escolla esta opci�n (Nota: Bloq Num pode ou non pode\n"
 "    funcionar nas X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2158,191 +2774,131 @@ msgstr ""
 "autom�ticamente. Se vostede quere iniciar noutro sistema operativo que xa\n"
 "exista, por favor, lea as instrucci�ns adicionais."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Escolle-la lingua"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Clase de instalaci�n"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Detectar discos duros"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Configura-lo rato"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Escoller teclado"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Sistemas de ficheiros"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Formatar partici�ns"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Seleccionar paquetes"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Instalar sistema"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Configura-la rede"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Criptograf�a"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Zona horaria"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Configurar servicios"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Configurar impresora"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Contrasinal de root"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Engadir usuario"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Crear disquete de arrinque"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Cargador de arrinque"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Configurar as X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Disquete de auto-instalaci�n"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Sa�r da instalaci�n"
 
-#: ../../install2.pm_.c:337
-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 ""
-"Vostede ten que ter unha partici�n ra�z.\n"
-"Para iso, cree unha partici�n (ou prema nunha que xa exista).\n"
-"Ent�n escolla a acci�n ``Punto de montaxe'', e p��aa a `/'"
-
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Non podo le-la s�a t�boa de partici�ns, est� demasiado deteriorada :-(\n"
-"Probarase a ir po�endo en branco as partici�ns malas"
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Erro o le-lo ficheiro $f"
 
-#: ../../install_any.pm_.c:351
-msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
-msgstr ""
-"DiskDrake non puido ler correctamente a t�boa de partici�ns.\n"
-"�Contin�e � seu risco!"
+#: ../../install_gtk.pm_.c:426
+#, fuzzy
+msgid "Please test the mouse"
+msgstr "Escolla o seu tipo de rato."
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Buscando a partici�n ra�z."
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Escolla o seu tipo de rato."
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Informaci�n"
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
+#: ../../install_interactive.pm_.c:23
 #, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s : Esta non � unha partici�n ra�z, elixa outra por favor."
-
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Non se atopou ningunha partici�n ra�z"
-
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Non se pode usar broadcast sen un dominio NIS"
-
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Erro o le-lo ficheiro $f"
-
-#: ../../install_steps.pm_.c:75
 msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
+"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
+"You can find some information about them at: %s"
 msgstr ""
-"Ocorreu un erro, e o programa non sabe como manexalo de\n"
-"maneira limpa. Contin�e � seu risco."
-
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Punto de montaxe %s duplicado"
 
-#: ../../install_steps.pm_.c:323
+#: ../../install_interactive.pm_.c:41
 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"
+"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 ""
-"Alg�ns paquetes importantes non se instalaron correctamente.\n"
-"A s�a unidade de cdrom ou o seu cdrom est�n defectuosos.\n"
-"Comprobe o cdrom nun ordenador xa instalado usando \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
-
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Benvido a %s"
-
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Ningunha disqueteira dispo�ible"
-
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
-#, c-format
-msgid "Entering step `%s'\n"
-msgstr "Entrando na etapa '%s'\n"
+"Vostede ten que ter unha partici�n ra�z.\n"
+"Para iso, cree unha partici�n (ou prema nunha que xa exista).\n"
+"Ent�n escolla a acci�n ``Punto de montaxe'', e p��aa a `/'"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
+#: ../../install_interactive.pm_.c:46
 msgid "You must have a swap partition"
 msgstr "Debe ter unha partici�n de intercambio"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:47
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -2352,98 +2908,78 @@ msgstr ""
 "\n"
 "�Desexa continuar de t�dolos xeitos?"
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Escolla o tama�o que quere instalar"
+#: ../../install_interactive.pm_.c:68
+#, fuzzy
+msgid "Use free space"
+msgstr "Usar para loopback"
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Tama�o total: "
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Versi�n: %s\n"
+#: ../../install_interactive.pm_.c:78
+#, fuzzy
+msgid "Use existing partition"
+msgstr "Formatando as partici�ns"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "Tama�o: %d KB\n"
+#: ../../install_interactive.pm_.c:80
+#, fuzzy
+msgid "There is no existing partition to use"
+msgstr "Tratando de recupera-la t�boa de partici�ns"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Elixa os paquetes que desexa instalar"
+#: ../../install_interactive.pm_.c:87
+#, fuzzy
+msgid "Use the Windows partition for loopback"
+msgstr "Usar para loopback"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "�Que partici�n desexa usar para po�er Linux4Win?"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Instalar"
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Escolla os tama�os"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Instalando"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Tama�o da partici�n ra�z en MB: "
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Agarde, por favor, "
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Tama�o da partici�n de intercambio en MB: "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Tempo restante "
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Tempo total "
+#: ../../install_interactive.pm_.c:105
+#, fuzzy
+msgid "Which partition do you want to resize?"
+msgstr "�Qu� tipo de partici�n desexa?"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Preparando a instalaci�n"
+#: ../../install_interactive.pm_.c:107
+#, fuzzy
+msgid "Computing Windows filesystem bounds"
+msgstr "Calculando os l�mites do sistema de ficheiros FAT"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Installing package %s"
-msgstr "Instalando o paquete %s"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "�Seguir adiante?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Houbo un erro � ordea-los paquetes:"
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "�Usar a configuraci�n existente para X11?"
-
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Escolla unha das seguintes clases de instalaci�n:"
-
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "�Non ten ningunha partici�n de windows!"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "�Non ten espacio dabondo para Lnx4win!"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_interactive.pm_.c:113
+#, fuzzy
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
 "dangerous. If you have not already done so, you should first exit the\n"
 "installation, run scandisk under Windows (and optionally run defrag), then\n"
 "restart the installation. You should also backup your data.\n"
@@ -2458,33 +2994,153 @@ msgstr ""
 "seguridade dos seus datos.\n"
 "Cando estea seguro, prema Ok."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
+#: ../../install_interactive.pm_.c:122
+#, fuzzy
+msgid "Which size do you want to keep for windows on"
+msgstr "�A que sector desexa desprazala?"
+
+#: ../../install_interactive.pm_.c:123
+#, fuzzy, c-format
+msgid "partition %s"
+msgstr "Partici�n"
+
+#: ../../install_interactive.pm_.c:129
+#, fuzzy, c-format
+msgid "FAT resizing failed: %s"
 msgstr "Fallou o redimensionamento autom�tico"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "�Que partici�n desexa usar para po�er Linux4Win?"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Escolla os tama�os"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Tama�o da partici�n ra�z en MB: "
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Tama�o da partici�n de intercambio en MB: "
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:156
+#, fuzzy, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr ""
+"� redimensiona-la partici�n %s, perderanse t�dolos datos desta partici�n"
+
+#: ../../install_interactive.pm_.c:164
+#, fuzzy
+msgid "Expert mode"
+msgstr "Experto"
+
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:171
+#, fuzzy, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Pode agora particionar o seu disco duro %s\n"
+"Cando remate, non olvide gravar usando `w'"
+
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "�Non ten ningunha partici�n de windows!"
+
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Non podo engadir m�is partici�ns"
+
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:218
+#, fuzzy, c-format
+msgid "Partitioning failed: %s"
+msgstr "Tipo de t�boa de partici�n: %s\n"
+
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Activando a rede"
+
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Desactivando a rede"
+
+#: ../../install_steps.pm_.c:74
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
+"Ocorreu un erro, e o programa non sabe como manexalo de\n"
+"maneira limpa. Contin�e � seu risco."
+
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Punto de montaxe %s duplicado"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps.pm_.c:375
+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 ""
+"Alg�ns paquetes importantes non se instalaron correctamente.\n"
+"A s�a unidade de cdrom ou o seu cdrom est�n defectuosos.\n"
+"Comprobe o cdrom nun ordenador xa instalado usando \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
+
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Benvido a %s"
+
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Ningunha disqueteira dispo�ible"
+
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Entrando na etapa '%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Escolla unha das seguintes clases de instalaci�n:"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2498,7 +3154,7 @@ msgstr ""
 "Un porcentaxe baixo instalar� s� os paquetes m�is importantes;\n"
 "un porcentaxe dun 100%% instalar� t�dolos paquetes seleccionados."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2514,58 +3170,102 @@ msgstr ""
 "Un porcentaxe baixo instalar� s� os paquetes m�is importantes;\n"
 "un porcentaxe de %d%% instalar� t�dolos paquetes posibles."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "Vostede poder� escollelos m�is espec�ficamente no seguinte paso."
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Porcentaxe de paquetes a instalar"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Elixa os paquetes que desexa instalar"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Instalar"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Dependencias autom�ticas"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Expandir �rbore"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Pechar �rbore"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Trocar entre lista completa e ordenada por grupos"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Paquete err�neo"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nome: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versi�n: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Tama�o: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Importancia: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Tama�o total: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+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:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "Os seguintes paquetes van ser desinstalados"
+
+#: ../../install_steps_gtk.pm_.c:387
+#, fuzzy
+msgid "The following packages are going to be removed"
+msgstr "Vanse instalar/borrar os seguintes paquetes"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Non pode seleccionar/deseleccionar este paquete"
+
+#: ../../install_steps_gtk.pm_.c:416
 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:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "Non pode deseleccionar este paquetes. Xa est� instalado"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2573,46 +3273,89 @@ msgstr ""
 "Este paquete ten que ser actualizado\n"
 "�Est� seguro de querer deseleccionarlo?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Non pode deseleccionar este paquetes. Ten que ser actualizado"
 
-#: ../../install_steps_gtk.pm_.c:493
-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:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Vanse instalar/borrar os seguintes paquetes"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "Non pode seleccionar/deseleccionar este paquete"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Instalando"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Estimando"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Agarde, por favor, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Tempo restante "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Tempo total "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Preparando a instalaci�n"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d paquetes"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Instalando o paquete %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Accept"
+msgstr "Aceptar usuario"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2627,187 +3370,391 @@ msgstr ""
 "cando estea.\n"
 "Se non o ten, prema Cancelar para omitir a instalaci�n deste Cd-Rom."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Redimensionar"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "�Seguir adiante?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Houbo un erro � ordea-los paquetes:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Houbo un erro � instala-los paquetes:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Ocorreu un erro"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Escolla a lingua que queira usar."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Escolla a s�a disposici�n de teclado."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 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:91
-msgid "Root Partition"
-msgstr "Partici�n ra�z"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "�Cal � a partici�n ra�z (/) do seu sistema?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Clase de Instalaci�n"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "�Qu� clase de instalaci�n desexa?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Instalar/Actualizar"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "�� unha instalaci�n ou unha actualizaci�n?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Autom�tica"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Personalizada"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Experto"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
+#, fuzzy
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "�Est� seguro de ser un experto? \n"
 "Aqu� permitir�selle facer cousas m�is potentes pero perigosas."
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Actualizaci�n"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Normal"
+#: ../../install_steps_interactive.pm_.c:222
+#, fuzzy
+msgid "Workstation"
+msgstr "Informaci�n"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Desenvolvemento"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Servidor"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+#, fuzzy
+msgid "What is your system used for?"
 msgstr "� Cal � o uso do seu sistema ?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Escolla o seu tipo de rato."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Porto do rato"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Escolla o porto serie � que est� conectado o seu rato."
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Configurando tarxetas PCMCIA..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "Configurando o IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "ningunha partici�n dispo�ible"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%d MB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Escolla a partici�n para usar como partici�n ra�z."
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Seleccione os puntos de montaxe"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, fuzzy, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Non podo le-la s�a t�boa de partici�ns, est� demasiado deteriorada :-(\n"
+"Probarase a ir po�endo en branco as partici�ns malas"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake non puido ler correctamente a t�boa de partici�ns.\n"
+"�Contin�e � seu risco!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Partici�n ra�z"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "�Cal � a partici�n ra�z (/) do seu sistema?"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "Necesita reinicia-lo equipo para que a modificaci�n da t�boa\n"
 "de partici�ns se tome en conta"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Elixa as partici�ns que desexa formatar"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "�Comproba-los bloques err�neos?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Formatando as partici�ns"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Creando e formatando o ficheiro %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "Non hai espacio de intercambio dabondo para remata-la instalaci�n,\n"
 "por favor, engada alg�n"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Buscando os paquetes dispo�ibles"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Atopando os paquetes a actualizar"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, fuzzy, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 "� seu sistema non lle queda espacio dabondo para a instalaci�n ou "
 "actualizaci�n"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Complete (%dMB)"
+msgstr "Normal"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Minimum (%dMB)"
+msgstr "(%d MB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Recommended (%dMB)"
+msgstr "Normal"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "Personalizada"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Escolla o tama�o que quere instalar"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Selecci�n dos Grupos de Paquetes"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Selecci�n individual de paquetes"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2817,12 +3764,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:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom etiquetado \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2830,173 +3777,11 @@ msgstr ""
 "Instalando o paquete %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Configuraci�n despois da instalaci�n"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Conserva-la configuraci�n IP actual"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Reconfigura-la rede agora"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Non configura-la rede"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Configuraci�n da Rede"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "A rede local xa foi configurada. Desexa:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "�Quere configurar unha rede local no seu sistema?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "non se atopou ningunha tarxeta de rede"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Configuraci�n do M�dem"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "�Quere configurar unha conexi�n con m�dem para o seu sistema?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Configurar o dispositivo de rede %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Introduza a direcci�n IP desta m�quina, por favor.\n"
-"Cada valor ten que ser introducido coma unha direcci�n IP en\n"
-"notaci�n decimal con puntos (por exemplo: 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "IP autom�tica"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "Direcci�n IP:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "M�scara de rede:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "As direcci�ns IP deben estar no formato 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Configurando a rede"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Introduza o nome da s�a m�quina.\n"
-"Ese nome debe ser un nome completamente cualificado,\n"
-"como � mimaquina.milab.micomp.es �.\n"
-"Pode tam�n introduci-la direcci�n IP da pasarela se usa unha"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "Servidor DNS:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Dispositivo de pasarela de rede:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Pasarela:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Nome de m�quina:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "�Desexa que se tente atopar un m�dem?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Escolla o porto serie � que est� conectado o seu m�dem."
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Opci�ns de chamada"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Nome da conexi�n"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "N�mero de tel�fono"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "ID de Login"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Autenticaci�n"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Baseado nun script"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Baseado nun terminal"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Nome do dominio"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Primeiro Servidor DNS"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Segundo Servidor DNS"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3067,89 +3852,95 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Escoller un espello do que colle-los paquetes"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Contactando co espello para obte-la lista dos paquetes dispo�ibles"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Elixa os paquetes que desexa instalar."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
+#, fuzzy
 msgid "Which is your timezone?"
-msgstr "�Cal � a sua zona horaria?"
+msgstr "� Cal � o uso do seu sistema ?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "�O reloxo interno do seu ordenador usa a hora GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "�Qu� tipo de partici�n desexa?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Sen contrasinal"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Usar ficheiro shadow"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Usar contrasinais MD5"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Usar NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "p�xinas amarelas (yp)"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, 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:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Autenticaci�n NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "Dominio NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "Servidor NIS"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Aceptar usuario"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Engadir usuario"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s xa foi engadido)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3159,60 +3950,89 @@ msgstr ""
 "Introduza un usuario\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Nome e apelidos"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Nome de usuario"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Icona"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Este contrasinal � demasiado simple"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Entre o nome de usuario"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "O nome de usuario (login) s� debe conter letras, n�meros, '-' o '_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Este nome de usuario xa est� engadido"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+#, fuzzy
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Un disco de arrinque personalizado d�lle a posibilidade de arrincar o seu\n"
+"equipo baixo Linux sen depender do cargador de arrinque normal. Isto pode "
+"ser\n"
+"�til se non desexa instalar LILO (ou grub) no seu sistema, ou se outro "
+"sistema\n"
+"operativo o borra ou se LILO non funciona coa configuraci�n do seu equipo.\n"
+"Un disco de arrinque personalizado tam�n pode ser usado coa imaxe de "
+"rescate\n"
+"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:869
 msgid "First floppy drive"
 msgstr "Primeira unidade de disquete"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Segunda unidade de disquete"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Saltar"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3236,64 +4056,33 @@ 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:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Disculpe, pero non hai ningunha disqueteira dispo�ible"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Elixa o lector que desexa usar para crea-lo disco de arranque"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Inserte un disquete na unidade %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Creando o disco de arrinque"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "Fallou a instalaci�n de LILO. Ocorreu o erro seguinte:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "�Desexa usar SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "Opci�ns principais de SILO"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Aqu� est�n as seguintes entradas no SILO.\n"
-"Pode engadir algunhas m�is ou cambia-las que xa existen."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Partici�n"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Esta etiqueta xa se est� a usar"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "Fallou a instalaci�n de SILO. Ocorreu o seguinte erro:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Preparando o cargador de arrinque"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
+#, fuzzy
 msgid "Do you want to use aboot?"
-msgstr "�Quere usar aboot?"
+msgstr "�Desexa usar SILO?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3301,126 +4090,114 @@ msgstr ""
 "Erro instalando aboot, \n"
 "�probar a forza-la instalaci�n mesmo se iso destr�e a primeira partici�n?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Configuraci�n dos proxys"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "Proxy HTTP"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "Proxy FTP"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "O proxy deber�a ser http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "O proxy deber�a ser ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+#, fuzzy
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "Fallou a instalaci�n de LILO. Ocorreu o erro seguinte:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Benvida �s Crackers"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Pobre"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Baixo"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Medio"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Alto"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoico"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Preguntas varias"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(pode provocar corrupci�n dos datos)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Usar optimizaci�ns de disco duro"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Escoller un nivel de seguridade"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Tama�o exacto de memoria se se necesita (atop�ronse %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Automonta-las unidades extra�bles"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Limpar /tmp en cada arrinque"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Activar perf�s m�ltiples"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Activar Bloq Num � iniciar"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Dar o tama�o da memoria en MB"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Non se pode usar supermount no nivel de seguridade alto"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX xerar� ficheiros de configuraci�n para XFree 3.3 e XFree 4.0.\n"
-"Por defecto �sase o servidor 3.3 porque funciona con m�is tarxetas "
-"gr�ficas.\n"
-"\n"
-"�Quere probar XFree 4.0?"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "�Desexa que se tenten atopar dispositivos PCI?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "�Usar a configuraci�n existente para X11?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 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:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Insira un disquete baleiro na unidade %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Creando un disquete de auto-instalaci�n"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3430,7 +4207,7 @@ msgstr ""
 "\n"
 "�Desexa realmente sa�r agora?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3453,154 +4230,18 @@ msgstr ""
 "da instalaci�n, hai un cap�tulo na Gu�a do Usuario Oficial\n"
 "de Linux Mandrake."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Apagando"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Instalando controlador para a tarxeta %s %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(m�dulo %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "�Que controlador de %s desexa que se probe?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"Nalg�ns casos, o controlador de %s necesita informaci�n extra\n"
-"para funcionar correctamente, a�nda que normalmente funcione sin ela.\n"
-"�Desexa especificar informaci�n extra para o controlador ou deixar que el\n"
-"analice o seu equipo e atope a informaci�n que necesita? �s veces,\n"
-"analizar o equipo pode provocar que se pare, pero non deber�a\n"
-"causar ning�n dano."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Autodetecci�n"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Especificar as opci�ns"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Agora pode dar as opci�ns para o m�dulo %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Aqu� deben ir as diferentes opci�ns para o m�dulo %s.\n"
-"As opci�ns son da forma �nome=valor nome2=valor2 ...�.\n"
-"Por exemplo pode ter �io=0x300 irq=7�"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Opci�ns do m�dulo:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Fallo o carga-lo m�dulo %s\n"
-"�Desexa reintentalo con outros par�metros?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "�Desexa que se atopen tarxetas PCMCIA?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Configurando tarxetas PCMCIA..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "�Desexa que se tenten atopar dispositivos %s?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "%s interfaces %s atopadas"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "�Ten algunha outra?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "�Ten algunha interface %s?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Non"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Si"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Informaci�n sobre o hardware"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Activando a rede"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Desactivando a rede"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Instalaci�n de Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> entre elementos  |  <Space> escoller  |  <F12> seguinte "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"Pode agora particionar o seu disco duro %s\n"
-"Cando remate, non olvide gravar usando `w'"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Agarde, por favor"
 
@@ -3610,7 +4251,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Ambig�idade (%s), sexa m�is preciso\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Elecci�n incorrecta, tente de novo\n"
 
@@ -3624,449 +4265,969 @@ msgstr " ? (por omisi�n %s) "
 msgid "Your choice? (default %s) "
 msgstr "�A s�a elecci�n? (por omisi�n %s)"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "�A s�a elecci�n? (por omisi�n %s, teclee 'none' para ningunha)"
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "Checo"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Alem�n"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Teclado dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Espa�ol"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Finland�s"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Franc�s"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Brit�nico"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "Estadounidense"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armenio (antigo)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armenio (m�quina de escribir)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armenio (fon�tico)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "B�lgaro"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasileiro"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "Bielorruso"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Suizo (alem�n)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Suizo (franc�s)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Alem�n (sen teclas de tiles)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Dan�s"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+#, fuzzy
+msgid "Dvorak (US)"
+msgstr "Teclado dvorak"
+
+#: ../../keyboard.pm_.c:139
+#, fuzzy
+msgid "Dvorak (Norwegian)"
+msgstr "Noruego"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Estonio"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Xeorxiano (cir�lico)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Xeorxiano (latino)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Grego"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "H�ngaro"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Israel�"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Israel� (Fon�tico)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+#, fuzzy
+msgid "Iranian"
+msgstr "Ucraniano"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Island�s"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Latinoamericano"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Holand�s"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lituano AZERTY (antigo)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lituano AZERTY (novo)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lituano \"ringleira de n�meros\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituano \"fon�tico\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Polaco (disposici�n qwerty)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Polaco (disposici�n qwertz)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugu�s"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Canadiano (Qu�bec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Ruso (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Eslovaco"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Teclado Thai"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turco (tradicional modelo \"F\")"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turco (moderno modelo \"Q\")"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "Estadounidense (internacional)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+#, fuzzy
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Lituano \"ringleira de n�meros\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Iugoslavo (latino)"
 
-# 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
-#
-# '\255' is '�' (inversed !) in cp437 encoding
-# '\242' is '�' (oacute) in cp437 encoding
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Rato Sun"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Xen�rico"
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "nivel"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "serie"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Rato de 2 botones xen�rico"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Rato de 3 botones xen�rico"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Rato Logitech (serie, antigo tipo C7)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Ning�n rato"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "ning�n"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Ning�n rato"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "�� isto correcto?"
+
+#: ../../netconnect.pm_.c:93
+#, fuzzy
+msgid "Internet configuration"
+msgstr "Configuraci�n dos proxys"
+
+#: ../../netconnect.pm_.c:94
+#, fuzzy
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "�Desexa proba-la configuraci�n?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Configura-la rede"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Non configura-la rede"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Nome da conexi�n"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+#, fuzzy
+msgid "ISDN Configuration"
+msgstr "Configuraci�n"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "Configuraci�n dos proxys"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr ""
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr ""
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr ""
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:169
+#, fuzzy
+msgid "Provider phone number"
+msgstr "N�mero de tel�fono"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr ""
+
+#: ../../netconnect.pm_.c:172
+#, fuzzy
+msgid "Dialing mode"
+msgstr "Nome do dominio"
+
+#: ../../netconnect.pm_.c:174
+#, fuzzy
+msgid "Account Login (user name)"
+msgstr "Punto de montaxe"
+
+#: ../../netconnect.pm_.c:175
+#, fuzzy
+msgid "Account Password"
+msgstr "Contrasinal"
+
+#: ../../netconnect.pm_.c:176
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Contrasinal"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "Proba da configuraci�n"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:214
+#, fuzzy
+msgid "Which protocol do you want to use ?"
+msgstr "�Qu� tipo de partici�n desexa?"
+
+#: ../../netconnect.pm_.c:224
+#, fuzzy
+msgid "ISA / PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+#, fuzzy
+msgid "PCI"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr ""
+
+#: ../../netconnect.pm_.c:233
+#, fuzzy
+msgid "What kind of card do you have?"
+msgstr "�Qu� tipo de impresora ten?"
+
+#: ../../netconnect.pm_.c:239
+#, fuzzy
+msgid "Continue"
+msgstr "�Continuar de calquera xeito?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr ""
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:257
+#, fuzzy
+msgid "Which is your ISDN card ?"
+msgstr "�Cal � a sua zona horaria?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:287
+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 ""
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr ""
+
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "Escoller o tama�o novo"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Escolla o porto serie � que est� conectado o seu rato."
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
+"Do you agree?"
 msgstr ""
-"�Benvido a LILO, o selector de sistema operativo!\n"
+
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "�Desexa proba-la configuraci�n?"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "Configuraci�n"
+
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "�Quere usar aboot?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "�Desexa que se tente atopar un m�dem?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Escolla o porto serie � que est� conectado o seu m�dem."
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Opci�ns de chamada"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Nome da conexi�n"
+
+#: ../../netconnect.pm_.c:546
+#, fuzzy
+msgid "Phone number"
+msgstr "N�mero de tel�fono"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "ID de Login"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Autenticaci�n"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Baseado nun script"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Baseado nun terminal"
+
+#: ../../netconnect.pm_.c:550
+#, fuzzy
+msgid "Domain name"
+msgstr "Nome da conexi�n"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Primeiro Servidor DNS"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Segundo Servidor DNS"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
 "\n"
-"Para mira-las posibles selecci�ns, prema <TAB>.\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Nome da conexi�n"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "Configura-la rede"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Non configura-la rede"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
 "\n"
-"Para arrincar un deles, teclee o seu nome e prema <ENTER>\n"
-"ou espere %d segundos para que arrinque o sistema por omisi�n.\n"
+"You can disconnect or reconfigure your connection."
+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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "�Benvido a GRUB, o escolledor de sistemas operativos!"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Non configura-la rede"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "Use as teclas %c e %c para cambiar a entrada marcada."
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Nome da conexi�n"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Prema enter para arrincar o SO seleccionado, 'e' para editar os"
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Nome da conexi�n"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "comandos antes de arrincar, ou 'c' para unha li�a de comandos."
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Configura-la rede"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "A entrada marcada arrincarase autom�ticamente en %d segundos."
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "Conexi�n da Impresora"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "non hai espacio dabondo en /boot"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Escritorio"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Configura-la rede"
 
-# Puxen o � en cp437 porque creo que as� o garda a FAT
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Men� Inicio"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Configura-la rede"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Rato Sun"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr ""
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Rato Applet ADB"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Experto"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Rato Apple ADB (2 Bot�ns)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+#, fuzzy
+msgid "Connect to the Internet"
+msgstr "Nome da conexi�n"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Rato Apple ADB (3 ou m�is bot�ns)"
+#: ../../netconnect.pm_.c:672
+#, fuzzy
+msgid "What kind is your ISDN connection?"
+msgstr "�A qu� porto serie est� conectado o rato?"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Rato Apple USB"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Configura-la rede"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Rato Apple USB (2 Bot�ns)"
+#: ../../netconnect.pm_.c:700
+#, fuzzy
+msgid "France"
+msgstr "Cancelar"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Rato Apple USB (3 ou m�is bot�ns)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr ""
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Rato xen�rico (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr ""
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Rato de 3 botones xen�rico (PS/2)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "Experto"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Configura-la rede"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "�Qu� tipo de partici�n desexa?"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Configura-la rede"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "Configura-la rede"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "Rato Bus ATI"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Configuraci�n da Rede"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Rato Bus Microsoft"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "�Desexa proba-la configuraci�n?"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Rato Bus Logitech"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "Configura-la rede"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "Rato USB"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Nome da conexi�n"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "Rato USB (3 ou m�is bot�ns)"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "A rede local xa foi configurada. Desexa:"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Ning�n rato"
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "�A que disco desexa desprazala?"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft rev 2.1A ou superior (serie)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Configuraci�n da Rede"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (serie)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (serie)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "non se atopou ningunha tarxeta de rede"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (serie)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Configurando a rede"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (serie)"
+#: ../../network.pm_.c:274
+#, fuzzy
+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.\n"
+"Ese nome debe ser un nome completamente cualificado,\n"
+"como � mimaquina.milab.micomp.es �.\n"
+"Pode tam�n introduci-la direcci�n IP da pasarela se usa unha"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (serie)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+#, fuzzy
+msgid "Host name"
+msgstr "Nome de m�quina:"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (serie)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (serie)"
+#: ../../network.pm_.c:302
+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 ""
+"Introduza a direcci�n IP desta m�quina, por favor.\n"
+"Cada valor ten que ser introducido coma unha direcci�n IP en\n"
+"notaci�n decimal con puntos (por exemplo: 1.2.3.4)."
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Rato Logitech (serie, antigo tipo C7)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Configurar o dispositivo de rede %s"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (serie)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "IP autom�tica"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Rato xen�rico (serie)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "IP address"
+msgstr "Direcci�n IP:"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Compatible Microsoft (serie)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Netmask"
+msgstr "M�scara de rede:"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Rato de 3 bot�ns xen�rico (serie)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (serie)"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "As direcci�ns IP deben estar no formato 1.2.3.4"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "�� isto correcto?"
+#: ../../network.pm_.c:341
+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 ""
+"Introduza o nome da s�a m�quina.\n"
+"Ese nome debe ser un nome completamente cualificado,\n"
+"como � mimaquina.milab.micomp.es �.\n"
+"Pode tam�n introduci-la direcci�n IP da pasarela se usa unha"
+
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "Servidor DNS:"
+
+#: ../../network.pm_.c:347
+#, fuzzy
+msgid "Gateway"
+msgstr "Pasarela:"
+
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "Dispositivo de pasarela de rede:"
+
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Configuraci�n despois da instalaci�n"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "Proxy HTTP"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "Proxy FTP"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "O proxy deber�a ser http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "O proxy deber�a ser ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr "As partici�ns estendidas non est�n soportadas nesta plataforma"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4076,21 +5237,21 @@ msgstr ""
 "A �nica soluci�n � despraza-las s�as partici�ns primarias para que\n"
 "o burato est� despois das partici�ns estendidas"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erro o le-lo ficheiro %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Fallou a restauraci�n a partir do ficheiro %s: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Ficheiro de backup incorrecto"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Erro � escribir � ficheiro %s"
@@ -4124,42 +5285,56 @@ msgstr "interesante"
 msgid "maybe"
 msgstr "indiferente"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (importante)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (moi bo)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (bo)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Ver menos"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Ver m�is"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Impresora local"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+#, fuzzy
+msgid "Remote printer"
+msgstr "Opci�ns impresora remota lpd"
+
+#: ../../printer.pm_.c:21
+#, fuzzy
+msgid "Remote CUPS server"
+msgstr "Fila de impresi�n remota"
+
+#: ../../printer.pm_.c:22
+#, fuzzy
+msgid "Remote lpd server"
 msgstr "Impresora remota"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "Opci�ns de impresi�n NetWare"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "Impresora SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "Impresora Netware"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Dispositivo da Impresora"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Detectando os dispositivos..."
@@ -4173,11 +5348,11 @@ msgstr "Probar portos"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Unha impresora, de modelo �%s�, foi detectada en "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Dispositivo de impresi�n local"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4185,15 +5360,15 @@ msgstr ""
 "�A que dispositivo est� conectada a sua impresora?\n"
 "(te�a en conta que /dev/lp0 � equivalente al LPT1:)\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Dispositivo da Impresora"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Opci�ns impresora remota lpd"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4204,19 +5379,19 @@ msgstr ""
 "da fila, nese servidor, no que os traballos de impresi�n\n"
 "estar�n colocados."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Nome da m�quina remota"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Fila de impresi�n remota"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opci�ns impresora SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4231,27 +5406,27 @@ msgstr ""
 "a impresora que se quere usar, as� como calquera nome de usuario,\n"
 "grupo de traballo e contrasinal que faga falta."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "M�quina servidora SMB"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP do servidor SMB"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Nome de recurso compartido"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Grupo de traballo"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "Opci�ns de impresi�n NetWare"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4265,130 +5440,155 @@ msgstr ""
 "de impresi�n que desexa usar, as� como calquera nome de usuario\n"
 "e contrasinal que faga falta."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Servidor de Impresi�n"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Nome da Fila de Impresi�n"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "Opci�ns de impresi�n NetWare"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "Opci�ns da impresora"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "Pobre"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "�Qu� tipo de impresora ten?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "�Desexa proba-la impresi�n?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Imprimindo p�xina(s) de proba..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\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"
+"Estado da impresi�n:\n"
+"%s\n"
+"\n"
+"�Funciona correctamente?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+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:230
 msgid "Yes, print ASCII test page"
 msgstr "Si, imprimir unha p�xina ASCII de proba"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Si, imprimir unha p�xina PostScript de proba"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Si, imprimir �mbalas d�as p�xinas de proba"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Configura-la impresora"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "�Qu� tipo de impresora ten?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Opci�ns da impresora"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Tama�o do papel"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "�Saca-la p�xina despois da impresi�n?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Opci�ns do controlador Uniprint"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Opci�ns da profundidade de cor"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "�Imprimir texto como PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Inverter a orde das p�xinas"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "�Corrixir o efecto escaleira?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "N�mero de p�xinas por p�xina de sa�da"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Marxes Dereita/Esquerda en puntos (1/72 dunha polgada)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Marxes Superior/Inferior en puntos (1/72 dunha polgada)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Opci�ns de Ghostscript extra"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Opci�ns de Texto extra"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "�Desexa proba-la impresi�n?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Imprimindo p�xina(s) de proba..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\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"
-"Estado da impresi�n:\n"
-"%s\n"
-"\n"
-"�Funciona correctamente?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-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:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Impresora"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "�Desexa configurar unha impresora?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4396,19 +5596,69 @@ msgstr ""
 "Estas son as filas de impresi�n.\n"
 "Pode engadir algunhas m�is ou cambia-las que xa existen."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "Estimando"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Seleccionar Conexi�n da Impresora"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "�Como est� conectada a impresora?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+#, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "Seleccionar Conexi�n da Impresora"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Quitar fila"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+#, fuzzy
+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 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:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "Impresora local"
+
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "Especificar as opci�ns"
+
+#: ../../printerdrake.pm_.c:406
+#, fuzzy
+msgid "Location"
+msgstr "Informaci�n"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4420,45 +5670,45 @@ msgstr ""
 "a el. �Qu� nome e directorio quere que se utilicen para esta fila e como\n"
 "est� conectada a impresora?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Nome da fila"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Directorio spool"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Conexi�n da Impresora"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, 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:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Non se pode escribi-lo ficheiro $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid fallou"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid fallou (�pode que non estean as raidtools?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, 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:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, un xestor de comandos peri�dicos."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4466,7 +5716,7 @@ msgstr ""
 "apmd �sase para monitoriza-lo estado da bater�a e rexistralo polo syslog.\n"
 "Tam�n pode usarse para apaga-la m�quina cando a bater�a est� baixa."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4475,7 +5725,7 @@ msgstr ""
 "se executou at, e lanza comandos de lotes cando a carga media � baixa\n"
 "dabondo."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4487,7 +5737,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:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4498,7 +5748,7 @@ msgstr ""
 "o Midnight Commander. Tam�n permite operaci�ns de cortar e pegar co rato\n"
 "na consola, e incl�e soporte para men�s na consola."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4506,7 +5756,7 @@ msgstr ""
 "Apache � un servidor de World Wide Web.  �sase para servir ficheiros HTML\n"
 "e CGI."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4521,7 +5771,7 @@ msgstr ""
 "moitos servicios, incluindo telnet, ftp, rsh, e rlogin. Desactivar inetd\n"
 "desactiva t�dolos servicios de internet dos que � responsable."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4532,7 +5782,7 @@ msgstr ""
 "Este pode escollerse usando a utilidade kbdconfig. Deber�a deixar isto\n"
 "activado para a maior�a das m�quinas."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4541,7 +5791,7 @@ msgstr ""
 "� b�sicamente un servidor que arbitra os traballos de impresi�n �(s)\n"
 "impresora(s)."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4549,7 +5799,7 @@ msgstr ""
 "named (BIND) � un Servidor de Nomes de Dominio (DNS), que se emprega\n"
 "para resolve-los nomes de m�quinas a enderezos IP."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4557,7 +5807,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:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4565,7 +5815,7 @@ msgstr ""
 "Activa/Desactiva t�dalas interfaces de rede configuradas para\n"
 "seren activadas � inicio."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4576,7 +5826,7 @@ msgstr ""
 "Este servicio fornece funcionalidade de servidor NFS, que se configura co\n"
 "ficheiro /etc/exports."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4584,7 +5834,7 @@ 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:47
+#: ../../services.pm_.c:48
 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 "
@@ -4595,7 +5845,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:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4606,7 +5856,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:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4614,7 +5864,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:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4622,7 +5872,7 @@ 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:57
+#: ../../services.pm_.c:58
 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"
@@ -4634,7 +5884,7 @@ msgstr ""
 "outros protocolos m�is complexos de encami�ado prec�sanse para redes m�is\n"
 "complexas."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4642,7 +5892,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:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4650,7 +5900,7 @@ msgstr ""
 "O protocolo rusers permite �s usuarios dunha rede identificar quen\n"
 "est� conectado noutras m�quinas activas."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4659,7 +5909,7 @@ msgstr ""
 "t�dolos usuarios conectados a unha m�quina executando o demo rwho\n"
 "(similar � finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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."
@@ -4668,61 +5918,201 @@ msgstr ""
 "�s diversos ficheiros de rexistro do sistema.  � unha boa idea executar\n"
 "sempre o syslog."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr ""
 "Este script de inicializaci�n tenta carga-los m�dulos para o seu rato usb."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "Executa e para o Servidor de Fontes X no arrinque e � apagar."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Escolle-los servicios a lanzar � arrinca-lo sistema"
 
-# 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
-#
-# '\255' is '�' (inversed !) in cp437 encoding
-# '\242' is '�' (oacute) in cp437 encoding
-#
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"�Benvido a SILO, o selector de sistema operativo!\n"
-"\n"
-"Para mira-las posibles selecci�ns, prema <TAB>.\n"
-"\n"
-"Para arrincar unha delas, teclee o seu nome e prema <ENTER>\n"
-"ou espere %d segundos para que arrinque o sistema por omisi�n.\n"
+"Non podo le-la s�a t�boa de partici�ns, est� demasiado deteriorada :-(\n"
+"Probarase a ir po�endo en branco as partici�ns malas"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Configuraci�n de LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Creaci�n dun disquete de arrinque"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Formatar disquete"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Escolla"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "Fallou a instalaci�n de LILO. Ocorreu o erro seguinte:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "T�boa"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Configurar as X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "T�boa"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+#, fuzzy
+msgid "Internet Connection Sharing"
+msgstr "Conexi�n da Impresora"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Nome do dominio"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "lendo a configuraci�n"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Configurando o IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "�Noraboa!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4785,23 +6175,36 @@ msgstr "Establecendo o nivel de seguridade"
 msgid "Choose the tool you want to use"
 msgstr "Elixa a utilidade que quere usar"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "�Cal � o seu tipo de teclado?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Troca-la resoluci�n"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "�Cal � o tipo do seu rato?"
+#: ../../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 ""
+"�Cambie o seu Cd-Rom!\n"
+"\n"
+"Por favor, insira o Cd-Rom etiquetado \"%s\" na s�a unidade e prema Aceptar "
+"cando estea.\n"
+"Se non o ten, prema Cancelar para omitir a instalaci�n deste Cd-Rom."
+
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "non se atopou ning�n serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "�Emula-lo terceiro bot�n?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "�A qu� porto serie est� conectado o rato?"
 
@@ -5013,3 +6416,893 @@ msgstr "Buscando as p�las"
 #: ../../standalone/rpmdrake_.c:360
 msgid "Finding leaves takes some time"
 msgstr "A busca das p�las leva un tempo"
+
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Internet"
+
+msgid "Internet"
+msgstr "Internet"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Office"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multimedia"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multimedia"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Documentaci�n"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Escolla o tama�o que quere instalar"
+
+#~ msgid "Total size: "
+#~ msgstr "Tama�o total: "
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "Reconfigura-la rede agora"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Nome da conexi�n"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Nome da conexi�n"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Nome da conexi�n"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Nome da conexi�n"
+
+#, fuzzy
+#~ msgid "Germany"
+#~ msgstr "Alem�n"
+
+#, fuzzy
+#~ msgid "Germany (1TR6)"
+#~ msgstr "Alem�n"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "�Qu� desexa facer?"
+
+#, fuzzy
+#~ msgid "Install/Rescue"
+#~ msgstr "Instalar"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "Redimensionar"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "�Qu� tipo de partici�n desexa?"
+
+#, 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Elixa \"Instalaci�n\" se non hai ningunha versi�n de Linux anterior,\n"
+#~ "ou se desexa instalar m�is dunha distribuci�n ou versi�n.\n"
+#~ "\n"
+#~ "Elixa \"Actualizaci�n\" se desexa actualizar a partir dunha versi�n\n"
+#~ "anterior de Linux Mandrake:\n"
+#~ "%s ou %s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Elixa:\n"
+#~ "\n"
+#~ "  - Autom�tica: Se nunca instalou Linux antes, escolla esta. NOTA:\n"
+#~ "    a rede non se configurar� durante a instalaci�n, utilice \"LinuxConf\"\n"
+#~ "    para configurala cando a instalaci�n estea completa.\n"
+#~ "\n"
+#~ "  - Personalizada: Se xa est� familiarizado con GNU/Linux, pode ent�n "
+#~ "escoller\n"
+#~ "    o uso primario da s�a m�quina. Mire abaixo para os detalles.\n"
+#~ "\n"
+#~ "  - Experto: Isto sup�n que vostede se manexa con GNU/Linux e quere facer\n"
+#~ "    unha instalaci�n altamente personalizada. Do mesmo xeito que coa\n"
+#~ "    clase de instalaci�n \"Personalizada\", poder� escolle-lo uso do seu\n"
+#~ "    sistema. Pero, por favor, �NON ESCOLLA ISTO A MENOS QUE SAIBA O QUE\n"
+#~ "    EST� A FACER!\n"
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "Neste punto, vostede pode escolle-la(s) partici�n(s) que desexa usar para\n"
+#~ "instala-lo seu sistema Linux-Mandrake, se xa foron definidas (por unha\n"
+#~ "instalaci�n anterior de Linux ou por outra utilidade de particionamento).\n"
+#~ "Noutros casos, deberanse defini-las partici�ns do disco duro. Esta "
+#~ "operaci�n\n"
+#~ "consiste en dividir l�xicamente a capacidade do disco duro en �reas "
+#~ "separadas\n"
+#~ "para o seu uso.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se ten que crear novas partici�ns, use \"Asignaci�n autom�tica\" para crear\n"
+#~ "autom�ticamente as partici�ns para Linux. Pode escolle-lo disco que quere\n"
+#~ "particionar premendo en \"hda\" para a primeira unidade IDE, \"hdb\" para\n"
+#~ "a segunda, ou \"sda\" para a primeira unidade SCSI, e as� o resto.\n"
+#~ "\n"
+#~ "\n"
+#~ "D�as partici�ns habituais son: a partici�n ra�z (/), que � o punto inicial\n"
+#~ "da xerarqu�a de directorios do sistema de ficheiros, e /boot, que cont�n\n"
+#~ "t�dolos ficheiros necesarios para principa-lo sistema operativo cando se\n"
+#~ "acende o ordenador.\n"
+#~ "\n"
+#~ "\n"
+#~ "Xa que os efectos deste proceso son normalmente irreversibles, facer\n"
+#~ "partici�ns pode intimidar e po�er nervioso a un usuario non experimentado.\n"
+#~ "A utilidade DiskDrake simplifica o proceso para que o usuario non te�a que\n"
+#~ "selo. Consulte a documentaci�n e t�mese o seu tempo antes de continuar.\n"
+#~ "\n"
+#~ "\n"
+#~ "Pode usar calquera opci�n co teclado: percorra as partici�ns usando Tab e\n"
+#~ "as frechas Arriba/Abaixo. Se unha partici�n est� seleccionada, pode usar:\n"
+#~ "\n"
+#~ "- Ctrl-c  para crear unha nova partici�n (cando a escollida est� baleira)\n"
+#~ "\n"
+#~ "- Ctrl-d  para borrar unha partici�n\n"
+#~ "\n"
+#~ "- Ctrl-m  para establece-lo punto de montaxe\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."
+#~ msgstr ""
+#~ "As partici�ns rec�n creadas deben ser formatadas para que o sistema\n"
+#~ "poda usalas (formatar significa crear un sistema de ficheiros). Agora\n"
+#~ "tam�n pode formatar partici�ns creadas anteriormente e en uso, se desexa\n"
+#~ "borrar t�dolos datos que conten. Nota: non � necesario formatar as\n"
+#~ "partici�ns que xa existen, en particular se desexa conserva-los datos\n"
+#~ "que conten. T�picamente mant��ense /home e /usr/local."
+
+#~ 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."
+#~ msgstr ""
+#~ "Os paquetes escollidos est�n agora a seren instalados. Esta\n"
+#~ "operaci�n deber�a levar alg�ns minutos, ag�s que vostede escollese\n"
+#~ "actualizar un sistema que xa existe, neste caso pode que lle leve\n"
+#~ "m�is tempo incluso antes de que a actualizaci�n comece."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Se DrakX non puido atopa-lo seu rato, ou se vostede quere\n"
+#~ "comprobar qu� � o que fixo, presentar�selle a lista de ratos\n"
+#~ "enriba.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se vostede est� de acordo cos par�metros do DrakX, vaia �\n"
+#~ "seguinte secci�n que queira, premendo no men� da esquerda. Noutro\n"
+#~ "caso, escolla no men� un tipo de rato que vostede pense que � o\n"
+#~ "mellor para o seu.\n"
+#~ "\n"
+#~ "\n"
+#~ "No caso dun rato de porto serie, ter� que lle dicir � DrakX o\n"
+#~ "porto serie � que est� conectado."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "Esta secci�n ad�case a configurar unha rede de �rea local (LAN)\n"
+#~ "ou un m�dem.\n"
+#~ "\n"
+#~ "Escolla \"Rede local\" e DrakX tentar� atopar un adaptador Ethernet\n"
+#~ "na s�a m�quina. Os adaptadores PCI deber�an ser atopados e inicializados\n"
+#~ "autom�ticamente. Nembargantes, se o seu perif�rico � ISA, a\n"
+#~ "autodetecci�n non funcionar�, e ter� que escoller un controlador\n"
+#~ "da lista que aparecer� ent�n.\n"
+#~ "\n"
+#~ "\n"
+#~ "Do mesmo xeito que para os adaptadores SCSI, vostede pode deixar que o\n"
+#~ "controlador analice o adaptador de primeiras, ou sen�n vostede ter� que\n"
+#~ "indica-las opci�ns � controlador que vostede ter� que obter da\n"
+#~ "documentaci�n do seu aparato.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se instala un sistema Linux-Mandrake nunha m�quina que � parte dunha\n"
+#~ "rede que xa existe, o administrador da rede xa lle dar�a toda a\n"
+#~ "informaci�n necesaria (direcci�n IP, subm�scara ou simplemente m�scara\n"
+#~ "de rede, e o nome da m�quina). Se est� activando unha rede privada na\n"
+#~ "s�a casa, por exemplo, ter� que escolle-las direcci�ns.\n"
+#~ "\n"
+#~ "\n"
+#~ "Escolla \"Chamar cun m�dem\" e configurarase unha conexi�n a Internet\n"
+#~ "cun m�dem. DrakX tentar� atopa-lo seu m�dem, e se non pode, vostede ter�\n"
+#~ "que indica-lo porto serie correcto onde est� conectado o seu m�dem."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "Linux pode utilizar varios tipos de impresoras. Cada un deles\n"
+#~ "necesita unha configuraci�n diferente. Dese conta que o spooler\n"
+#~ "de impresi�n usa 'lp' como o nome por omisi�n da impresora;\n"
+#~ "por tanto ten que ter unha impresora con ese nome; pero pode\n"
+#~ "darlle varios nomes a unha impresora, separados por caracteres '|'.\n"
+#~ "De xeito que se vostede prefere ter un nome m�is significativo, s� ten\n"
+#~ "que po�elo � principio, p.ex: \"Impresora|lp\".\n"
+#~ "A impresora que te�a \"lp\" nos seus nomes ser� a impresora por defecto.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se a s�a impresora est� conectada directamente � seu ordenador,\n"
+#~ "elixa �Impresora local�. Logo ter� que indicar o porto no que est�\n"
+#~ "conectada a s�a impresora, e escolle-lo filtro de impresi�n adecuado.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se desexa acceder a unha impresora situada nunha m�quina Unix remota,\n"
+#~ "elixa �Impresora remota�. Para que poida utilizala non � necesario\n"
+#~ "un nome de usuario ou contrasinal, pero necesitar� sabe-lo nome da\n"
+#~ "fila de impresi�n no servidor de impresi�n remoto.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se desexa acceder a unha impresora SMB (� dicir, a unha impresora conectada\n"
+#~ "a unha m�quina remota con Windows 9x/NT), deber� especifica-lo seu nome\n"
+#~ "SMB (que non � o seu nome TCP/IP), e posiblemente tam�n a s�a direcci�n IP,\n"
+#~ "as� como o nome de usuario, de grupo de traballo e o contrasinal necesarios\n"
+#~ "para acceder � impresora; e, por suposto, o nome da impresora mesma.\n"
+#~ "O mesmo serve para unha impresora Netware, ag�s que non necesita a\n"
+#~ "informaci�n sobre o grupo de traballo."
+
+#, fuzzy
+#~ 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."
+#~ msgstr ""
+#~ "Recom�ndase encarecidamente que responda \"Si\" aqu�. Se vostede instala\n"
+#~ "Microsoft Windows m�is adiante, sobrescribirase o sector de arrinque.\n"
+#~ "A menos que fixese un disquete de arrinque coma se lle suxere, non ser�\n"
+#~ "capaz de voltar a arrincar Linux."
+
+#~ msgid "Forget the changes?"
+#~ msgstr "�Esquece-los trocos?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "Conexi�n da Impresora"
+
+#~ msgid "Host name:"
+#~ msgstr "Nome de m�quina:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "�Cal � o tipo do seu rato?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Resoluci�ns autom�ticas"
+
+#~ 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"
+#~ msgstr ""
+#~ "Para atopa-las resoluci�ns dispo�ibles vanse probar varias.\n"
+#~ "A s�a pantalla vai palpebrexar...\n"
+#~ "Pode apagala se o desexa, escoitar� un pitido cando estea rematado"
+
+#~ 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?"
+#~ msgstr ""
+#~ "Podo tratar de atopa-las resoluci�ns dispo�ibles (ex. 800x600).\n"
+#~ "Non obstante, isto pode ocasionar que a m�quina se bloquee.\n"
+#~ "�Desexa intentalo?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Ning�n modo v�lido atopado\n"
+#~ "Intente con outra tarxeta de video ou monitor"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "B�squeda autom�tica de resoluci�ns"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Rato Applet ADB"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Rato Apple ADB (2 Bot�ns)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Rato Apple ADB (3 ou m�is bot�ns)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Rato Apple USB"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Rato Apple USB (2 Bot�ns)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Rato Apple USB (3 ou m�is bot�ns)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Rato xen�rico"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "Rato Bus ATI"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Rato Bus Microsoft"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Rato Bus Logitech"
+
+#~ msgid "USB Mouse"
+#~ msgstr "Rato USB"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "Rato USB (3 ou m�is bot�ns)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft rev 2.1A ou superior (serie)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (serie)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (serie)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (serie)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Rato xen�rico (serie)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Compatible Microsoft (serie)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Rato de 3 bot�ns xen�rico (serie)"
+
+#, fuzzy
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "montaxe de nfs fallou"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#, fuzzy
+#~ 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?"
+#~ msgstr ""
+#~ "DrakX xerar� ficheiros de configuraci�n para XFree 3.3 e XFree 4.0.\n"
+#~ "Por defecto �sase o servidor 3.3 porque funciona con m�is tarxetas "
+#~ "gr�ficas.\n"
+#~ "\n"
+#~ "�Quere probar XFree 4.0?"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Criptograf�a"
+
+#, fuzzy
+#~ msgid "Configure LAN"
+#~ msgstr "Configurar as X"
+
+#, fuzzy
+#~ msgid "End configuration"
+#~ msgstr "Configuraci�n"
+
+#, fuzzy
+#~ msgid "Do not set up networking"
+#~ msgstr "Configura-la rede"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "�Quere configurar unha rede local no seu sistema?"
+
+#~ msgid "Show less"
+#~ msgstr "Ver menos"
+
+#~ msgid "Show more"
+#~ msgstr "Ver m�is"
+
+#, fuzzy
+#~ msgid "URI for Local printer"
+#~ msgstr "Impresora local"
+
+#, fuzzy
+#~ msgid "Local Printer Device (URI)"
+#~ msgstr "Dispositivo de impresi�n local"
+
+#, fuzzy
+#~ msgid ""
+#~ "What URI device is your printer connected to\n"
+#~ "(note that parallel:/dev/lp0 is equivalent to LPT1:)?"
+#~ msgstr ""
+#~ "�A que dispositivo est� conectada a sua impresora?\n"
+#~ "(te�a en conta que /dev/lp0 � equivalente al LPT1:)\n"
+
+#~ msgid "curly"
+#~ msgstr "crecho"
+
+#~ msgid "default"
+#~ msgstr "por omisi�n"
+
+#~ msgid "tie"
+#~ msgstr "gravata"
+
+#~ msgid "brunette"
+#~ msgstr "morena"
+
+#~ msgid "girl"
+#~ msgstr "rapaza"
+
+#~ msgid "woman-blond"
+#~ msgstr "loira"
+
+#~ msgid "automagic"
+#~ msgstr "autom�xico"
+
+#, fuzzy
+#~ msgid "Network:"
+#~ msgstr "M�scara de rede:"
+
+#, fuzzy
+#~ msgid "Everything configured!"
+#~ msgstr "lendo a configuraci�n"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "�Cal � o seu tipo de teclado?"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#, fuzzy
+#~ msgid "Configure my card"
+#~ msgstr "Configurar as X"
+
+#, fuzzy
+#~ msgid "pptp alcatel"
+#~ msgstr "Asignaci�n autom�tica"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "�Desexa que se atopen tarxetas PCMCIA?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "�Desexa que se tenten atopar dispositivos %s?"
+
+#, fuzzy
+#~ msgid "Small(%dMB)"
+#~ msgstr "(%d MB)"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "Configuraci�n do M�dem"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "�Quere configurar unha conexi�n con m�dem para o seu sistema?"
+
+#, fuzzy
+#~ msgid "Do you want to configure a ISDN connection for your system?"
+#~ msgstr "�Quere configurar unha rede local no seu sistema?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "�Desexa que se tenten atopar dispositivos PCI?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "Buscando a partici�n ra�z."
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s : Esta non � unha partici�n ra�z, elixa outra por favor."
+
+#~ msgid "No root partition found"
+#~ msgstr "Non se atopou ningunha partici�n ra�z"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "Non se pode usar broadcast sen un dominio NIS"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "Escolla a partici�n para usar como partici�n ra�z."
+
+#, fuzzy
+#~ msgid "Autologin at startup"
+#~ msgstr "Lanzar X11 � arrincar"
+
+#, fuzzy
+#~ msgid "Autologin - Choose default user"
+#~ msgstr "Escoller o tama�o novo"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "�Non ten espacio dabondo para Lnx4win!"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "Autom�tica"
+
+# 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
+#
+# '\255' is '�' (inversed !) in cp437 encoding
+# '\242' is '�' (oacute) in cp437 encoding
+# '�'    is the '�' (ntilde) in cp437 encoding.
+# '\240' is '�' (aacute) in cp437 encoding
+#
+#~ 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 ""
+#~ "�Benvido a LILO, o selector de sistema operativo!\n"
+#~ "\n"
+#~ "Para mira-las posibles selecci�ns, prema <TAB>.\n"
+#~ "\n"
+#~ "Para arrincar un deles, teclee o seu nome e prema <ENTER>\n"
+#~ "ou espere %d segundos para que arrinque o sistema por omisi�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
+#
+#~ 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 ""
+#~ "Benvido a SILO, o selector de sistema operativo!\n"
+#~ "\n"
+#~ "Para mira-las posibles selecci�ns, prema <TAB>.\n"
+#~ "\n"
+#~ "Para arrincar unha delas, teclee o seu nome e prema <ENTER>\n"
+#~ "ou espere %d segundos para que arrinque o sistema por omision.\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "Opci�ns principais de SILO"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "Aqu� est�n as seguintes entradas no SILO.\n"
+#~ "Pode engadir algunhas m�is ou cambia-las que xa existen."
+
+#~ msgid "This label is already in use"
+#~ msgstr "Esta etiqueta xa se est� a usar"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "Fallou a instalaci�n de SILO. Ocorreu o seguinte erro:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX tentar� primeiro atopa-lo(s) adaptador(es) SCSI en bus PCI.\n"
+#~ "Se o(s) atopa e sabe que controlador(es) usar, o(s) aplicar�\n"
+#~ "automaticamente.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se o seu adaptador SCSI � ISA, ou se � PCI pero DrakX non sabe\n"
+#~ "que controlador usar para esa tarxeta, ou se non ten adaptadores SCSI,\n"
+#~ "preguntar�selle se ten alg�n ou non. Se non ten ning�n responda �Non�.\n"
+#~ "Se ten un ou varios responda �Si�. Aparecer� ent�n unha lista de\n"
+#~ "controladores, dos que ten que seleccionar un.\n"
+#~ "\n"
+#~ "\n"
+#~ "Unha vez que seleccione o controlador, DrakX preguntaralle se quere\n"
+#~ "especificar alg�n par�metro. Primeiro, probe e deixe que o controlador\n"
+#~ "analice o hardware: normalmente funciona ben.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se non, non esqueza a informaci�n que pode obter da s�a documentaci�n\n"
+#~ "ou a partir de Windows (se o ten instalado no seu sitema), coma se\n"
+#~ "suxire na gu�a de instalaci�n. Eses son os par�metros que ter� que\n"
+#~ "lle dar � controlador."
+
+#~ msgid "Shutting down"
+#~ msgstr "Apagando"
diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po
index 720df5094..ec0f5532a 100644
--- a/perl-install/share/po/hr.po
+++ b/perl-install/share/po/hr.po
@@ -1,56 +1,107 @@
 # KTranslator Generated File
-# KTranslator Generated File
 # Copyright (c) 1999 MandrakeSoft
 # Vladimir Vuksan <vuksan@veus.hr>, 1999.
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
-"PO-Revision-Date: Mon May 15 2000 16:41:41+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
+"PO-Revision-Date: Tue Aug 29 2000 12:52:56+0200\n"
 "Last-Translator: Vladimir Vuksan <vuksan@veus.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KTranslator v 0.5.0\n"
+"X-Generator: KTranslator v 0.6.0\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Grafi�ka kartica"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Odaberite grafi�ku karticu"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Odaberite X poslu�itelj"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X poslu�itelj"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Kakvu vrstu zapisa �elite dodati"
+
+#: ../../Xconfigurator.pm_.c:232
+#, fuzzy, 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 ""
+"Va�a video kartica mo�e imati 3D ubrzanje samo sa XFree 3.3.\n"
+"Da li stoga �elite koristiti XFree 3.3 umjesto XFree 4.0?"
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, fuzzy, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "Da li �elite podr�ku za hardverske 3D ubrziva�e?"
+
+#: ../../Xconfigurator.pm_.c:245
+#, fuzzy, 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 ""
+"Va�a video kartica mo�e imati 3D ubrzanje samo sa XFree 3.3.\n"
+"Da li stoga �elite koristiti XFree 3.3 umjesto XFree 4.0?"
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+#, fuzzy
+msgid "XFree configuration"
+msgstr "Postava nakon instalacije"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Odaberite koli�inu memorije na grafi�koj kartici"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Postavke poslu�itelja"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Odaberite monitor"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -64,39 +115,40 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Niste podesili monitor"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Niste podesili grafi�ku karticu"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Niste podesili rezoluciju"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Da li �elite isku�ati postavu ?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+#, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Upozorenje: opasno je isku�avati rezolucije na ovoj grafi�koj kartici"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Isku�aj postavu"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -104,185 +156,168 @@ msgstr ""
 "\n"
 "provjerite parametre koje ste unjeli"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Pojavila se gre�ka:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Zatvaram nakon %d sekundi"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "Da li je ovo ispravno?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Pojavila se gre�ka, provjerite parametre koje ste unjeli"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Automatski odabir rezolucije"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Kako bih prona�ao dostupne rezolucije moram poku�ati par razli�itih.\n"
-"Monitor �e tokom pretrage treptati...\n"
-"Ukoliko �elite slobodno isklju�ite monitor. Nakon �to je sve gotovo �uti �e "
-"te pip."
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Rezolucija"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Odaberite rezoluciju  i color depth"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafi�ka kartica: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 poslu�itelj: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Poka�i sve"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Rezolucije"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Mogu poku�ati prona�i dostupnu rezoluciju (npr. 800x600).\n"
-"Me�utim ponekad takva pretraga mo�e zamrznuti ra�unalo.\n"
-"Da li ste sigurni da �elite nastaviti?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Niti jedan valjan mode nije na�en\n"
-"Probajte sa drugom grafi�kom karticom ili monitorom"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Raspored tipkovnice: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Vrsta mi�a: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Ure�aj mi�a: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HorizSync: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertRefresh: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafi�ka kartica: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Grafi�ka memorija: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Monitor VertRefresh: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Rezolucije"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 poslu�itelj: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 poslu�itelj: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Pripremam X-Window postavu"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Promijeni monitor"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Promijeni grafi�ku karticu"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Promijeni postavke poslu�itelja"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Promijeni rezoluciju"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Automatski tra�i rezoluciju"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Prika�i informacije"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Isku�aj ponovo"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Zavr�i"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "�to �elite napraviti?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Odbaci promjene?"
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Zadr�i postoje�u IP postavu"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, 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:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Molim prvo se odjavite te pritisnite Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X kod pokretanja sustava"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -290,228 +325,225 @@ msgstr ""
 "Mogu podesiti da se X podigne automatski kod podizanja sustava.\n"
 "Da li �elite da se X automatski pokre�e?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Auto-prijava"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+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 ?"
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Izaberite uobi�ajenog korisnika:"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Izaberite alat koje �elite koristiti"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 boja (8 bita)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tisu�a boja (15 bita)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tisu�a boja (16 bita)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 milijuna boja (24 bita)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 milijarde boja (32 bita)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB ili vi�e"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standardni VGA, 640x480 na 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 na 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 kompatibilan, 1024x768 na 87 Hz interlaced (bez 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 na 87 Hz interlaced, 800x600 na 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "Non-Interlaced SVGA, 1024x768 na 60 Hz, 800x600 na 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Visoko frekvencijski SVGA, 1024x768 na 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frekvencijski - ide do 1280x1024 na 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frekvencijski - ide do 1280x1024 na 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frekvencijski - ide do 1280x1024 na 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor ide do 1600x1200 na 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor ide do 1600x1200 na 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "curly"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "uobi�ajeno"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "tie"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "crnka"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "djevojka"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "plavu�a"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "automagijski"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Prvi sektor boot particije"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Prvi sektor pogona (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "LILO/grub instalacija"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "SILO instalacija"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Gdje �elite instalirati bootloader?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub instalacija"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Niti jedan"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Koji bootloader(e) �elite koristiti?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Bootloader instalacija"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Boot ure�aj"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (ne radi na starim BIOSima)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Zbijeno"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "zbijeno"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Odgoda prije bootiranja uobi�ajenog imagea"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr ""
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Odgoda prije bootiranja uobi�ajenog imagea"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Lozinka(provjera)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Ograni�ene opcije na komandnoj liniji"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "ograni�i"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Glavne postavke bootloadera"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Molim poku�ajte ponovo"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -519,167 +551,346 @@ msgstr ""
 "Ovo su trenutni zapisi.\n"
 "Mo�ete dodati jo� koji ili urediti postoje�i."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Gotov"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Kakvu vrstu zapisa �elite dodati"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Drugi OS (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Drugi OS (Windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Kakvu vrstu zapisa �elite dodati"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Image"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Dodaj na kraj"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Read-write"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Tablica"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Nesigurno"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Oznaka"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Uobi�ajeno"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "U redu"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Ukloni zapis"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Prazna oznaka nije dozvoljena"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Ova oznaka ve� postoji"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Prona�ao sam %s %s interfacea"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Da li imate jo� koji?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Da li imate %s interface?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Ne"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Da"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Instaliram upravlja�ki program %s za karticu %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(modul %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Koji %s upravlja�ki program �elite isporbati?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Auto. ispitaj"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Odredi postavke"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Sada mo�ete unijeti postavke za modul %s."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"Sada mo�ete unijeti postavke za modul %s.\n"
+"Postavke su formata ``ime=vrijednost ime2=vrijednost2...''.\n"
+"Na primjer, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Postavke modula:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"U�itavanje modula %s nije uspjelo.\n"
+"Da li �elite poku�ati ponovo sa drugim parametrima?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Dobrodosli u %s izbornik operativnih sustava!\n"
+"\n"
+"Za popis dostupnih sustava pritisnite <TAB>.\n"
+"\n"
+"Ako zelite ucitati neki od operativnih sustava upisite njegovo ime\n"
+"i pritisnite <ENTER> oili pricekajte %d sekundi za podrazumijevani\n"
+"operativni sustav.\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
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Dobrodosli u GRUB izbornik operativnih sustava."
+
+#: ../../bootloader.pm_.c:597
+#, 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."
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Pritisnite ENTER za bootiranje izabranog OS, 'e' za promjenu"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "naredbe prije bootiranja ili 'c' za komandnu liniju"
+
+#: ../../bootloader.pm_.c:600
+#, 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:604
+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
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Radna povr�ina"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr ""
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "Zatvaram nakon %d sekundi"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Napravi"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Demontiraj"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Obri�i"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Formatiraj"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Promijeni veli�inu"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "To�ka montiranja"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Zapi�i u /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Normalno > Ekspert"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Ekspert > Normalno"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Vrati postavke iz datoteke"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Spremi u datoteku"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Vrati postavke sa diskete"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Spremi na disketu"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "O�isti sve"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Formatiraj sve"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Raspodijeli automatski"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Sve primarne particije su iskori�tene"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Ne mogu dodati niti jednu dodatnu particiju"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -688,59 +899,63 @@ msgstr ""
 "bi\n"
 "mogli stvoriti jednu extended particiju."
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Vrati particijsku tabelu"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Vrati"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Zapi�i particijsku tabelu"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Ponovo u�itaj"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Prazno"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
-msgstr ""
+msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Ostali"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap (zamjenska memorija)"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Prazno"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Ostali"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Vrste datote�nih sustava:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Detalji"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -752,94 +967,97 @@ msgstr ""
 "Preporu�am da promijenite veli�inu particije\n"
 "(kliknite prvo na particiju te onda na \"Promijeni veli�inu\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Prvo napravite backup podataka"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Pro�itajte pa�ljivo!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 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:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Budite oprezni ova operacija je opasna"
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Gre�ka"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Mjesto montiranja:"
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Ure�aj:"
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS drive slovo: %s (naga�anje)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Vrsta: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Po�etak: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Veli�ina: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektora"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Cilindar %d do cilindra %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Formatiran\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Nije formatiran\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Montiran\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Loopback datoteka(e): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -847,79 +1065,79 @@ msgstr ""
 "Podrazumijevana boot particija\n"
 "  (za MS-DOS boot, ne za LILO)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Chunk veli�ina %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-diskovi %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Ime loopback datoteke: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Molim kliknite na particiju"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Veli�ina: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometry: %s cilindara, %s glava, %s sektora\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Vrsta particijske tabele: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "na sabirnici %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Montiraj"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Dodaj RAID-u"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Ukloni sa RAID-a"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Promijeni RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Koristi za loopback"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Izaberite akciju"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -931,7 +1149,7 @@ msgstr ""
 "Imate dvije opcije ili �e te koristiti LILO pa ne�e raditi ili ne�e te\n"
 "koristiti LILO pa vam /boot ne�e ni trebati."
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -939,23 +1157,23 @@ msgid ""
 "If you plan to use the LILO boot manager, be careful to add a /boot partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Umjesto toga koristi ``%s''"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Prvo pritisnite ``Demontiraj''"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -963,183 +1181,188 @@ msgstr ""
 "Nakon mijenjanja tipa particije %s svi podaci na ovoj particiji biti �e "
 "obrisani"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Da ipak nastavim?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Da zavr�im bez spremanja"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Da zavr�im bez zapisivanje particijske tablice?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Mijenjam tip particije"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Koji tip particije �elite?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "Kojoj particiji �elite promijeniti veli�inu?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr ""
+msgstr "ReiserFS se ne mo�e koristiti na particijama koje su manje od 32 MB"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Gdje �elite montirati loopback datoteku %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Gdje �elite montirati ure�aj %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, 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:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Formatiram"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formatiram loopback datoteku %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formatiram particiju %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Poslije formatiranja svih particija,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "svi podaci na ovim particijama biti �e izgubljeni"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Premjesti"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Na koji disk se �elite premjestiti?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Na koji se sektor �elite premjestiti?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Premje�tam"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Premje�tam particiju..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, 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!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 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:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Izra�unavam granice fat datote�nog sustava"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Mijenjam veli�inu"
 
-#
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Kojoj particiji �elite promijeniti veli�inu?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "Preporu�am da prvo backupirate sve podatke s ove particije"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, 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.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Odaberite novu veli�inu"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Stvori novu particiju"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Po�etni sektor:"
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Veli�ina u MB:"
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Vrsta datote�nog sustava:"
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Postavke:"
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Ova particija se ne mo�e koristiti za loopback"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Ime loopback datoteke:"
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr ""
 "Datoteku koristi neki drugi loopback. Molim izaberite neku drugu datoteku"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "Datoteka ve� postoji. Da li da nju upotrijebim?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1147,11 +1370,11 @@ msgstr ""
 "Backup particijske tablice nema istu veli�inu\n"
 "Da ipak nastavim?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1159,79 +1382,79 @@ msgstr ""
 "Umetnite disketu u pogon\n"
 "Svi podaci na disketi biti �e izbrisani"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Poku�avam spasiti particijsku tablicu"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "ure�aj"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "chunk veli�ina"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Izaberite postoje�i RAID na koji �elite dodati "
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "novi"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formatiranje %s nije uspjelo"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, 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:186
-msgid "nfs mount failed"
-msgstr "nfs montiranje nije uspjelo"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "montiranje nije uspjelo:"
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "gre�ka kod demontiranja %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Mjesto montiranja mora po�eti sa /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, 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:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
+msgstr "Kru�no montiranje %s\n"
+
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
 msgstr ""
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:259
 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 "
 "monitranja\n"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Gre�ka prilikom otvaranja %s za pisanje: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1240,75 +1463,82 @@ msgstr ""
 "bih mogao instalirati datote�ni sustav. Provjerite da li je sa va�im "
 "hardverom sve u redu."
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Nemate niti jednu particiju!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "Izaberite preferirani jezik za instalaciju i kori�tenje sustava."
 
-#: ../../help.pm_.c:10
+#: ../../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 ""
 "Izaberite raspored tipkovnice koji se podudara sa va�om na gornjem popisu"
 
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:25
 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"
-"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).\n"
-"\n"
-"\n"
-"Select:\n"
+"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
+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"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\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"
-msgstr ""
-"Izaberite \"Instaliraj\" ukoliko nemate Linux instaliran ili ako\n"
-"�elite imati vi�e razli�itih distribucija ili ina�ica Linux na sustavu.\n"
 "\n"
-"Izaberite \"Nadogradi\" ako �elite nadograditi postoje�u ina�icu Mandrake\n"
-"Linuxa: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus)\n"
-"6.1 (Helios), Gold 2000 or 7.0 (Air).\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* Recommanded: 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"
-"Odaberite:\n"
 "\n"
-"  - Automatski: Ukoliko nikada niste instalirali Linux.\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - Prilago�eno: Ukoliko vam je Linux poznat 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"
-"  - Stru�njak: Ukoliko ste vrlo dobro upoznati sa Linuxom i �elite\n"
-"imati potpunu kontrolu nad instalacijom Linuxa odaberite opciju\n"
-"\"Prilago�eno\".\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1316,16 +1546,17 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Odaberite:\n"
 "\n"
-"  - Prilago�eno: Ukoliko vam je Linux poznat kori�tenjem ove\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"
@@ -1336,230 +1567,528 @@ msgstr ""
 "\n"
 "  - Stru�njak: Ukoliko ste vrlo dobro upoznati sa Linuxom i �elite\n"
 "imati potpunu kontrolu nad instalacijom Linuxa odaberite opciju\n"
-"\"Prilago�eno\".\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."
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:108
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"\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"
-"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"
+"\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"
-"You can reach any option using the keyboard: navigate through the "
+"\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 ""
+
+#: ../../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"
-"using Tab and Up/Down arrows. When a partition is selected, you can use:\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"
+"\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"
+msgstr ""
+
+#: ../../help.pm_.c:218
+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 ""
+
+#: ../../help.pm_.c:252
+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:257
+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 ""
+
+#: ../../help.pm_.c:267
+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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
 "\n"
-"- Ctrl-d  to delete a partition\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"
-"- Ctrl-m  to set the mount point\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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
+
+#: ../../help.pm_.c:303
 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."
+"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 ""
-"Sve novo definirane particije moraju biti formatirane za\n"
-"uporabu tj. moraju imati ispravni datote�ni sustav. Tako�er ukoliko\n"
-"�elite obrisati podatke s odre�ene particije odaberite reformatiranje.\n"
-"Opaska: nije potrebno reformatirati postoje�e particije osobito\n"
-"ako sadr�e datoteke ili podatke koje �elite sa�uvati.\n"
-"Na primjer obi�no /home i /usr/local sadr�e podatke koje treba sa�uvati."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:358
+#, fuzzy
 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."
+"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 ""
-"Po�ela je instalacija paketa koje ste odabrali. Ova\n"
-"operacija �e potrajati par minuta osim ako ste odabrali\n"
-"nadogradnju postoje�eg sustava. U tom slu�aju instalacija\n"
-"�e izvr�iti odre�ene provjere prije same nadogradnje."
+"Ako imate sve dolje navedene CDove kliknite U redu.\n"
+"Ako nemate niti jedan od dolje navedenih CD kliknite Odustani.\n"
+"Ako imate samo neke od dolje navedenih CDa odzna�ite one koje nemate i "
+"kliknite U redu."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:363
 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"
+"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"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"Please be patient."
+msgstr ""
+
+#: ../../help.pm_.c:371
+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:176
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
 "Molim odaberite ispravni port. Npr. COM1 port u Windows-ima\n"
 "je ttyS0 u Linuxima, COM2 ttyS1 itd."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
+"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"
-"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"
-"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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"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:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"Sada mo�ete podesiti dial-up postavke. Ako niste sigurni �to treba\n"
+"unijeti, raspitajte se kod svog ISP-a."
+
+#: ../../help.pm_.c:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
-"Unesite::\n"
+"Unesite:\n"
 "\n"
-"  - IP adresu: ukoliko ne znate adresu pitajte svojeg mre�nog "
-"administratora\n"
-"ili ISP-a.\n"
+"  - IP adresu: ukoliko ne znate adresu pitajte svojeg mre�nog administratora "
+"ili  ISP-a.\n"
 "\n"
 "\n"
 "  - Mre�na maska: Obi�no je maska \"255.255.255.0\". Ako niste sigurni \n"
@@ -1571,7 +2100,22 @@ msgstr ""
 "sigurni\n"
 "raspitajte se kod mre�nog administratora ili ISP-a.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"Ukoliko va�a mre�a koristi NIS odaberite \"Koristi NIS\". Ako niste sigurni\n"
+"raspitajte se kod svog mre�nog administratora."
+
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1579,7 +2123,7 @@ msgstr ""
 "Sada mo�ete podesiti dial-up postavke. Ako niste sigurni �to treba\n"
 "unijeti, raspitajte se kod svog ISP-a."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1587,13 +2131,15 @@ 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:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1605,81 +2151,198 @@ msgstr ""
 "Opaska: Morate odabrati mirror i kriptografske pakete ovisno\n"
 "o zakonima zemlje u kojoj se nalazite."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "Sada mo�ete odabrati vremensku zonu u kojoj �ivite.\n"
 "\n"
 "\n"
-"Linux koristi GMT (Greenwich Mean Time) koje onda prera�unava\n"
+"Linux koristi GMT (Srednje vrijeme po Greenwichu) koje onda prera�unava\n"
 "u vrijeme u va�oj vremenskoj zoni. "
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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:257
+#: ../../help.pm_.c:486
+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:490
+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:505
+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 ""
+
+#: ../../help.pm_.c:521
 msgid ""
-"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"
+"Please turn on your printer before continuing to let DrakX detect it.\n"
 "\n"
+"You have to enter some informations here.\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"
 "\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"
-"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"
 "\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"
-"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."
+"\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:286
+#: ../../help.pm_.c:542
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"  \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:302
+#: ../../help.pm_.c:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+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 ""
+
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1688,7 +2351,7 @@ msgstr ""
 "datoteku\" i\n"
 "\"Koristi MD5 lozinke\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1696,7 +2359,7 @@ 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:310
+#: ../../help.pm_.c:611
 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"
@@ -1720,18 +2383,17 @@ msgid ""
 "and maintenance purposes."
 msgstr ""
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
@@ -1744,16 +2406,18 @@ msgstr ""
 "Ako ne znate �to odabrati odaberite \"Prvi sektor \n"
 "diska (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 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:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1764,7 +2428,7 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1781,14 +2445,45 @@ msgid ""
 "\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."
 msgstr ""
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 ""
+
+#: ../../help.pm_.c:692
+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 ""
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -1800,7 +2495,7 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -1808,7 +2503,7 @@ msgstr ""
 "Ukoliko je X pogre�no pode�en kori�tenjem ovih opcija mo�ete\n"
 "ispravno podesiti X Window sustav."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -1816,45 +2511,49 @@ msgstr ""
 "Ukoliko preferirate grafi�ku prijavu odaberite \"Da\". U protivnom, "
 "odaberite \"Ne\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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."
 msgstr ""
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -1869,183 +2568,131 @@ msgstr ""
 "pro�itajte\n"
 "dodatne upute."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Odaberite jezik"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Odaberite razred instalacije"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Otkrivanje hard diskova"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Podesi mi�"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Odaberite tipkovnicu"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Razno"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Podesi datote�ne sustave"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Formatiraj particije"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Izabir instaliranih paketa"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Instaliraj sustav"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Podesi mre�u"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Kriptografski"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Podesi vremensku zonu"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Pode�avanje servisa"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Podesi pisa�"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Pode�avanje root lozinke"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Dodaj korisnika"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Napravi boot disketu"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Instaliraj bootloader"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Podesi X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr ""
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
-msgstr "Iza�i iz instalacije"
-
-#: ../../install2.pm_.c:337
-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 ""
-"Morate imati root particiju.\n"
-"Prvo napravite particiju (ili kliknite na postoje�u) te\n"
-"odaberite akciju ``Mjesto monitranja'' te odaberite `/'"
+msgstr "Izlaz iz instalacije"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Gre�ka prilikom �itanja datoteke $f"
 
-#: ../../install_any.pm_.c:351
-msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
-msgstr ""
-"DiskDrake nije uspio pro�itati va�u particijsku tablice.\n"
-"Nastavite o vlastitoj odgovornosti."
+#: ../../install_gtk.pm_.c:426
+#, fuzzy
+msgid "Please test the mouse"
+msgstr "Molim izaberite koju vrstu mi�a koristite."
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Tra�im root particiju."
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Molim izaberite koju vrstu mi�a koristite."
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Informacije"
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
+#: ../../install_interactive.pm_.c:23
 #, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: Ovo nije root particija, molim odaberite drugu."
-
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Niti jedna root particija nije prona�ena"
-
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Ne mogu koristiti broadcast bez NIS domene"
-
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Gre�ka prilikom �itanja datoteke $f"
-
-#: ../../install_steps.pm_.c:75
 msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
+"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
+"You can find some information about them at: %s"
 msgstr ""
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Dupliciraj mjesto monitranja %s"
-
-#: ../../install_steps.pm_.c:323
+#: ../../install_interactive.pm_.c:41
 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"
+"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 ""
+"Morate imati root particiju.\n"
+"Prvo napravite particiju (ili kliknite na postoje�u) te\n"
+"odaberite akciju ``Mjesto monitranja'' te odaberite `/'"
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Dobrodo�li u %s"
-
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Disketni pogon nije dostupan"
-
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
-#, c-format
-msgid "Entering step `%s'\n"
-msgstr "Pokre�em korak `%s'\n"
-
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
+#: ../../install_interactive.pm_.c:46
 msgid "You must have a swap partition"
 msgstr "Morate imati swap particiju"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:47
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -2055,98 +2702,75 @@ msgstr ""
 "\n"
 "Da ipak nastavim?"
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Izaberite veli�inu koji �elite instalirati"
+#: ../../install_interactive.pm_.c:68
+#, fuzzy
+msgid "Use free space"
+msgstr "Koristi za loopback"
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Ukupna veli�ina:"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Ina�ica: %s\n"
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "Koristi postoje�e particije"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "Veli�ina: %d KB\n"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "Nema postoje�ih particija koje bih mogao upotrijebiti"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Odaberite pakete koje �elite instalirati"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Koristi Windows particiju za loopback"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Koju particiju �elite smjestiti Linux4Win?"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Instaliraj"
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Odaberite veli�inu"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Instaliram"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Veli�ina korijenske particije u MB: "
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Molim pri�ekajte,"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Veli�ina swap particiju u MB: "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Preostalo vrijeme"
+#: ../../install_interactive.pm_.c:102
+#, fuzzy
+msgid "Use the free space on the Windows partition"
+msgstr "Iskoristi slobodan prostor na FAT particiji"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Ukupno vrijeme"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Kojoj particiji �elite promijeniti veli�inu?"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Pripremam instalaciju"
+#: ../../install_interactive.pm_.c:107
+#, fuzzy
+msgid "Computing Windows filesystem bounds"
+msgstr "Izra�unavam granice fat datote�nog sustava"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Installing package %s"
-msgstr "Instaliram paket %s"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Da ipak nastavim?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Da koristim postoje�u postavu X11?"
-
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Nemate niti jednu Windows particiju!"
-
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Nemate dovoljno mjesta za Lnx4win"
+#: ../../install_interactive.pm_.c:112
+#, fuzzy
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr "Va�e Windows particija je prefragmentirana, molim defragmentirajte ju."
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_interactive.pm_.c:113
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
 "dangerous. If you have not already done so, you should first exit the\n"
 "installation, run scandisk under Windows (and optionally run defrag), then\n"
 "restart the installation. You should also backup your data.\n"
@@ -2162,33 +2786,146 @@ msgstr ""
 "Windows particije.\n"
 "Kada ste sigurni da �elite nastaviti, pritisnite U redu."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Automatsko mijenjanje veli�ine nije uspjelo"
+#: ../../install_interactive.pm_.c:122
+#, fuzzy
+msgid "Which size do you want to keep for windows on"
+msgstr "Na koji se sektor �elite premjestiti?"
+
+#: ../../install_interactive.pm_.c:123
+#, c-format
+msgid "partition %s"
+msgstr "particija %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Koju particiju �elite smjestiti Linux4Win?"
+#: ../../install_interactive.pm_.c:129
+#, c-format
+msgid "FAT resizing failed: %s"
+msgstr "Mijenjanje FAT veli�ine nije uspjelo: %s"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Odaberite veli�inu"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Veli�ina korijenske particije u MB: "
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Veli�ina swap particiju u MB: "
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Ukloni Windowse(TM)"
+
+#: ../../install_interactive.pm_.c:153
+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:156
+#, fuzzy, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "Svi podaci i postoje�e particije biti �e izgubljeni na disku %s"
+
+#: ../../install_interactive.pm_.c:164
+#, fuzzy
+msgid "Expert mode"
+msgstr "Vanjski modem"
+
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "Koristi diskdrake"
+
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "Koristi fdisk"
+
+#: ../../install_interactive.pm_.c:171
+#, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Sada mo�ete razdijeliti %s.\n"
+"Kada ste gotovi ne zaboravite spremiti postavu sa `w'"
+
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Iskoristi slobodan prostor na FAT particiji"
+
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Ne mogu dodati niti jednu dodatnu particiju"
+
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:218
+#, fuzzy, c-format
+msgid "Partitioning failed: %s"
+msgstr "Vrsta particijske tabele: %s\n"
+
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Podi�em mre�u"
+
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Onemogu�ujem mre�u"
+
+#: ../../install_steps.pm_.c:74
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Dupliciraj mjesto monitranja %s"
+
+#: ../../install_steps.pm_.c:375
+msgid ""
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
+msgstr ""
+
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Dobrodo�li u %s"
+
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Disketni pogon nije dostupan"
+
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Pokre�em korak `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Molim izaberite jedan od slijede�ih razreda instalacije:"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2197,7 +2934,7 @@ msgid ""
 "a percentage of 100%% will install all selected packages."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2207,58 +2944,102 @@ msgid ""
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 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:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Odaberite postotak paketa koje �elite instalirati"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Odaberite pakete koje �elite instalirati"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Instaliraj"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Automatski odabir ovisnosti"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Pro�iri stablo"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Sa�mi stablo"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Lo� paket"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Ime: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Ina�ica: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Veli�ina: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Zna�aj: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Ukupna veli�ina: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+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:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "Slijede�i paketi �e biti deinstalirani"
+
+#: ../../install_steps_gtk.pm_.c:387
+#, fuzzy
+msgid "The following packages are going to be removed"
+msgstr "Slijede�i paketi �e biti instalirani/uklonjeni"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Ne mo�ete ozna�iti/odzna�iti ovaj paket"
+
+#: ../../install_steps_gtk.pm_.c:416
 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:473
+#: ../../install_steps_gtk.pm_.c:418
 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:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2266,46 +3047,89 @@ msgstr ""
 "Ovaj paket treba nadograditi\n"
 "Da li ste sigurni da ga �elite odzna�iti?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 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:493
-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:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Slijede�i paketi �e biti instalirani/uklonjeni"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "Ne mo�ete ozna�iti/odzna�iti ovaj paket"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Instaliram"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Procjenjujem"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Molim pri�ekajte,"
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Preostalo vrijeme"
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Ukupno vrijeme"
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Pripremam instalaciju"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d paketa"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Instaliram paket %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Accept"
+msgstr "Prihvati korisnika"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2315,194 +3139,401 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Promijeni veli�inu"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Da ipak nastavim?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Javila se gre�ka prilikom sortiranja paketa:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Pojavila se gre�ka kod instalacije paketa:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Pojavila se gre�ka"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Molim izaberite jezik koji �elite koristiti."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Tipkovnica"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Molim izaberite raspored tipkovnice."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 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:91
-msgid "Root Partition"
-msgstr "Korijenska particija"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Koja je korijenska particija  (/) va�eg sustava?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Instalacijski razred"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Koji instalacijski razred �elite?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Instaliraj/Nadogradi"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "Instalacija ili nadogradnja?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Automatski"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Prilago�eno"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Ekspert"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Dogradnja"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Normalno"
+#: ../../install_steps_interactive.pm_.c:222
+#, fuzzy
+msgid "Workstation"
+msgstr "Informacije"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Razvojno"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Poslu�itelj"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+#, fuzzy
+msgid "What is your system used for?"
 msgstr "Koja je namjena ovog sustava ?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Molim izaberite koju vrstu mi�a koristite."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Port mi�a"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 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:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Pode�avam PCMCIA kartice..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "Pode�avam IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "nema dostupnih particija"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
 msgstr ""
-"Izaberite particiju koju �elite koristiti kao korijensku particiju (/)."
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Odaberite mjesta montiranja"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake nije uspio pro�itati va�u particijsku tablice.\n"
+"Nastavite o vlastitoj odgovornosti."
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Korijenska particija"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Koja je korijenska particija  (/) va�eg sustava?"
+
+#: ../../install_steps_interactive.pm_.c:352
 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:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Izaberite particije koje �elite formatirati"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Formatiram particije"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Stvaram i formatiram datoteku %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 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:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Tra�im dostupne pakete"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Tra�im pakete koje mogu nadograditi"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, fuzzy, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
+"Ne mo�ete ozna�iti ovaj paket budu�i da nema dovoljno mjesta gdje ga se mo�e "
+"instalirati"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Complete (%dMB)"
+msgstr "Normalno"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Minimum (%dMB)"
+msgstr "(%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Recommended (%dMB)"
+msgstr "Normalno"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "Prilago�eno"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Izaberite veli�inu koji �elite instalirati"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Odabir grupe paketa"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
+#, fuzzy
 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 ""
+"Ako imate sve dolje navedene CDove kliknite U redu.\n"
+"Ako nemate niti jedan od dolje navedenih CD kliknite Odustani.\n"
+"Ako imate samo neke od dolje navedenih CDa odzna�ite one koje nemate i "
+"kliknite U redu."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom naslovljen \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2510,173 +3541,11 @@ msgstr ""
 "Instaliram paket %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Postava nakon instalacije"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Zadr�i postoje�u IP postavu"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Promijeni mre�ne postavke"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Ne pode�avaj mre�u"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Mre�ne postavke"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Lokalna mre�a je ve� pode�ena. Da li �elite:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Da li �elite podesiti mre�ne postavke sustava?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "ne mogu prona�i niti jednu mre�nu karticu"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Postavke modema"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Pode�avam mre�ni ure�aj %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Molim unesite IP postavke za ovaj stroj.\n"
-"Svaka stavka treba biti unesena kao  IP adresa odvojena\n"
-"to�kama (npr. 1.2.3.4)"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Automatski IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP adresa:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Netmask:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP adresa treba biti oblika 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Pode�avam mre�u"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Molim unesite ime ra�unala.\n"
-"Ime ra�unala treba biti puno ime ra�unala,\n"
-"primjerice mojeracunalo.odjel.domena.hr.\n"
-"Tako�er unesite IP adresu gateway ra�unala ako gateway postoji"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS poslu�itelj:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Gateway ure�aj:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Gateway:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Ime ra�unala:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Da poku�am prona�i modem?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Izaberite serijski port na kojemu se nalazi modem."
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Podesi dialup"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Ime veze"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Telef. broj"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Prijavno ime"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Provjera autenti�nosti"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Temeljem skripta"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Terminal-zasnovano"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Ime domene"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Prvi DNS poslu�itelj"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Drugi DNS poslu�itelj"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2715,89 +3584,95 @@ msgid ""
 "USA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Izaberite mirror sa kojeg �elite skinuti pakete"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 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:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Odaberite pakete za instalaciju."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
+#, fuzzy
 msgid "Which is your timezone?"
-msgstr "U kojoj ste vremenskoj zoni?"
+msgstr "Koja je namjena ovog sustava ?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Da li je va� hardverski sat namje�ten na GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "Kojoj particiji �elite promijeniti veli�inu?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Bez lozinke"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Koristi shadow datoteku"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Koristi MD5 lozinke"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Koristi NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "yellow pages"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, 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:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Provjera autenti�nosti NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS domena"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS poslu�itelj"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Prihvati korisnika"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Dodaj korisnika"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(ve� postoji %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -2807,60 +3682,78 @@ msgstr ""
 "Unesite korisnika\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Puno ime"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Korisni�ko ime"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Ljuska"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Lozinka je prejednostavna"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Molim dajte korisniku korisni�ko ime"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 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 `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Ovaj korisnik ve� postoji"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Prvi disketni pogon"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Drugi disketni pogon"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Presko�i"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -2874,184 +3767,147 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "�alim, me�utim disketni pogon nije dostupan"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 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:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Umetnite disketu u pogon %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Stvaram boot disketu"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "Instalacija LILO-a nije uspjela. Prijavljena je slijede�a gre�ska:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Da li �elite koristiti SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "SILO glavne postavke"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Ovo su trenutni zapisi u SILO-u.\n"
-"Mo�ete dodati jo� koji ili urediti postoje�i."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Particija"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Ova oznaka ve� postoji"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "Instalacija SILO-a nije uspjela. Prijavljena je slijede�a gre�ska:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Pripremam bootloader"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
+#, fuzzy
 msgid "Do you want to use aboot?"
-msgstr "Da li �elite koristiti aboot?"
+msgstr "Da li �elite koristiti SILO?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Postavke proxya"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy treba biti http://"
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy treba biti ftp://"
+#: ../../install_steps_interactive.pm_.c:925
+#, fuzzy
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "Instalacija LILO-a nije uspjela. Prijavljena je slijede�a gre�ska:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Dobrodo�li u Crackers"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Slab"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Nizak"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Srednji"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Visok"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoidan"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Razna pitanja"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(mo�e uzrokovati o�te�enje podataka)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Koristi optimizacije hard diska?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Izaberite sigurnosni nivo"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Precizna veli�ina RAM (prona�eno %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Automatsko montiranje uklonjivog (removable) medija"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Uklju�i NumLock kod pokretanja"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Upi�ite veli�inu RAM u Mb"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Ne mo�ete koristiti supermount u najvi�em sigurnosnom nivou"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Da li tra�im PCI ure�aje?"
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Da koristim postoje�u postavu X11?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Umetnite praznu disketu u pogon %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
+#, fuzzy
 msgid "Creating auto install floppy"
-msgstr ""
+msgstr "Napravi boot disketu"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3061,7 +3917,7 @@ msgstr ""
 "\n"
 "�elite li zbilja zavr�iti?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3074,146 +3930,18 @@ msgid ""
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Ga�enje sustava"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Instaliram upravlja�ki program %s za karticu %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(modul %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Koji %s upravlja�ki program �elite isporbati?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Auto. ispitaj"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Odredi postavke"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Sada mo�ete unijeti postavke za modul %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Sada mo�ete unijeti postavke za modul %s.\n"
-"Postavke su formata ``ime=vrijednost ime2=vrijednost2...''.\n"
-"Na primjer, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Postavke modula:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"U�itavanje modula %s nije uspjelo.\n"
-"Da li �elite poku�ati ponovo sa drugim parametrima?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Da li da tra�im PCMCIA kartice?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Pode�avam PCMCIA kartice..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Da li tra�im %s ure�aje?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Prona�ao sam %s %s interfacea"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Da li imate jo� koji?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Da li imate %s interface?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Ne"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Da"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Poka�i info o hardveru"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Podi�em mre�u"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Onemogu�ujem mre�u"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake instalacija %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> izme�u elemenata  | <Space> bira | <F12> slijede�i zaslon"
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Molim pri�ekajte"
 
@@ -3223,7 +3951,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Dvosmislenost (%s), budite precizniji\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Krivi izbor, poku�ajte ponovo\n"
 
@@ -3237,448 +3965,962 @@ msgstr " ? (uobi�ajeno %s) "
 msgid "Your choice? (default %s) "
 msgstr "Va� izbor? (uobi�ajeno %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Va� izbor? (uobi�ajeno %s unesite `none' za nijedan)"
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "�e�ka"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Njema�ka"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "�panjolska"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Finska"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Francuska"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norve�ka"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Poljska"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Ruska"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "UK tipkovnica"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "US tipkovnica"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armenska (stara)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armenska (typewriter)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armenska (fonetska)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "Azerbejd�anska (latinica)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "Azerbejd�anska (�irilica)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belgijska"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bugarska"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazilska (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
-#, fuzzy
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
-msgstr "Bugarska"
+msgstr "Bjeloruska"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "�vicarska (Njema�ki raspored)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "�vicarska (francuski raspored)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
-msgstr ""
+msgstr "Njema�ka (bez mrtvih tipaka)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Danska"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak (USA)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (Norve�ka)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Estonska"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gruzijska  (\"Ruski\" raspored)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gruzijska  (\"Latin\" raspored)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Gr�ka"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Ma�arska"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
-msgstr ""
+msgstr "Hrvatska"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Izraelska"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Izraelska (fonetska)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Iranska"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islandska"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Talijanska"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "Japanska (106 tipaka)"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Latino ameri�ka"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Nizozemska"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lituanska AZERTY (stara)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lituanska AZERTY (nova)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lituanska \"number row\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituanska \"fonetska\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Poljska (qwerty raspored)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Poljska (qwertz raspored)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugalska"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanadska (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Ruska (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "�vedska"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Slovenska"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slova�ka"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Tajlandska tipkovnica"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turska (tradicionalni \"F\" model)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turska (moderna  \"Q\" model)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukrajinska"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "US keyboard (internacionalna)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vijetnamska \"numeric row\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Jugoslavenska (latini�ni raspored)"
 
-# 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
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - mi�"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr ""
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "Ljuska"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "serijski"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Generi�ki mi� s 2 gumba"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Generi�ki mi� s 3 gumba"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mi� (serijski, stari C7 tip)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Nema mi�a"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "niti jedan"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Nema mi�a"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Da li je ovo ispravno?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Postava Interneta"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Da li �elite poku�ati spajanje na Internet ?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Postavke Internet veze"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Ne spajaj se na Internet"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
 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"
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Spoji se na Internet"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "ISDN postavke"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
 msgstr ""
-"Dobrodosli u LILO izbornik operativnih sustava!\n"
+"Izaberite va�eg pru�atelja Internet usluga.\n"
+" Ako nije na popisu odaberite Drugi"
+
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "Postava Interneta"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "Molim ispunite ili provjerite vrijednost doljnjeg polja"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "IRQ kartice"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "Memorija kartice (DMA)"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "IO kartice"
+
+#: ../../netconnect.pm_.c:164
+#, fuzzy
+msgid "Card IO_0"
+msgstr "IO kartice"
+
+#: ../../netconnect.pm_.c:165
+#, fuzzy
+msgid "Card IO_1"
+msgstr "IO kartice"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "Va� telefonski broj"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "Ime ISP pru�atelja npr. provider.hr"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Telef. broj pru�atelja"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "Pru�ateljev DNS 1"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "Pru�ateljev DNS 2"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "Na�in biranja"
+
+#: ../../netconnect.pm_.c:174
+#, fuzzy
+msgid "Account Login (user name)"
+msgstr "Korisni�ko ime"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Lozinka"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Potvrda lozinke"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "Europa"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Europa (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "Isku�aj postavu"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "Ostatak svijeta - bez D-kanala (za iznajmljene linije)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "Koji protokol �elite koristiti ?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "Ne znam"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "Kakvu karticu posjedujete?"
+
+#: ../../netconnect.pm_.c:239
+#, fuzzy
+msgid "Continue"
+msgstr "Da ipak nastavim?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "Prekini"
+
+#: ../../netconnect.pm_.c:245
+msgid ""
 "\n"
-"Za popis dostupnih sustava pritisnite <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"Ako zelite ucitati neki od operativnih sustava upi�ite njegovo ime\n"
-"i pritisnite <ENTER> oili pricekajte %d sekundi za podrazumijevani\n"
-"operativni sustav.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "Kakvu ISDN karticu imate?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "Prona�ao sam ISDN karticu:\n"
+
+#: ../../netconnect.pm_.c:287
+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 ""
+"Prona�ao sam ISDN PCI karticu me�utim ne znam kojeg je tipa. Molim izaberite "
+"va�u PCI karticu na slijede�em ekranu."
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
+#: ../../netconnect.pm_.c:299
+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."
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "Odaberite novu veli�inu"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Izaberite na kojem serijskom portu je mi� priklju�en."
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
 msgstr ""
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
+#: ../../netconnect.pm_.c:352
+msgid ""
+"\n"
+"Do you agree?"
 msgstr ""
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Da li �elite isku�ati postavu ?"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "ISDN postavke"
+
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
 msgstr ""
+"Da li �elite da se sustav ve�e na Internet kod svakog podizanja (boot) "
+"sustava ?"
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Da poku�am prona�i modem?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Izaberite serijski port na kojemu se nalazi modem."
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Podesi dialup"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Ime veze"
+
+#: ../../netconnect.pm_.c:546
+#, fuzzy
+msgid "Phone number"
+msgstr "Telef. broj pru�atelja"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Prijavno ime"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Provjera autenti�nosti"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Temeljem skripta"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Terminal-zasnovano"
+
+#: ../../netconnect.pm_.c:550
+#, fuzzy
+msgid "Domain name"
+msgstr "Ime veze"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Prvi DNS poslu�itelj"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Drugi DNS poslu�itelj"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Spoji se na Internet"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "Postavke Internet veze"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Ne spajaj se na Internet"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
 msgstr ""
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Ne spajaj se na Internet"
+
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Spoji se na Internet"
+
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Prekini vezu na Internet"
+
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Postavke Internet veze"
+
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "Internet veza & postava"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - mi�"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Postavke Internet veze"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB mi�"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Postavke Internet veze"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB mi� (2 gumba)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Interna ISDN kartica"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB mi� (3 gumba i vi�e)"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Vanjski modem"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB mi�"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "Spoji se na Internet"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB mi� (2 gumba)"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "Kakav tip ISDN veze koristite ?"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB mi� (3 gumba i vi�e)"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Postavke Internet veze"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Generi�ki mi� (PS/2)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "Francuska"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "Ostale zemlje"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Generi�ki mi� s 3 gumba (PS/2)"
+#: ../../netconnect.pm_.c:706
+#, fuzzy
+msgid "In which country are you located ?"
+msgstr "U kojoj se dr�avi nalazite ?"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:712
+#, fuzzy
+msgid "Alcatel modem"
+msgstr "Vanjski modem"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "Vanjski modem"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:718
+#, fuzzy
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
+"Ako je va� modem adsl modem od alcatela one izaberite pptp alcatel. Ako "
+"nije, izaberite pppoe."
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Postavke Internet veze"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Koji protokol �elite koristiti ?"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus mi�"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Postavke Internet veze"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus mi�"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "Podesi mre�u"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus mi�"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Mre�ne postavke"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB mi�"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Da li �elite isku�ati postavu ?"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB mi� (3 gumba i vi�e)"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "Podesi mre�u"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Nema mi�a"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Spoji se na Internet"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A ili vi�e (serijski)"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "Lokalna mre�a je ve� pode�ena. Da li �elite:"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (serijski)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "Kako se �elite spojiti na Internet?"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (serijski)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Mre�ne postavke"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (serijski)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (serijski)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "ne mogu prona�i niti jednu mre�nu karticu"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (serijski)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Pode�avam mre�u"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (serijski)"
+#: ../../network.pm_.c:274
+#, fuzzy
+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.\n"
+"Ime ra�unala treba biti puno ime ra�unala,\n"
+"primjerice mojeracunalo.odjel.domena.hr.\n"
+"Tako�er unesite IP adresu gateway ra�unala ako gateway postoji"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (serijski)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+#, fuzzy
+msgid "Host name"
+msgstr "Ime ra�unala:"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mi� (serijski, stari C7 tip)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (serijski)"
+#: ../../network.pm_.c:302
+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 ""
+"Molim unesite IP postavke za ovaj stroj.\n"
+"Svaka stavka treba biti unesena kao  IP adresa odvojena\n"
+"to�kama (npr. 1.2.3.4)"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Generi�ki Mi� (serijski)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Pode�avam mre�ni ure�aj %s"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft compatible (serial)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Automatski IP"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Generic 3 Button Mouse (serial)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "IP address"
+msgstr "IP adresa:"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (serial)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Netmask"
+msgstr "Netmask:"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Da li je ovo ispravno?"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP adresa treba biti oblika 1.2.3.4"
+
+#: ../../network.pm_.c:341
+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 ""
+"Molim unesite ime ra�unala.\n"
+"Ime ra�unala treba biti puno ime ra�unala,\n"
+"primjerice mojeracunalo.odjel.domena.hr.\n"
+"Tako�er unesite IP adresu gateway ra�unala ako gateway postoji"
+
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "DNS poslu�itelj:"
+
+#: ../../network.pm_.c:347
+#, fuzzy
+msgid "Gateway"
+msgstr "Gateway:"
+
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "Gateway ure�aj:"
+
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Postava nakon instalacije"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy treba biti http://"
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy treba biti ftp://"
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -3688,21 +4930,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:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Gre�ka prilikom �itanja datoteke %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Vra�anje iz datoteke %s nije uspjelo: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Lo�a backup datoteka"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Gre�ka prilikom pisanja u datoteku %s"
@@ -3736,42 +4978,56 @@ msgstr "interesantno"
 msgid "maybe"
 msgstr "mo�da"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (va�no)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (vrlo lijepo)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (lijepo)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Prika�i manje"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Prika�i vi�e"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Lokalni pisa�"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+#, fuzzy
+msgid "Remote printer"
+msgstr "Postavke udaljenog lpd pisa�a"
+
+#: ../../printer.pm_.c:21
+#, fuzzy
+msgid "Remote CUPS server"
+msgstr "Udaljeni red"
+
+#: ../../printer.pm_.c:22
+#, fuzzy
+msgid "Remote lpd server"
 msgstr "Udaljeni lpd"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "Postavke NetWare pisa�a"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Ure�aj pisa�a"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Otkrivanje ure�aja..."
@@ -3785,11 +5041,11 @@ msgstr "Isku�aj portove"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Pisa�, model \"%s\", je otkriven na "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Ure�aj lokalnog pisa�a"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -3797,15 +5053,15 @@ msgstr ""
 "Na koji ure�aj je va� pisa� spojen \n"
 "(napomena: /dev/lp0 je jednak LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Ure�aj pisa�a"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Postavke udaljenog lpd pisa�a"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -3815,19 +5071,19 @@ msgstr ""
 "ime ispisnog poslu�itelja te ime reda na poslu�itelju\n"
 "na koji �elite ispisivati."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Udaljeno ra�unalo"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Udaljeni red"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Postavke SMB (Windows 9x/NT) pisa�a"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -3836,27 +5092,27 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "SMB poslu�itelj"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP SMB poslu�itelja"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Ime sharea"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Radna grupa"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "Postavke NetWare pisa�a"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -3864,130 +5120,155 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Ispisni poslu�itelj"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Ime reda pisa�a"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "Postavke NetWare pisa�a"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "Postavke pisa�a"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "Slab"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Kakav tip pisa�a posjedujete?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Da li �elite isku�ati pisa�?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Ispisujem probnu stranicu(e)..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\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"
+"Stanje ispisa:\n"
+"%s\n"
+"\n"
+"Da li sve radi kako spada?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+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 spada?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Da, ispi�i ASCII probnu stranicu"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Da, ispi�i PostScript probnu stranicu"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Da, ispi�i obje probne stranice"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Postavke pisa�a"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Kakav tip pisa�a posjedujete?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Postavke pisa�a"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Veli�ina papira"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Postavke uniprinter pokreta�kog programa"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Ispi�i tekst kao PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Obrni redoslijed stranica"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Desna/lijeva margina u to�kama (1/72 in�a)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Gornja/donja margina u to�kama (1/72 in�a)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Dodatne GhostScript postavke"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Dodatne Tekst Postavke"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Da li �elite isku�ati pisa�?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Ispisujem probnu stranicu(e)..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\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"
-"Stanje ispisa:\n"
-"%s\n"
-"\n"
-"Da li sve radi kako spada?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-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 spada?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Pisa�"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Da li �elite podesiti pisa�?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -3995,19 +5276,64 @@ msgstr ""
 "Slijede�e su redovi pisa�a.\n"
 "Mo�ete dodati jo� koji ili urediti postoje�i."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "Procjenjujem"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Odaberi vezu pisa�a"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Kako je pisa� povezan?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+#, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "Odaberi vezu pisa�a"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Ukloni red"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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 ""
+
+#: ../../printerdrake.pm_.c:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "Lokalni pisa�"
+
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "Odredi postavke"
+
+#: ../../printerdrake.pm_.c:406
+#, fuzzy
+msgid "Location"
+msgstr "Informacije"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4015,57 +5341,57 @@ msgid ""
 "connected?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Ime reda"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Posredni�ki direktorij"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Veza pisa�a"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, 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:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Ne mogu pisati datoteku $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid nije uspio"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid nije uspio (mo�da niste instalirali raidtools alate?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Nema dovoljno particija za RAID nivo %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr ""
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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 ""
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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:19
+#: ../../services.pm_.c:20
 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 "
@@ -4073,7 +5399,7 @@ msgid ""
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4081,7 +5407,7 @@ msgid ""
 "and includes support for pop-up menus on the console."
 msgstr ""
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4089,7 +5415,7 @@ msgstr ""
 "Apache je World Wide Web poslu�itelj. Koristi se za poslu�ivanje HTML\n"
 "dokumenata i CGI skriptova."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4099,20 +5425,20 @@ msgid ""
 "all of the services it is responsible for."
 msgstr ""
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
 "You should leave this enabled for most machines."
 msgstr ""
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4120,13 +5446,13 @@ 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:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4134,20 +5460,20 @@ msgstr ""
 "Aktivira/Deaktivira sva pode�ena mre�na su�elja prilikom pokretanja\n"
 "sustava."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP networks.\n"
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4155,7 +5481,7 @@ msgid ""
 "it installed on machines that don't need it."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4163,101 +5489,242 @@ msgid ""
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr ""
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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:66
+#: ../../services.pm_.c:67
 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:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr ""
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Izaberite koji servisi trebaju biti startani automatski kod boot-a"
 
-# 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
-#
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Dobrodosli u SILO izbornik operativnih sustava!\n"
-"\n"
-"Za popis dostupnih sustava pritisnite <TAB>.\n"
-"\n"
-"Ako zelite ucitati neki od operativnih sustava upi�ite njegovo ime\n"
-"i pritisnite <ENTER> oili pricekajte %d sekundi za podrazumijevani\n"
-"operativni sustav.\n"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Podesi LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Napravi boot disketu"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Formatiraj disketu"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Izbor"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "Instalacija LILO-a nije uspjela. Prijavljena je slijede�a gre�ska:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Tablica"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Podesi X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Tablica"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+#, fuzzy
+msgid "Internet Connection Sharing"
+msgstr "Veza pisa�a"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Na�in biranja"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "u�itavam postavu"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "Pode�avam skriptove, instaliram softver, pokre�em poslu�itelje..."
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Pode�avam IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "Ne mogu instalirati ipchains RPM s urpmi-em."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "Ne mogu instalirati dhcp RPM s urpmi-em."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "Ne mogu instalirati linuxconf RPM s urpmi-em."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "Ne mogu instalirati bind RPM s urpmi-em."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "Ne mogu instalirati caching-nameserver RPM s urpmi-em"
+
+#: ../../standalone/drakgw_.c:512
+#, fuzzy
+msgid "Congratulations!"
+msgstr "Postavke"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4307,23 +5774,30 @@ msgstr "Pode�avam sigurnosni nivo"
 msgid "Choose the tool you want to use"
 msgstr "Izaberite alat koje �elite koristiti"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Koji raspored tipkovnice imate?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Promijeni rezoluciju"
+
+#: ../../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 ""
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Koja je vrsta va�eg mi�a?"
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "niti jedan serial_usb nije prona�en\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Emuliranje tre�e tipke?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Na koji serijski port je mi� priklju�en?"
 
@@ -4431,7 +5905,7 @@ msgstr "Odaberite pakete za instaliranje"
 
 #: ../../standalone/rpmdrake_.c:190
 msgid "Checking dependencies"
-msgstr ""
+msgstr "Provjeravam ovisnosti"
 
 #: ../../standalone/rpmdrake_.c:190 ../../standalone/rpmdrake_.c:409
 msgid "Wait"
@@ -4485,7 +5959,7 @@ msgstr "�to tra�ite?"
 
 #: ../../standalone/rpmdrake_.c:289
 msgid "Give a name (eg: `extra', `commercial')"
-msgstr ""
+msgstr "Pridjelite ime (npr. `dodatno', `komercijalno')"
 
 #: ../../standalone/rpmdrake_.c:291
 msgid "Directory"
@@ -4532,6 +6006,549 @@ msgstr "Tra�im listove"
 msgid "Finding leaves takes some time"
 msgstr ""
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Postava Interneta"
+
+#, fuzzy
+msgid "Internet"
+msgstr "interesantno"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Ured"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multimedija"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multimedija"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multimedija"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multimedija"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multimedija"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Izaberite veli�inu koji �elite instalirati"
+
+#~ msgid "Total size: "
+#~ msgstr "Ukupna veli�ina:"
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "Promijeni mre�ne postavke"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Spoji se na Internet normalnim modemom"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Spoji se na Internet pomo�u ISDNa"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Spoji se na Internet pomo�u DSLa (ili ADSLa)"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Spoji se na Internet pomo�u kablovske TV"
+
+#, fuzzy
+#~ msgid "Germany"
+#~ msgstr "Njema�ka"
+
+#~ msgid "Germany (1TR6)"
+#~ msgstr "Njema�ka (1TR6)"
+
+#~ msgid "What do you wish to do?"
+#~ msgstr "�to �elite napraviti?"
+
+#, fuzzy
+#~ msgid "Install/Rescue"
+#~ msgstr "Instaliraj"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "Promijeni veli�inu"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Koji tip particije �elite?"
+
+#, 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Odaberite \"Instaliraj\" ukoliko nemate Linux instaliran ili ako\n"
+#~ "�elite imati vi�e razli�itih distribucija ili ina�ica Linux na sustavu.\n"
+#~ "\n"
+#~ "Odaberite \"Dogradnja\" ako �elite nadograditi postoje�u ina�icu Mandrake "
+#~ "Linuxa:\n"
+#~ "%s ili %s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Odaberite:\n"
+#~ "\n"
+#~ "  - Automatski: Ukoliko nikada niste instalirali Linux.\n"
+#~ "\n"
+#~ "  - Prilago�eno: Ukoliko ste upoznati sa 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 npr. za mail, web, fileserver, ispis itd.\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\".\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."
+#~ msgstr ""
+#~ "Sve novo definirane particije moraju biti formatirane za\n"
+#~ "uporabu tj. moraju imati ispravni datote�ni sustav. Tako�er ukoliko\n"
+#~ "�elite obrisati podatke s odre�ene particije odaberite reformatiranje.\n"
+#~ "Opaska: nije potrebno reformatirati postoje�e particije osobito\n"
+#~ "ako sadr�e datoteke ili podatke koje �elite sa�uvati.\n"
+#~ "Na primjer obi�no /home i /usr/local sadr�e podatke koje treba sa�uvati."
+
+#~ 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."
+#~ msgstr ""
+#~ "Po�ela je instalacija paketa koje ste odabrali. Ova\n"
+#~ "operacija �e potrajati par minuta osim ako ste odabrali\n"
+#~ "nadogradnju postoje�eg sustava. U tom slu�aju instalacija\n"
+#~ "�e izvr�iti odre�ene provjere prije same nadogradnje."
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Odbaci promjene?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "Veza pisa�a"
+
+#~ msgid "Host name:"
+#~ msgstr "Ime ra�unala:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Koja je vrsta va�eg mi�a?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Automatski odabir rezolucije"
+
+#~ 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"
+#~ msgstr ""
+#~ "Kako bih prona�ao dostupne rezolucije moram poku�ati par razli�itih.\n"
+#~ "Monitor �e tokom pretrage treptati...\n"
+#~ "Ukoliko �elite slobodno isklju�ite monitor. Nakon �to je sve gotovo �uti �e "
+#~ "te pip."
+
+#~ 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?"
+#~ msgstr ""
+#~ "Mogu poku�ati prona�i dostupnu rezoluciju (npr. 800x600).\n"
+#~ "Me�utim ponekad takva pretraga mo�e zamrznuti ra�unalo.\n"
+#~ "Da li ste sigurni da �elite nastaviti?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Niti jedan valjan mode nije na�en\n"
+#~ "Probajte sa drugom grafi�kom karticom ili monitorom"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Automatski tra�i rezoluciju"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB mi�"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB mi� (2 gumba)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB mi� (3 gumba i vi�e)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB mi�"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB mi� (2 gumba)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB mi� (3 gumba i vi�e)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Generi�ki mi�"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus mi�"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Bus mi�"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech Bus mi�"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB mi�"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB mi� (3 gumba i vi�e)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A ili vi�e (serijski)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (serijski)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (serijski)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (serijski)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Generi�ki Mi� (serijski)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsoft compatible (serial)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Generic 3 Button Mouse (serial)"
+
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse (serijski)"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "nfs montiranje nije uspjelo"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Kriptografski"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "Da li �elite podesiti mre�ne postavke sustava?"
+
+#~ msgid "Show less"
+#~ msgstr "Prika�i manje"
+
+#~ msgid "Show more"
+#~ msgstr "Prika�i vi�e"
+
+#~ msgid "Take over the hard drive"
+#~ msgstr "Preuzmi cijeli hard disk"
+
+#~ msgid "curly"
+#~ msgstr "curly"
+
+#~ msgid "default"
+#~ msgstr "uobi�ajeno"
+
+#~ msgid "tie"
+#~ msgstr "tie"
+
+#~ msgid "brunette"
+#~ msgstr "crnka"
+
+#~ msgid "girl"
+#~ msgstr "djevojka"
+
+#~ msgid "woman-blond"
+#~ msgstr "plavu�a"
+
+#~ msgid "automagic"
+#~ msgstr "automagijski"
+
+#~ msgid "Have you been provided with a hostname?"
+#~ msgstr "Da li imate ime ra�unala ?"
+
+#~ msgid "Network:"
+#~ msgstr "Network:"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Koji raspored tipkovnice imate?"
+
+#~ msgid "Normal"
+#~ msgstr "Normalno"
+
+#~ msgid "Configure my card"
+#~ msgstr "Podesi moju karticu"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Da li da tra�im PCMCIA kartice?"
+
+#~ 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?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "Tra�im root particiju."
+
+#~ 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 "Can't use broadcast with no NIS domain"
+#~ msgstr "Ne mogu koristiti broadcast bez NIS domene"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr ""
+#~ "Izaberite particiju koju �elite koristiti kao korijensku particiju (/)."
+
+#~ msgid "You don't have any windows partitions!"
+#~ msgstr "Nemate niti jednu Windows particiju!"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "Nemate dovoljno mjesta za Lnx4win"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "Automatski"
+
+# 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 ""
+#~ "Dobrodosli u LILO izbornik operativnih sustava!\n"
+#~ "\n"
+#~ "Za popis dostupnih sustava pritisnite <TAB>.\n"
+#~ "\n"
+#~ "Ako zelite ucitati neki od operativnih sustava upisite njegovo ime\n"
+#~ "i pritisnite <ENTER> oili pricekajte %d sekundi za podrazumijevani\n"
+#~ "operativni sustav.\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
+#~ 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 ""
+#~ "Dobrodosli u SILO izbornik operativnih sustava!\n"
+#~ "\n"
+#~ "Za popis dostupnih sustava pritisnite <TAB>.\n"
+#~ "\n"
+#~ "Ako zelite ucitati neki od operativnih sustava upisite njegovo ime\n"
+#~ "i pritisnite <ENTER> oili pricekajte %d sekundi za podrazumijevani\n"
+#~ "operativni sustav.\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "SILO glavne postavke"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "Ovo su trenutni zapisi u SILO-u.\n"
+#~ "Mo�ete dodati jo� koji ili urediti postoje�i."
+
+#~ msgid "This label is already in use"
+#~ msgstr "Ova oznaka ve� postoji"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "Instalacija SILO-a nije uspjela. Prijavljena je slijede�a gre�ska:"
+
+#~ msgid "Shutting down"
+#~ msgstr "Ga�enje sustava"
+
 #~ msgid "useless"
 #~ msgstr "beskorisno"
 
diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po
index 76f5b8479..dc2b201d9 100644
--- a/perl-install/share/po/hu.po
+++ b/perl-install/share/po/hu.po
@@ -1,59 +1,112 @@
 # Translation file of Mandrake graphic install
 # Copyright (C) 2000 Mandrakesoft
-# KOVACS Emese Alexandra <emese@itp.hu>
-# Kultsar Kadosa Atilla <kadi@kadi.emg.hu>
-# Takacs Sandor <taki@dfmk.hu>
-# Timar Andras <atimar@itp.hu>
-# 2000.
+# KOVACS Emese Alexandra <emese@itp.hu>, 2000
+# Kultsar Kadosa Atilla <kadi@kadi.emg.hu>, 2000
+# Takacs Sandor <taki@dfmk.hu>, 2000
+# Timar Andras <atimar@itp.hu>, 2000
+# Sari Gabor <saga@tux.hu>, 2000
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
-"PO-Revision-Date: 2000-06-18 12:56+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
+"PO-Revision-Date: 2000-09-01 12:56+0200\n"
 "Last-Translator: KOVACS Emese Alexandra <emese@itp.hu>\n"
 "Language-Team: hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "�ltal�nos"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Videok�rtya"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
-msgstr "V�lassz videok�rty�t"
+msgstr "V�lassz vide�k�rty�t"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "V�lassz X szervert"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X szerver"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"A k�rty�dhoz nincs 3D hardver gyors�t�s az XFree %s verzi�ban.\n"
+"A k�rty�d az XFree %s verzi�ban csak 2D t�ren t�mogatott."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr "A k�rty�dhoz van hardveres 3D gyors�t�s az XFree %s verzi�val."
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s hardveres 3D gyors�t�ssal"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"A k�rty�dhoz nincs 3D hardver gyors�t�s az XFree %s verzi�ban.\n"
+"EZ EGY K�S�RLETI OPCI�, ESETLEG LEFAGYASZTHATJA A SZ�M�T�G�PEDET.\n"
+"A k�rty�d az XFree %s verzi�ban csak 2D t�ren t�mogatott."
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"A k�rty�dhoz nincs 3D hardver gyors�t�s az XFree %s verzi�ban.\n"
+"EZ EGY K�S�RLETI OPCI�, ESETLEG LEFAGYASZTHATJA A SZ�M�T�G�PEDET."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s K�S�RLETI 3D hardver gyors�t�ssal"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "XFree be�ll�t�sok"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "V�laszd ki a grafikus k�rtya mem�riam�ret�t"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "V�lassz a k�vetkez� lehet�s�gek k�z�l"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "V�lassz monitort"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -67,8 +120,8 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 "A k�t kritikus param�ter a f�gg�leges friss�t�s, ez az a frekvencia, amivel "
-"a \n"
-"teljes k�perny� friss�l �s a m�g fontosabb v�zszintes friss�t�s, ez az a \n"
+"a\n"
+"teljes k�perny� friss�l �s a m�g fontosabb v�zszintes friss�t�s, ez az a\n"
 "frekvencia, amivel a monitor a v�zszintes vonalakat rajzolja, amikb�l a\n"
 "k�pet v�g�l �ssze�ll�tja.\n"
 "\n"
@@ -76,39 +129,40 @@ msgstr ""
 "k�pess�geit.\n"
 "Ha k�ts�geid vannak, v�laszd ink�bb az alacsonyabb �rt�ket."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "V�zszintes friss�t�s"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "F�gg�leges friss�t�s"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "A monitor nincs be�ll�tva"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "A grafikus k�rtya nincs be�ll�tva"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Nem v�lasztott�l m�g felbont�st"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Leteszteled a be�ll�t�sokat?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr "Figyelmeztet�s: a tesztel�s vesz�lyes lehet ezzel a videok�rty�val"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr ""
+"Figyelmeztet�s: a videok�rtya tesztel�se lefagyaszthatja a sz�m�t�g�ped"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Be�ll�t�sok tesztel�se"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -116,186 +170,174 @@ msgstr ""
 "\n"
 "v�ltoztass meg p�r param�tert"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Hiba t�rt�nt:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Kil�p�s %d m�sodpercen bel�l"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
-msgstr "J� ez a be�ll�t�s?"
+msgstr "J� lesz ez a be�ll�t�s?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Hiba l�pett fel, v�ltoztass meg p�r param�tert"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Automatikus felbont�sok"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Megkeresem a m�k�d�k�pes felbont�sokat. Ezalatt a monitor villogni fog...\n"
-"Ha ez zavar, nyugodtan kikapcsolhatod, csipog�ssal jelzem, amikor befejeztem."
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Felbont�s"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "V�lassz felbont�st �s sz�nm�lys�get"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
-msgstr "Videok�rtya: %s"
+msgstr "Vide�k�rtya: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 szerver: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Mindent mutat"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Felbont�sok"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Megpr�b�lhatom megkeresni az el�rhet� felbont�sokat (pl. 800x600).\n"
-"Ez rossz esetben lefagyaszthatja a sz�m�t�g�pet.\n"
-"Megpr�b�ljam?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Nem tal�ltam �rv�nyes videom�dot.\n"
-"Pr�b�ld meg egy m�sik videok�rtya vagy monitor be�ll�t�ssal"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Billenty�zetkioszt�s: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Eg�r t�pusa: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Eg�rhez rendelt eszk�z: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor sorfrekvenci�ja: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor k�pfrekvenci�ja: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
-msgstr "Videok�rtya: %s\n"
+msgstr "Vide�k�rtya: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Grafikus mem�ria: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "Sz�nm�lys�g: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Felbont�s: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 szerver: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 driver: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "X-Window be�ll�t�s�nak el�k�sz�t�se"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
-msgstr "M�sik monitor"
+msgstr "Monitor megv�ltoztat�sa"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
-msgstr "M�sik videok�rtya"
+msgstr "Videok�rtya megv�ltoztat�sa"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Szerver be�ll�t�sainak megv�ltoztat�sa"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
-msgstr "M�s felbont�s"
-
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Felbont�s automatikus keres�se"
+msgstr "Felbont�s megv�ltoztat�sa"
 
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Adatok megjelen�t�se"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "�jra tesztel"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Kil�p�s"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Mit szeretn�l tenni?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "V�ltoztat�sok elvet�se?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"Megtartod a jelenlegi be�ll�t�sokat?\n"
+"A jelenlegi be�ll�t�sok:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr ""
-"K�rlek jelentkezz be �jra a/az %s -be/-ba, hogy a v�ltoz�sok �rv�nyre "
-"jussanak"
+"K�rlek jelentkezz be �jra a(z) %s -be, hogy a v�ltoz�sok �rv�nyre jussanak"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr ""
-"K�rlek l�pj�l ki, majd haszn�ld a Ctrl-Alt-BackSpace billenty�kombin�ci�t"
+"K�rlek l�pj ki, majd haszn�ld a Ctrl-Alt-BackSpace billenty�kombin�ci�t"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "Grafikus bejelentkez�s"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -303,229 +345,225 @@ msgstr ""
 "Be tudom �ll�tani, hogy rendszerind�t�skor az X automatikusan elinduljon.\n"
 "Be�ll�tsam?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Automatikus bel�p�s"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"Be tudom �ll�tani, hogy ind�t�skor egy felhaszn�l� "
+"automatikusanbejelentkezzen.\n"
+"Ha nem akarod ezt a lehet�s�get kihaszn�lni, kattints a CANCEL gombra."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Add meg az alap�rtelmezett felhaszn�l�t:"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "V�laszd ki az ablakkezel�t, amit haszn�lni szeretn�l:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 sz�n (8 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 ezer sz�n (15 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 ezer sz�n (16 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 milli� sz�n (24 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 milli�rd sz�n (32 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB vagy t�bb"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standard VGA, 640x480 60 Hz-en"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 56 Hz-en"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
-msgstr "8514-kompat�bilis, 1024x768 87 Hz v�ltottsoros (nincs 800x600)"
+msgstr "8514-kompatibilis, 1024x768 87 Hz v�ltottsoros (nincs 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 87 Hz v�ltottsoros, 800x600 56 Hz-en"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Extended Super VGA, 800x600 60 Hz-en, 640x480 72 Hz-en"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "Nem-v�ltottsoros SVGA, 1024x768 60 Hz-en, 800x600 72 Hz-en"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Magas frekvenci�j� SVGA, 1024x768 70 Hz-en"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multisync monitor, amely tud 1280x1024-et 60 Hz-en"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multisync monitor, amely tud 1280x1024-et 74 Hz-en"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multisync monitor, amely tud 1280x1024-et 76 Hz-en"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Olyan monitor, amely tud 1600x1200-at 70 Hz-en"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Olyan monitor, amely tud 1600x1200-at 76 Hz-en"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "g�nd�r"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "alap�rtelmezett (default)"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "nyakkend�s"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "barna"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "l�ny"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "sz�ke n�"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "automatikus"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "A boot part�ci� els� szektora"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "A lemez els� szektora (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "LILO/grub telep�t�se"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "SILO telep�t�se"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Hova szeretn�d telep�teni a bootloader-t?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub telep�t�se"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Egyiket sem"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Melyik bootloader-t szeretn�d haszn�lni?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Bootloader telep�t�s"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Boot eszk�z"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (nem m�k�dik r�gi BIOS-okkal)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Compact"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "compact"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
+msgid "Video mode"
+msgstr "Vide�m�d"
+
+#: ../../any.pm_.c:132
 msgid "Delay before booting default image"
 msgstr "K�sleltet�s az alap�rtelmezett image bet�lt�se el�tt"
 
-#: ../../any.pm_.c:88
-msgid "Video mode"
-msgstr "Videom�d"
-
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Jelsz�"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Jelsz� (�jra)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Parancssorban �tadhat� param�terek korl�toz�sa"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "korl�tozott"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "A bootloader f�bb opci�i"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
-"A ``Parancssorban �tadhat� param�terek korl�toz�sa'' be�ll�t�snak jelsz� "
+"A \"Parancssorban �tadhat� param�terek korl�toz�sa\" be�ll�t�snak jelsz� "
 "n�lk�l\n"
 "nincs �rtelme"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Pr�b�lkozz �jra"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "A jelszavak nem egyeznek"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -533,167 +571,388 @@ msgstr ""
 "Itt vannak a jelenlegi bejegyz�sek.\n"
 "Adhatsz a megl�v�kh�z �jakat, vagy m�dos�thatod a r�gieket."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Hozz�ad"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "K�sz"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Milyen bejegyz�st szeretn�l hozz�adni?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Egy�b op. rendszer (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Egy�b op. rendszer (Windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Milyen bejegyz�st szeretn�l hozz�adni?"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Image"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Append"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "�r�s-olvas�s (read-write)"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "T�bla (table)"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Nem biztons�gos (unsafe)"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "C�mke (label)"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Alap�rtelmezett (default)"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
-msgstr "OK"
+msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Bejegyz�s elt�vol�t�sa"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "�res c�mke nem enged�lyezett"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
-msgstr "M�r van ilyen c�mke"
+msgstr "M�r van ilyen nev� c�mke"
+
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Tal�ltam %s %s csatol�t"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Van m�sik is?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Van valamilyen %s csatol�d?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Nem"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Igen"
+
+#: ../../any.pm_.c:505
+msgid "See hardware info"
+msgstr "Hardver inf� megjelen�t�se"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Driver telep�t�se a(z) %s k�rty�hoz (%s)"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(%s modul)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Melyik %s driver-t pr�b�ljam meg?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"Egyes esetekben a %s driver-nek tov�bbi param�terekre van sz�ks�ge a helyes\n"
+"m�k�d�shez, b�r ez nem jellemz�. Szeretn�l tov�bbi param�tereket megadni a\n"
+"driver-nek, vagy hagyod, hogy az mag�t�l k�rdezze le a hardvert�l a "
+"sz�ks�ges\n"
+"inform�ci�t? Esetenk�nt az automatikus keres�s lefagyaszthatja a\n"
+"sz�m�t�g�pet, de ez semmilyen k�rosod�ssal nem j�r."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Automatikus keres�s"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "R�szletes be�ll�t�sok"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Most megadhatod a %s modul param�tereit."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"A %s modulnak �tadhatsz param�tereket.\n"
+"A param�terek szintaktik�ja: `n�v=�rt�k n�v2=�rt�k2 ...'.\n"
+"P�ld�ul: `io=0x300 irq=7'"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Modul be�ll�t�sok:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"A %s modul bet�lt�se sikertelen.\n"
+"Megpr�b�lod m�s param�terekkel?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Koszontelek %s az operacios rendszer valasztoban!\n"
+"\n"
+"Az opciok megjelen�tesehez nyomd meg a <TAB>-ot.\n"
+"\n"
+"Betolteshez �rd be a kivant nevet es uss <ENTER>-t,\n"
+"vagy varj %d mp-et az alapertelmezett opcio betoltesehez.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "L�gy �dv�z�lve! Ez a GRUB, az oper�ci�s rendszer v�laszt�."
+
+# 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
+#
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "Haszn�ld a(z) %c �s %c gombokat a bejegyz�s kijel�l�s�re."
+
+# 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
+#
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Az \"ENTER\" a kiv�lasztott Op. rendszert inditja, \"E\" gombbal"
+
+# 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
+#
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr ""
+"szerkesztheted a bootol�s elo\"tt a parancsokat, a C gombbal parancssort "
+"kapsz"
+
+# 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
+#
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr ""
+"A kijel�lt oper�ci�s rendszer %d m�sodpercen bel�l automatikusan elindul."
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr "nincs el�g hely a /boot part�ci�n"
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Munkaasztal"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Start Men�"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d perc"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 perc"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d m�sodperc"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "L�trehoz"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Lecsatol"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "T�r�l"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Form�z"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "�tm�retez"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "T�pus"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Csatol�si pont"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "/etc/fstab �r�sa"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
-msgstr "V�lt�s halad� m�dba"
+msgstr "Halad� m�d"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
-msgstr "V�lt�s norm�l m�dba"
+msgstr "Norm�l m�d"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Vissza�ll�t�s f�jlb�l"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Ment�s f�jlba"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "Var�zsl�"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Vissza�ll�t�s lemezr�l"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Ment�s lemezre"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
-msgstr "Mindet t�rli"
+msgstr "Mindet t�r�lni"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "�sszes part�ci� form�z�sa"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Automatikus helyfoglal�s"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Minden els�dleges part�ci� haszn�lva van"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Nem hozhat� l�tre t�bb part�ci�"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -701,59 +960,63 @@ msgstr ""
 "Tov�bbi part�ci�k l�trehoz�s�hoz t�r�lj egyet, hogy kiterjesztett part�ci�t\n"
 "hozhass l�tre"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Part�ci�s t�bla helyre�ll�t�sa"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Visszavon"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Part�ci�s t�bla �r�sa"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "�jrat�lt�s"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "�res"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Egy�b"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Lapoz�ter�let (swap)"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "�res"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Egy�b"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "F�jlrendszer t�pusok:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "R�szletek"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -761,101 +1024,101 @@ msgid ""
 "(click on it, then click on \"Resize\")"
 msgstr ""
 "Egy nagy FAT part�ci�d van\n"
-"(ez �ltal�ban a Microsoft DOS-os/Windows-os part�ci�).\n"
+"(ez �ltal�ban egy Microsoft DOS/Windows part�ci�).\n"
 "Azt aj�nlom, hogy m�retezd �t ezt a part�ci�t\n"
 "(kattints r�, majd kattints az \"�tm�retez\" gombra)"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "K�rlek el�sz�r mentsd le az adatokat"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Figyelmesen olvasd el!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 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 ""
-"Ha aboot-ot szeretn�l haszn�lni, bizonyosodj meg r�la, hogy hagyt�l el�g "
+"Ha az aboot-ot szeretn�d haszn�lni, bizonyosodj meg r�la, hogy hagyt�l el�g "
 "helyet\n"
-"(2048 szektor el�g is) a lemez elej�n"
+" a lemez elej�n (2048 szektor el�g lesz)"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
-msgstr "Vigy�zz, ez a m�velet vesz�lyes."
+msgstr "Vigy�zz! Ez a m�velet vesz�lyes."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Hiba"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Csatol�si pont: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Eszk�z: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS meghajt� bet�jele: %s (csak egy tipp)\n"
+msgstr "DOS meghajt� bet�jele: %s (Ez csak egy tipp)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "T�pus: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Kezd�szektor: %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "M�ret: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s szektor"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
-msgstr "%d. cilindert�l %d. cilinderig\n"
+msgstr "%d. cilindert�l a %d. cilinderig\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
-msgstr "Megform�zva\n"
+msgstr "Form�zva\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
-msgstr "Nincs megform�zva\n"
+msgstr "Nincs form�zva\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Felcsatolva\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Loopback f�jl(ok): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -863,91 +1126,91 @@ msgstr ""
 "Alap�rtelmezett ind�t�si part�ci�\n"
 "    (a DOS-nak, nem a lilo-nak)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Level %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Szelet m�rete %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-diszkek %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Loopback f�jl neve: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Kattints egy part�ci�ra"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "M�ret: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometria: %s cilinder, %s fej, %s szektor\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Part�ci�s t�bla t�pusa: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "%d buszon, %d id-vel\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Felcsatol"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Akt�v"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "RAID-hez hozz�ad"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "RAID-b�l elt�vol�t"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "RAID m�dos�t�sa"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
-msgstr "Loopback-hez haszn�ld"
+msgstr "Loopback-hez haszn�lva"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "V�lassz"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 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 ""
-"Sajn�lom, de nem hozhatom l�tre a /boot-ot ennyire messze a merevlemez "
+"Sajn�lom, de nem hozhatom l�tre a /boot-ot ennyire t�vol a merevlemez "
 "elej�t�l (cilinder > 1024).\n"
 "Vagy haszn�lod a LILO-t, �s nem fog m�k�dni, vagy nem haszn�lod a LILO-t, de "
 "akkor nem kell a /boot"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -955,30 +1218,29 @@ msgid ""
 "If you plan to use the LILO boot manager, be careful to add a /boot partition"
 msgstr ""
 "Az a part�ci�, amit root part�ci�nak sz�nsz (/) fizikailag az 1024. cilinder "
-"ut�n tal�lhat� a merevlemezen �s nincs /boot part�ci�d.\n"
-"Ha a LILO rendszerbet�lt�t szeretn�d haszn�lni, k�sz�ts egy /boot part�ci�t"
+"ut�n tal�lhat�, mik�zben nincs /boot part�ci�d.\n"
+"Ha a LILO -t szeretn�d haszn�lni, k�sz�ts egy /boot part�ci�t"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "Szoftveres RAID part�ci�t v�lasztott�l root (/) part�ci�nak.\n"
 "Egyik rendszerbet�lt� sem tudja ezt kezelni /boot part�ci� n�lk�l.\n"
-"L�tre kell hoznod egy /boot part�ci�t, ha a lilo-t vagy a grub-ot\n"
-"szeretn�d haszn�lni."
+"Ez�rt l�tre kell hoznod egy /boot part�ci�t."
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
-msgstr "Haszn�ld ink�bb a(z) ``%s''-t"
+msgstr "Haszn�ld ink�bb a(z) \"%s\"-t"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
-msgstr "Haszn�ld el�sz�r a ``Lecsatol''-t"
+msgstr "Haszn�ld el�sz�r a \"Lecsatol\"-t"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -986,41 +1248,42 @@ msgstr ""
 "A(z) %s part�ci� t�pus�nak megv�ltoztat�sa ut�n a part�ci�n minden adat "
 "elv�sz"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Ett�l f�ggetlen�l folytassam?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
-msgstr "Kil�p ment�s n�lk�l"
+msgstr "Kil�p�s ment�s n�lk�l"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Kil�psz a programb�l a part�ci�s t�bla elment�se n�lk�l?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Part�ci� t�pus�nak v�ltoztat�sa"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Milyen part�ci�-t�pust szeretn�l?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "Melyiket v�lasztod?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr "Nem lehet ReiserFS-t haszn�lni 32 MB-n�l kisebb part�ci�n"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Hov� akarod felcsatolni a(z) %s loopback f�jlt?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Hov� akarod felcsatolni a(z) %s eszk�zt?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1028,229 +1291,234 @@ msgstr ""
 "Nem tudom megsz�ntetni a csatol�si pontot, mert a part�ci�t loopback fogja.\n"
 "Sz�ntesd meg el�sz�r a loopback-et."
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "A(z) %s part�ci� form�z�sa ut�n a part�ci�n minden adat elv�sz"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Form�z�s"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "A(z) %s loopback f�jl form�z�sa"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "A(z) %s part�ci� form�z�sa"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Az �sszes part�ci� form�z�sa ut�n "
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "minden adat elv�sz a part�ci�kr�l"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "�thelyez"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Melyik diszkre akarod �thelyezni?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Szektor"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Melyik szektorra akarod �thelyezni?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "�thelyezem"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Part�ci� �thelyez�se..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "A(z) %s meghajt� part�ci�s t�bl�j�t menteni fogom!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "�jra kell ind�tanod a rendszert, hogy a v�ltoz�sok �rv�nyes�ljenek"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "F�jlrendszer-jellemz�k kisz�m�t�sa"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "�tm�retezem"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Melyik part�ci�t szeretn�d �tm�retezni?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "Err�l a part�ci�r�l minden adatot le kellene menteni"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "A(z) %s part�ci� �tm�retez�se ut�n a part�ci�n minden adat elv�sz"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Add meg az �j m�retet"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "�j part�ci� l�trehoz�sa"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Kezd�szektor: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "M�ret MB-ban: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "F�jlrendszer t�pusa: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Be�ll�t�sok: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Ezt a part�ci�t nem haszn�lhatod loopback-hez"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Loopback f�jl neve: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
-msgstr "Ez a f�jl m�sik loopback-hez van rendelve, v�lassz egy m�sikat"
+msgstr "Ez a f�jl m�sik loopback-hez van rendelve, v�lassz m�sikat"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "A f�jl m�r l�tezik. Haszn�ljam?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "F�jl kiv�laszt�sa"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
-"A part�ci�s t�bla biztons�gi m�solat�nak a m�rete elt�r\n"
+"A part�ci�s t�bla biztons�gi m�solat�nak a m�rete elt�r!\n"
 "Biztos, hogy folytassam?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Figyelmeztet�s"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
-"Helyezz be egy lemezt a meghajt�ba\n"
+"Helyezz be egy lemezt a meghajt�ba!\n"
 "A lemezen minden adat elv�sz"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Megpr�b�lom vissza�ll�tani a part�ci�s t�bl�t"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "eszk�z"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "level"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "szelet m�ret"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "V�lassz ki egy m�r l�tez� RAID-et, ehhez adom a diszket"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "�j"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s f�jlrendszer %s eszk�z�n val� l�trehoz�sa sikertelen"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
-msgstr "Nem tudom, hogyan form�zzam meg %s -t %s t�pus�ra"
+msgstr "Nem tudom, hogyan form�zzam meg %s-t %s t�pus�ra"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "NFS felcsatol�s sikertelen"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "felcsatol�s sikertelen: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "hiba %s lecsatol�sakor: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "A csatol�si pontnak /-rel kell kezd�dnie"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "M�r van egy part�ci� %s csatol�si ponttal\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "K�rk�r�s mount-ol�s %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr "Ennek a k�nyvt�rnak a root f�jlrendszeren kellene maradnia"
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Igazi f�jlrendszerre (ext2, ReiserFS) van sz�ks�g ehhez a csatol�si ponthoz\n"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Hiba %s �r�sra val� megnyit�sakor: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1258,76 +1526,83 @@ msgstr ""
 "Hiba t�rt�nt - nincs �rv�nyes meghajt�, amelyen f�jlrendszereket lehetne "
 "l�trehozni. Ellen�rizd a hardvert �s pr�b�ld megtal�lni a hib�t"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Nincs egyetlen part�ci�d sem!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr ""
 "V�laszd ki a nyelvet, amin a telep�t�st szeretn�d lefolytatni, majd k�s�bb a "
 "rendszert haszn�lni."
 
-#: ../../help.pm_.c:10
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "V�laszd ki a billenty�zeted kioszt�s�t a fenti list�b�l"
-
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "V�laszd ki a billenty�zeted kioszt�s�t a fenti list�b�l"
+
+#: ../../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
+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"
-"  - 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"
-msgstr ""
-"V�laszd a \"Telep�t�st\", ha nincs kor�bbi Linux verzi� install�lva,\n"
-"vagy ha t�bb k�l�nb�z� disztrib�ci�t vagy verzi�t szeretn�l haszn�lni.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"V�laszd a \"Friss�t�st\", ha friss�teni szeretn�d a Mandrake Linux\n"
-"valamelyik kor�bbi v�ltozat�t: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen),\n"
-"6.0 (Venus), 6.1 (Helios), Gold 2000 vagy 7.0 (Air).\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"
-"V�lassz:\n"
+"\t* Recommanded: 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"
-"  - Automatikus (aj�nlott): Ha m�g sohasem telep�tett�l Linuxot,\n"
-"    v�laszd ezt az opci�t. FIGYELEM:\n"
-"    A telep�t�s sor�n a DrakX nem �ll�tja be a h�l�zatot. Ezt megteheted\n"
-"    az els� �jraind�t�s ut�n, a \"LinuxConf\" seg�ts�g�vel.\n"
 "\n"
-"  - Egyedi: Ha m�r j�l ismered a GNU/Linuxot, kiv�laszthatod, \n"
-"    hogy milyen c�lra sz�nod a rendszert. A r�szleteket l�sd lentebb.\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - Halad�: Ez azt felt�telezi, hogy szak�rt�je vagy a GNU/Linux\n"
-"    rendszereknek, �s teljesen egyedi telep�t�st szeretn�l v�gezni.\n"
-"    Hasonl�an, mint az \"Egyedi\" opci�n�l, megadhatod, hogy milyen c�lra\n"
-"    sz�nod a rendszert, de k�rlek CSAK AKKOR V�LASZD EZT, HA TUDOD, HOGY\n"
-"    MIT TESZEL!\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1335,55 +1610,55 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "V�lassz:\n"
 "\n"
 "  - Egyedi: Ha m�r j�l ismered a GNU/Linuxot, kiv�laszthatod, \n"
 "    hogy milyen c�lra sz�nod a rendszert. A r�szleteket l�sd lentebb.\n"
 "\n"
+"\n"
 "  - Halad�: Ez azt felt�telezi, hogy szak�rt�je vagy a GNU/Linux\n"
 "    rendszereknek, �s teljesen egyedi telep�t�st szeretn�l v�gezni.\n"
 "    Hasonl�an, mint az \"Egyedi\" opci�n�l, megadhatod, hogy milyen c�lra\n"
 "    sz�nod a rendszert, de k�rlek CSAK AKKOR V�LASZD EZT, HA TUDOD, HOGY\n"
-"    MIT TESZEL!\n"
+"    MIT TESZEL!"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "A k�l�nb�z�, el�re elk�sz�tett konfigur�ci�k (felt�ve, hogy \"Egyedi\" vagy\n"
 "\"Halad�\" m�dot v�lasztott�l) a k�vetkez�k:\n"
 "\n"
 "  - Norm�l: V�laszd ezt, ha a g�pedet els�dlegesen mindennapi\n"
-"  haszn�latra sz�nod (irodai munka, sz�m�t�g�pes grafika, stb.)\n"
+"  haszn�latra sz�nod (irodai munka, sz�m�t�g�pes grafika, stb.).\n"
 "  Ne sz�m�ts ford�t�ra, vagy m�s szoftverfejleszt� eszk�zre.\n"
 "\n"
 "  - Fejleszt�i: Amint az a nev�b�l is kider�l, akkor c�lszer� ezt az\n"
@@ -1394,307 +1669,537 @@ msgstr ""
 "\n"
 "  - Kiszolg�l�: v�laszd ezt, ha a g�pet, amire a Linux-Mandrake-et\n"
 "  telep�ted, kiszolg�l�nak sz�nod. Ez lehet f�jlkiszolg�l� (NFS vagy\n"
-"  SMB), nyomtat�-kiszolg�l� (Unix lp protokollal vagy Windows-os SMB-\n"
+"  SMB), nyomtat�-kiszolg�l� (Unix \"lp\" protokollal vagy Windows-os SMB-\n"
 "  vel), autentik�ci�s kiszolg�l� (NIS), adatb�zis-kiszolg�l�, stb.\n"
-"  Mint ilyen, ne sz�m�ts arra, hogy a konfigur�ci� tartalmaz pl. KDE-t\n"
-"  vagy Gnome-ot.\n"
+"  Ne sz�m�ts arra, hogy a konfigur�ci� tartalmazni fogja pl. a KDE-t\n"
+"  vagy a Gnome-ot.\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
+#, fuzzy
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 ""
-"A DrakX el�sz�r ellen�rzi, hogy tal�l-e egy vagy t�bb PCI-os SCSI vez�rl�t.\n"
-"Ha tal�l ilyet (ilyeneket) �s megtal�lja a hozz� (hozz�juk) tartoz�\n"
-"driver-t (driver-eket), automatikusan beilleszti azt (azokat).\n"
+"A DrakX megpr�b�lja a PCI SCSI k�rty�idat felismerni.\n"
 "\n"
+"Ha a DrakX megtal�lja a SCSI csatol�(i)dat, �s tal�l hozz�(juk) driver-t,\n"
+"akkor automatikusan install�lja azokat.\n"
 "\n"
-"Ha a SCSI vez�rl� k�rty�d ISA-s, vagy olyan PCI-os, amelyr�l a DrakX nem\n"
-"tudja eld�nteni, hogy melyik driver-t haszn�lja hozz�, vagy ha nincs is\n"
-"SCSI k�rty�d, a DrakX megk�rdi, hogy van-e k�rty�d. Ha nincsen, v�laszolj\n"
-"\"Nem\"-mel. Ha van egy vagy t�bb SCSI k�rty�d, v�laszolj \"Igen\"-nel.\n"
-"Ez esetben megjelenik egy lista a driver-ekkel, ebb�l v�laszthatod ki\n"
-"a megfelel�t.\n"
 "\n"
+"Ha nincs ilyen k�rty�d, akkor kattints a \"Nem\" gombra.\n"
+"Ha esetleg ISA buszos csatol�d van, vagy a DrakX nem ismerte\n"
+"fel a csatol�t, akkor kattints az \"Igen\" gombra, �s a megjelen�\n"
+"list�b�l v�laszd ki a megfelel� csatol� t�pust.\n"
 "\n"
-"A driver kiv�laszt�sa ut�n a DrakX megk�rdezi, szeretn�l-e opci�kat megadni\n"
-"hozz�. Els� k�rben c�lszer� a driver-re hagyni a hardver meghat�roz�s�t,\n"
-"�ltal�ban m�k�dni szokott.\n"
+"Amennyiben k�zzel adod meg a csatol� t�pus�t, a DrakX megk�rdezi a\n"
+"csatol� param�tereit. A megadott opci�kkal a DrakX megk�s�rli a\n"
+"csatol�t fel�leszteni. Rendszerint ez siker�l is.\n"
 "\n"
-"\n"
-"Ha m�gse m�k�dik, akkor haszn�ld a hardverrel j�r� dokument�ci�t, \n"
-"vagy n�zd meg, hogy a Windows milyennek ismeri fel a k�rty�t (persze, ha \n"
-"van Windows a g�peden), ahogyan ezt a Telep�t�si �tmutat� �rja. Ezeket az \n"
-"opci�kat kell megadnod a driver-nek."
+"Ha m�gsem siker�lne, akkor val�sz�n�leg nem megfelel� param�tereket\n"
+"adt�l meg. Ilyenkor n�zz ut�na a csatol� \"Telep�t�si k�zik�nyv\"-�ben,\n"
+"esetleg a csatol� Gy�rt�j�nak weboldal�n a megfelel� inform�ci�knak."
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:108
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
 "\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"
-"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"
 "\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"
-"You can reach any option using the keyboard: navigate through the "
+"\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 ""
+
+#: ../../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"
-"using Tab and Up/Down arrows. When a partition is selected, you can use:\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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
 "\n"
-"- Ctrl-d  to delete a partition\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"
-"- Ctrl-m  to set the mount point\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"
+msgstr ""
+
+#: ../../help.pm_.c:218
+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 ""
+
+#: ../../help.pm_.c:252
+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:257
+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 ""
-"Most megadhatod, hogy melyik part�ci�kra telep�lj�n a Linux-Mandrake,\n"
-"ha m�r l�teznek a part�ci�k (egy r�gebbi Linuxb�l, vagy ha m�r l�trehoztad\n"
-"�ket valamilyen m�sik part�cion�l� programmal). Ha m�g nincsenek \n"
-"part�ci�id, itt az ideje, hogy l�trehozd �ket. Ez azt jelenti, hogy a\n"
-"fizikai merevlemezt kisebb logikai r�szekre kell osztanod.\n"
+
+#: ../../help.pm_.c:267
+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"
-"Ha �j part�ci�kat kell l�trehoznod, haszn�ld az \"Automatikus allok�l�s\"-t\n"
-"�s a DrakX l�trehozza �ket Neked. A megfelel� merevlemez kiv�laszt�sa a\n"
-"k�vetkez�k valamelyik�re val� kattint�ssal lehets�ges: \"hda\" (els� IDE\n"
-"lemez), \"hdb\" (m�sodik IDE lemez), \"sda\" (els� SCSI lemez), stb.\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"
-"K�t l�nyeges part�ci� a root part�ci� (/), ami a f�jlrendszer k�nyvt�r- \n"
-"hierarchi�j�nak kiindul�pontja, �s a /boot, ami a rendszer indul�s�hoz \n"
-"(boot-ol�s�hoz) sz�ks�ges f�jlokat tartalmazza.\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"
-"Mivel a part�cion�l�s hat�sai maradand�ak �s visszaford�thatatlanok, ez�rt\n"
-"a kev�sb� tapasztalt felhaszn�l�k esetleg tartanak ett�l a m�velett�l.\n"
-"A DiskDrake egyszer�s�ti a m�veletet annak �rdek�ben, hogy ez ne legyen\n"
-"�gy. Sz�nj r� egy kis id�t �s olvasd el a dokument�ci�t, miel�tt\n"
-"hozz�fogn�l.\n"
+"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"El�rhetsz minden opci�t a billenty�zet seg�ts�g�vel is: v�lthatsz a\n"
-"part�ci�k k�z�tt a Tab �s a Fel/Le billenty�kkel. Ha kiv�lasztott�l egy\n"
-"part�ci�t, haszn�lhatod a k�vetkez� kombin�ci�kat:\n"
+"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"- Ctrl-c: �j part�ci� l�trehoz�sa (amikor �res part�ci� van kiv�lasztva)\n"
+"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"- Ctrl-d: part�ci� t�rl�se\n"
+"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
+"\"secondary hard drive\", etc.\n"
 "\n"
-"- Ctrl-m: csatol�si pont be�ll�t�sa\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:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:303
 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."
+"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 ""
-"Minden �jonnan l�trehozott part�ci�t form�zni kell (a form�z�s azt \n"
-"jelenti, hogy egy f�jlrendszert kell r� l�trehozni). Itt az alkalom,\n"
-"hogy esetleg �jraform�zz egyes, kor�bbr�l megmaradt part�ci�kat, hogy\n"
-"a rajtuk lev� adatok t�rl�djenek.\n"
-"Megjegyz�s: nem sz�ks�ges �jraform�zni a m�r l�tez� part�ci�kat, f�leg\n"
-"abban az esetben, ha sz�ks�ged van a r�gi adatokra. Tipikusan ilyenek a\n"
-"/home �s a /usr/local f�jlrendszerek."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
+#, 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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 ""
 "Itt v�laszthatod ki a telep�tend� vagy friss�tend� csomagcsoportokat.\n"
 "\n"
-"A DrakX ellen�rzi, hogy rendelkez�s�re �ll-e el�g hely a telep�t�shez. Ha "
+"A DrakX ellen�rzi, hogy el�g hely �ll-e rendelkez�sre a telep�t�shez. Ha "
 "nem,\n"
 "akkor figyelmeztet. Ha m�gis folytatni akarod a telep�t�st, semmi akad�lya,\n"
-"de a telep�t� ki fogja hagyni az �ltala kev�sb� fontosnak �t�lt csomagokat.\n"
-"A lista alj�n v�laszthatod az \"Egyedi csomagok kiv�laszt�sa\" lehet�s�get, "
-"ebben\n"
+"de a telep�t� ki fogja hagyni az �ltala kev�sb� fontosnak �t�lt csomagokat!\n"
+"A lista alj�n v�laszthatod az \"Csomagok egyedi kiv�laszt�sa\" lehet�s�get, "
+"de ebben\n"
 "az esetben t�bb mint 1000 csomagot kell �tb�ng�szned..."
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:358
+#, 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 ""
 "Ha megvan minden felsorolt CD, kattints az OK-ra.\n"
-"Ha a felsoroltak k�z�l egy CD sem �ll rendelkez�sedre, kattints a M�gsem "
+"Ha a felsoroltak k�z�l egy CD sem �ll rendelkez�sedre, kattints a \"M�gsem\" "
 "gombra.\n"
 "Ha a felsoroltak k�z�l egyes CD-k hi�nyoznak, t�r�ld a kijel�l�s�ket, majd\n"
 "kattints az OK-ra."
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:363
 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."
+"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 ""
-"A kiv�lasztott csomagokat most telep�ti a Telep�t�. Ez a m�velet n�h�ny\n"
-"percig eltarthat. Ez al�l kiv�telt k�pez, ha egy l�tez� rendszert\n"
-"friss�tesz, ebben az esetben a folyamat t�bb id�t vehet ig�nybe."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:371
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"Ha a DrakX nem tudta meghat�rozni az egered t�pus�t, vagy csak ellen�rizni\n"
-"szeretn�d a be�ll�t�st, felaj�nl Neked egy list�t a k�l�nb�z� egerekkel.\n"
-"\n"
-"\n"
-"Ha egyet�rtesz a DrakX be�ll�t�saival, ugorhatsz a k�vetkez� r�szre a bal\n"
-"oldalon l�v� men� seg�ts�g�vel. Ha nem, akkor v�lassz egy egeret a\n"
-"list�b�l, lehet�leg egy olyat, ami k�zel �ll az egered t�pus�hoz.\n"
-"\n"
-"\n"
-"Ha az egered soros portra csatlakozik, meg kell mondanod, hogy melyikre."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
 "K�rlek v�laszd ki a megfelel� portot. P�ld�ul a Windows-os COM1-et Linux "
 "alatt ttyS0-nak h�vj�k."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
+"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"
-"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"
-"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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"Ez a r�sz arra hivatott, hogy seg�tsen be�ll�tani a lok�lis h�l�zatot\n"
-"(LAN) vagy a modemet.\n"
-"\n"
-"V�laszd a \"Lok�lis h�l�zat (LAN)\"-t �s a DrakX megpr�b�lja megkeresni a\n"
-"h�l�zati k�rty�t a g�pedben. A PCI-os k�rty�kat t�bbnyire megtal�lja �s\n"
-"be�ll�tja automatikusan. Ezzel ellent�tben, ha ISA-s k�rty�d van, az\n"
-"automatikus felismer�s nem fog m�k�dni, ekkor k�zzel kell kiv�lasztanod\n"
-"a megfelel� driver-t a megjelen� list�b�l.\n"
-"\n"
-"\n"
-"Mint a SCSI k�rty�n�l, hagyhatod, hogy a driver ismerje fel a hardvert,\n"
-"de ha ez nem m�k�dik, k�zzel kell opci�kat megadnod, amiket megtal�lsz\n"
-"a hardver dokument�ci�j�ban.\n"
-"\n"
-"\n"
-"Ha a Linux-Mandrake-et egy m�r h�l�zathoz k�t�tt g�pre telep�ted, a\n"
-"h�l�zat rendszergazd�ja l�t el a sz�ks�ges inform�ci�kkal (IP-c�m, \n"
-"h�l�zati maszk �s g�pn�v). Ha otthon hozol l�tre egy saj�t h�l�zatot,\n"
-"Neked kell a c�meket kiv�lasztanod.\n"
-"\n"
-"\n"
-"V�laszd a \"Csatlakoz�s modemmel\"-t �s a DrakX megpr�b�lja be�ll�tani a\n"
-"modemet. Ha nem siker�lne neki, add meg a soros portot, amihez a modem\n"
-"csatlakozik."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"Most megadhatod a telefonos Internet csatlakoz�ssal kapcsolatos adatokat.\n"
+"Ha nem vagy benne biztos, hogy mit kell itt megadni, az Internet "
+"szolg�ltat�d\n"
+"val�sz�n�leg tud seg�teni."
+
+#: ../../help.pm_.c:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
 "Add meg:\n"
 "\n"
-"  - az IP-c�met: ha nem tudod, mi az IP-c�med, k�rdezd meg a h�l�zat \n"
+"  - az IP-c�met: ha nem tudod, mi az IP-c�med, k�rdezd meg a h�l�zat\n"
 "adminisztr�tor�t vagy a szolg�ltat�t.\n"
 "\n"
 "\n"
@@ -1703,173 +2208,278 @@ msgstr ""
 "benne biztos, k�rdezd meg a h�l�zat adminisztr�tor�t vagy a szolg�ltat�t.\n"
 "\n"
 "\n"
-"  - automatikus IP-c�m meg�llap�t�s: v�laszd ezt, ha a h�l�zatodon bootp "
-"vagy \n"
+"  - automatikus IP-c�m meg�llap�t�s: v�laszd ezt, ha a h�l�zaton bootp vagy\n"
 "dhcp seg�ts�g�vel kapj�k a g�pek az IP-c�m�ket. Ha ez a helyzet, az "
 "\"IP-c�m\"\n"
 "r�szt �resen hagyhatod. Ha k�ts�geid vannak, k�rdezd meg a h�l�zat \n"
 "adminisztr�tor�t vagy a szolg�ltat�t.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"Ha a h�l�zatod haszn�l \"NIS\"-t, v�laszd ki a \"NIS haszn�lata\" opci�t.\n"
+"Ha nem tudod, hogy a h�l�zaton van-e NIS szolg�ltat�s, k�rdezd meg a\n"
+"h�l�zati adminisztr�tort."
+
+#: ../../help.pm_.c:441
+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:445
 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 ""
-"Most megadhatod a telefonos Internet csatlakoz�soddal kapcsolatos opci�kat.\n"
-"Ha nem vagy benne biztos, hogy mit kell ide be�rni, az Internet "
+"Most megadhatod a telefonos Internet csatlakoz�ssal kapcsolatos adatokat.\n"
+"Ha nem vagy benne biztos, hogy mit kell itt megadni, az Internet "
 "szolg�ltat�d\n"
 "val�sz�n�leg tud seg�teni."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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 ""
-"Ha proxy-kat fogsz haszn�lni, itt az id�, hogy be�ll�tsd �ket. Ha nem \n"
-"tudod, hogy kellene-e proxy-kat haszn�lnod, k�rdezd meg a h�l�zat \n"
+"Ha proxy-(ka)t fogsz haszn�lni, itt az id�, hogy be�ll�tsd �ket. Ha nem\n"
+"tudod, hogy kellene-e proxy-(ka)t haszn�lnod, k�rdezd meg a h�l�zat\n"
 "adminisztr�tor�t vagy az Internet szolg�ltat�t."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
 "A titkos�t�ssal kapcsolatos csomagokat csak akkor tudod feltelep�teni, ha "
 "az\n"
-"Internet kapcsolatod rendesen be van �ll�tva. El�sz�r v�laszd ki, hogy "
-"melyik \n"
-"t�k�rkiszolg�l�r�l szeretn�d let�lteni a csomagokat, majd jel�ld ki magukat "
+"Internet kapcsolatod m�r rendesen be van �ll�tva. El�sz�r v�laszd ki,\n"
+"hogy melyik t�k�rkiszolg�l�r�l szeretn�d let�lteni a csomagokat, majd\n"
+"jel�ld ki magukat a csomagokat.\n"
 "\n"
-"a csomagokat.\n"
 "\n"
 "Figyelj arra, hogy a helyi t�rv�nyeknek megfelel�en v�laszd meg a\n"
 "t�k�rkiszolg�l�t �s a titkos�t�ssal kapcsolatos csomagokat."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "Kiv�laszthatod az id�z�n�t, aszerint, hogy hol �lsz.\n"
 "\n"
 "\n"
-"A Linux GMT, azaz \"Greenwich Mean Time\" szerint kezeli az id�t, majd a\n"
-"megadott id�z�na alapj�n sz�m�tja azt �t helyi id�re."
+"A Linux a GMT, azaz a \"Greenwich Mean Time\" szerint kezeli az id�t, majd\n"
+"az itt megadott id�z�na alapj�n sz�m�tja azt �t helyi id�re."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 ""
-"Itt v�laszthatod ki, hogy a g�p indul�sakor milyen szolg�ltat�sok "
-"induljanak\n"
+"Itt v�laszthatod ki, hogy a g�p indul�sakor milyen szolg�ltat�sok induljanak "
 "el automatikusan.\n"
-"Amikor az eg�r mutat�j�t valamelyik szolg�ltat�s nev�re helyezed, el�bukkan "
-"egy\n"
+"\n"
+"Amikor az eg�r mutat�j�t valamelyik szolg�ltat�s nev�re helyezed,el�bukkan\n"
 "bubor�k, amelyben r�vid ismertet�t olvashatsz r�la.\n"
 "\n"
-"�vatosan b�nj ezzel az opci�val, k�l�n�sen ha kiszolg�l�t telep�tesz,\n"
-"ford�ts k�l�n�s figyelmet arra, hogy ne fusson felesleges szolg�ltat�s a "
+"\n"
+"�vatosan b�nj ezzel az opci�val, k�l�n�sen ha kiszolg�l�t telep�tesz.\n"
+"Ford�ts k�l�n�s figyelmet arra, hogy ne fusson felesleges szolg�ltat�s a "
 "g�pen."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
+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:490
 msgid ""
-"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"
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"A Linux sokf�le nyomtat�t tud kezelni. A t�pust�l f�gg�en m�s �s m�s a\n"
-"telep�t�s menete. Nem szabad figyelmen k�v�l hagyni, hogy a print spooler\n"
-"az 'lp' nevet haszn�lja az alap�rtelmezett nyomtat� nevek�nt, �gy l�tezni\n"
-"kell egy ilyen nev� nyomtat�nak. Adhatsz viszont t�bb nevet is egy\n"
-"nyomtat�nak, ezeket a '|' jellel kell elv�lasztani egym�st�l. Teh�t ha\n"
-"valami �rtelmesebb nevet szeretn�l adni a nyomtat�dnak, egyszer�en �rd\n"
-"azt az els� helyre, p�ld�ul: \"Az �n nyomtat�m|lp\".\n"
-"Az a nyomtat� lesz az alap�rtelmezett, amelyiknek a nevei k�zt szerepel\n"
-"az \"lp\".\n"
+
+#: ../../help.pm_.c:505
+msgid ""
+"GNU/Linux can deal with many types of printer. Each of these types requires\n"
+"a different setup.\n"
 "\n"
 "\n"
-"Ha a nyomtat�d a g�phez van k�tve (a nyomtat�-porton), v�laszd a\n"
-"\"Lok�lis nyomtat�\"-t. Ekkor meg kell mondanod a telep�t�nek, hogy\n"
-"melyik porton van a nyomtat�, valamint ki kell v�lasztanod a megfelel�\n"
-"filtert.\n"
+"If your printer is physically connected to your computer, select \"Local\n"
+"printer\".\n"
 "\n"
 "\n"
-"Ha egy t�voli UNIX g�pre csatlakoztatott nyomtat�t szeretn�l el�rni,\n"
-"v�laszd a \"T�voli lpd\"-t. Ahhoz, hogy ez m�k�dj�n, nem kell\n"
-"felhaszn�l�i nevet vagy jelsz�t megadni, de ismerni kell a t�voli\n"
-"g�pen l�v� nyomtat�sor pontos nev�t.\n"
+"If you want to access a printer located on a remote Unix machine, select\n"
+"\"Remote printer\".\n"
 "\n"
 "\n"
-"Ha egy SMB nyomtat�t k�v�nsz el�rni (ez azt jelenti, hogy a nyomtat� egy\n"
-"t�voli Windows 9x/NT g�phez van k�tve), meg kell adnod a t�voli g�p SMB\n"
-"nev�t (ami nem egyezik meg a TCP/IP-n haszn�lt g�pn�vvel), tov�bb�\n"
-"val�sz�n�leg az IP-c�m�t, valamint egy felhaszn�l�i nevet, a munkacsoport\n"
-"nev�t �s egy jelsz�t, illetve term�szetesen a nyomtat� nev�t is. Ugyanez\n"
-"igaz NetWare nyomtat� eset�n is, azzal a kiv�tellel, hogy nem kell\n"
-"munkacsoportot megadni."
+"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:286
+#: ../../help.pm_.c:521
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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 ""
-"Most kell megadnod a Linux-Mandrake-ed root jelszav�t. Ugyanazt a\n"
-"jelsz�t kell k�tszer be�rnod, ezzel ellen�rz�m, hogy nem g�peled el.\n"
+
+#: ../../help.pm_.c:542
+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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
 "\n"
+"Do not make the password too long or complicated, though: you must be able "
+"to\n"
+"remember it without too much effort."
+msgstr ""
+"Most kell megadnod a Linux-Mandrake-ed root jelszav�t. Ugyanazt a\n"
+"jelsz�t kell k�tszer megadnod, ezzel ellen�rizve, hogy nem g�peled el.\n"
+"\n"
 "A root felhaszn�l� a rendszer adminisztr�tora. � az egyetlen, aki a\n"
-"rendszer be�ll�t�sait megv�ltoztathatja, ez�rt j�l v�laszd meg ezt a\n"
-"jelsz�t.\n"
+"rendszer be�ll�t�sait megv�ltoztathatja, ez�rt j�l v�laszd meg a\n"
+"jelszav�t.\n"
+"\n"
 "A root felhaszn�l�-azonos�t� jogosulatlan haszn�lata nagyon k�ros\n"
 "lehet a rendszer �ps�ge szempontj�b�l, valamint m�s, a h�l�zaton\n"
 "kereszt�l csatlakoz� rendszereket is vesz�lyeztethet. A jelsz�nak\n"
@@ -1878,25 +2488,24 @@ msgstr ""
 "Ezt a jelsz�t SOHA ne �rd le. Ne legyen a jelsz� t�l hossz� vagy t�l\n"
 "bonyolult, hiszen eml�kezned kell r�!"
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
 msgstr ""
-"A rendszer biztons�g�nak n�vel�se �rdek�ben v�laszd ki a \"Shadow f�jl \n"
+"A rendszer biztons�g�nak n�vel�se �rdek�ben v�laszd ki a \"Shadow f�jl\n"
 "alkalmaz�sa\" �s az \"MD5 jelszavak alkalmaz�sa\" opci�kat."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
 msgstr ""
-"Ha a h�l�zatod haszn�l NIS-t, v�laszd ki a \"NIS haszn�lata\" opci�t. Ha nem "
-"\n"
-"tudod, hogy a h�l�zaton van-e NIS szolg�ltat�s, k�rdezd meg a h�l�zati \n"
-"adminisztr�tort."
+"Ha a h�l�zatod haszn�l \"NIS\"-t, v�laszd ki a \"NIS haszn�lata\" opci�t.\n"
+"Ha nem tudod, hogy a h�l�zaton van-e NIS szolg�ltat�s, k�rdezd meg a\n"
+"h�l�zati adminisztr�tort."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1922,50 +2531,48 @@ msgstr ""
 "Most l�trehozhatsz egy vagy t�bb \"mezei\" felhaszn�l�t (azaz olyan\n"
 "felhaszn�l�t, aki a root felhaszn�l�val ellent�tben nem \"privilegiz�lt\").\n"
 "L�trehozhatsz egy vagy t�bb felhaszn�l�i azonos�t�t mindenkinek, aki\n"
-"haszn�lni szeretn� a g�pet. Megjegyz�s: minden felhaszn�l�i azonos�t�hoz\n"
+"haszn�lni szeretn� a g�pet.\n"
+"\n"
+"Megjegyz�s: minden felhaszn�l�i azonos�t�hoz\n"
 "saj�t be�ll�t�sok fognak tartozni (grafikus k�rnyezet, program-be�ll�t�sok,\n"
-"stb.) �s egy saj�t \"home k�nyvt�r\", ahol ezek a be�ll�t�sok el vannak\n"
+"stb.) �s egy saj�t \"home k�nyvt�r\", ahol ezek a be�ll�t�sok el lesznek\n"
 "t�rolva.\n"
 "\n"
-"\n"
 "El�sz�r is hozz l�tre egy felhaszn�l�i azonos�t�t saj�t magadnak! Akkor is,\n"
-"ha Te leszel az egyetlen felhaszn�l� a g�pen. NE haszn�ld a root\n"
-"azonos�t�t a mindennapi teend�idhez: ez nagyon vesz�lyes, a teljes\n"
-"rendszer haszn�lhatatlann� t�tele sokszor csak egy apr� elg�pel�sen m�lik.\n"
+"ha Te leszel az egyetlen felhaszn�l� a g�pen.\n"
 "\n"
+"NE haszn�ld a root azonos�t�t a mindennapi teend�idhez!\n"
+"Ez nagyon vesz�lyes, a teljes rendszer haszn�lhatatlann� t�tele sokszor\n"
+"csak egy apr� elg�pel�sen m�lik.\n"
 "\n"
 "Ez�rt alapesetben a most l�trehozand� azonos�t�val l�pj be, �s a root\n"
 "felhaszn�l�-azonos�t�t csak adminisztr�ci�s c�lokra illetve a rendszer\n"
 "karbantart�s�ra haszn�ld."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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�rlek v�laszolj \"Igen\"-nel! Ha p�ld�ul k�s�bb telep�ted a Microsoft \n"
-"Windows-t, az fel�l�rja a boot szektort. Ha ilyen esetben nincs boot\n"
-"floppy-d, nem tudod t�bb� elind�tani a Linuxot!"
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
-"Itt meg kell adnod, hogy hova ker�lj�n a Linux boot-ol�s�hoz sz�ks�ges \n"
+"Itt meg kell adnod, hogy hova ker�lj�n a Linux boot-ol�s�hoz sz�ks�ges\n"
 "inform�ci�.\n"
 "\n"
 "\n"
 "Hacsak nem tudod nagyon pontosan, hogy mit teszel, v�laszd a\n"
 "\"Lemez els� szektora (MBR)\"-t."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1974,10 +2581,10 @@ msgstr ""
 "(ez a \"master\" meghajt� az els� IDE csatorn�n) vagy a \"/dev/sda\" -t\n"
 "(els� SCSI diszk)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1992,15 +2599,16 @@ msgstr ""
 "a g�pedre. J� esetben a telep�t� megtal�lja �s be�ll�tja ezeket az\n"
 "oper�ci�s rendszereket. Ha m�gsem ez a helyzet, k�zzel kell megadnod\n"
 "n�h�ny param�tert a k�vetkez� k�perny�n. Figyelj arra, hogy j� adatokat\n"
-"adj�l meg.\n"
-"\n"
+"adj meg.\n"
 "\n"
 "Az is el�fordulhat, hogy nem akarsz hozz�f�r�st biztos�tani a t�bbi\n"
 "oper�ci�s rendszerhez b�rki sz�m�ra, ekkor t�r�ld a megfelel� bejegyz�st\n"
 "a list�b�l.\n"
+"\n"
 "Ebben az esetben csak ind�t�lemezzel ind�thatod a k�rd�ses op. rendszereket!"
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -2017,7 +2625,9 @@ msgid ""
 "\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."
 msgstr ""
 "A LILO �s a grub f�bb opci�i:\n"
@@ -2027,9 +2637,11 @@ msgstr ""
 "\n"
 "  - K�sleltet�s az alap�rtelmezett image bet�lt�se el�tt: megadja\n"
 "(tizedm�sodpercben), hogy a boot loader mennyi id�t v�rjon, miel�tt\n"
-"bet�lti az els� image-et. Ez azokn�l a rendszerekn�l hasznos, amelyek a\n"
-"billenty�zet bekapcsol�sa ut�n azonnal a merevlemezr�l boot-olnak. A boot\n"
-"loader nem v�r, ha a k�sleltet�si opci� nincs megadva vagy az �rt�ke 0.\n"
+"bet�lti az alap�rtelmezett image-et. Ez azokn�l a rendszerekn�l hasznos,\n"
+"amelyek a billenty�zet bekapcsol�sa ut�n azonnal a merevlemezr�l "
+"boot-olnak.\n"
+"A boot loader nem v�r, ha a k�sleltet�si opci� nincs megadva vagy az �rt�ke "
+"0.\n"
 "\n"
 "\n"
 "  - Videom�d: azt �ll�tja be, hogy milyen VGA sz�veges �zemm�dban induljon\n"
@@ -2037,10 +2649,64 @@ msgstr ""
 "      * norm�l: norm�l 80x25-�s sz�veges m�d\n"
 "      * <sz�m>: a megfelel� sz�veges m�dot haszn�lja"
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 ""
+"A SILO oper�ci�srendszer-bet�lt� SPARC-hoz:\n"
+"Be tud t�lteni Linuxot vagy b�rmely m�s oper�ci�s rendszert, ami telep�tve\n"
+"van a g�pedre. J� esetben a telep�t� megtal�lja �s be�ll�tja ezeket az\n"
+"oper�ci�s rendszereket. Ha m�gsem ez a helyzet, k�zzel kell megadnod\n"
+"n�h�ny param�tert a k�vetkez� k�perny�n. Figyelj arra, hogy j� adatokat\n"
+"adj meg.\n"
+"\n"
+"\n"
+"Az is el�fordulhat, hogy nem akarsz hozz�f�r�st biztos�tani a t�bbi\n"
+"oper�ci�s rendszerhez b�rki sz�m�ra, ekkor t�r�ld a megfelel� bejegyz�st\n"
+"a list�b�l.\n"
+"Ebben az esetben csak ind�t�lemezzel ind�thatod a k�rd�ses op. rendszereket!"
+
+#: ../../help.pm_.c:692
+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 SILO f�bb opci�i:\n"
+"\n"
+"  - Rendszerbet�lt� telep�t�s: Jelzi, hov� akarod elhelyezni a Linux\n"
+"indul�s�hoz sz�ks�ges inform�ci�kat. Hacsak nem tudod nagyon pontosan,\n"
+"hogy mit teszel, v�laszd a \"Lemez els� szektora (MBR)\"-t.\n"
+"\n"
+"  - K�sleltet�s az alap�rtelmezett image bet�lt�se el�tt: megadja\n"
+"(tizedm�sodpercben), hogy a boot loader mennyi id�t v�rjon, miel�tt\n"
+"bet�lti az alap�rtelmezett image-et. Ez azokn�l a rendszerekn�l hasznos,\n"
+"amelyek a billenty�zet bekapcsol�sa ut�n azonnal a merevlemezr�l "
+"boot-olnak.\n"
+"A boot loader nem v�r, ha a k�sleltet�si opci� nincs megadva vagy az �rt�ke "
+"0."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2054,78 +2720,83 @@ msgstr ""
 "El�rkezett az ideje, hogy be�ll�tsd a Linuxos grafikus k�rnyezet\n"
 "magj�t, az X Window Rendszert. Ehhez be kell �ll�tanod a videok�rty�dat\n"
 "�s a monitorodat. Ez t�bbnyire automatikusan zajlik, ez�rt Neked\n"
-"�ltal�ban csak el kell fogadnod a felaj�nlott be�ll�t�sokat :)\n"
+"�ltal�ban csak el kell fogadnod a felaj�nlott be�ll�t�sokat. :-)\n"
 "\n"
 "\n"
 "Amikor befejezed a be�ll�t�st, a DrakX elind�tja az X-et (hacsak nem k�red,\n"
 "hogy hagyja ki ezt a l�p�st), �gy ellen�rizni tudod, hogy j�l m�k�dik-e.\n"
-"Ha valami gond lenne a be�ll�t�ssal, mindig vissza tudsz l�pni ebbe a\n"
+"Ha valami gond lenne a be�ll�t�ssal, mind�g vissza tudsz l�pni ebbe a\n"
 "men�be �s kipr�b�lhatsz m�s �rt�keket is, ah�nyszor csak akarsz."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
 msgstr ""
-"Ha valami nem j� az X konfigur�ci�j�ban, haszn�ld ezeket az opci�kat �s \n"
+"Ha valami nem j� az X konfigur�ci�j�ban, haszn�ld ezeket az opci�kat �s\n"
 "jav�tsd ki a hib�t."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
 msgstr ""
 "Ha grafikus fel�leten szeretn�l bejelentkezni, v�laszd az \"Igen\"-t, "
-"m�sk�ppen\n"
+"egy�bk�nt meg\n"
 "v�laszd a \"Nem\"-et."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\n"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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"
+"\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."
 msgstr ""
-"Itt a rendszered tov�bbi opci�it �ll�thatod be.\n"
+"Most a rendszered tov�bbi opci�it �ll�thatod be.\n"
 "\n"
-"  - Merevlemez-meghajt� optimaliz�l�sa: Ez az opci� n�velheti a lemez\n"
-"    teljes�tm�ny�t, de csak halad� felhaszn�l�knak aj�nlott: ha hib�s\n"
-"    a chipset-ed, adatveszt�s l�phet fel.\n"
+"  - Merevlemez-meghajt� optimaliz�l�sa: Ez az opci� n�velheti a merevlemez\n"
+"    teljes�tm�ny�t, de csak halad� felhaszn�l�knak aj�nlott:\n"
+"    ha hib�s a chipset-ed, adatveszt�s l�phet fel.\n"
 "    Megjegyz�s: a kernelben van egy lista ezekr�l a hib�s chipset-ekr�l\n"
 "    �s lemezekr�l, de ha el akarod ker�lni a rossz meglepet�seket,\n"
 "    ink�bb ne kapcsold be ezt az opci�t.\n"
 "\n"
-"  - Biztons�gi szint kiv�laszt�sa: Itt v�laszthatod ki a rendszered \n"
+"  - Biztons�gi szint kiv�laszt�sa: Itt v�laszthatod ki a rendszered\n"
 "    biztons�gi szintj�t.\n"
 "    Tov�bbi inform�ci�kat a k�zik�nyvben tal�lsz.\n"
 "    Ha nem tudod, hogy mit szeretn�l, v�laszd a \"K�zepes\" szintet.\n"
@@ -2134,24 +2805,24 @@ msgstr ""
 "    Ha root akarsz lenni, be kell l�pned egy mezei felhaszn�l�k�nt, majd\n"
 "    kiadni a \"su\" parancsot. L�nyeg�ben, ha ezt az opci�t v�lasztod,\n"
 "    k�sz�lj fel r�, hogy csak kiszolg�l�nak lesz j� a Linuxod.\n"
-"    �n figyelmeztettelek.\n"
+"    �n figyelmeztettelek!\n"
 "\n"
-"  - Fizikai RAM m�rete: sajnos a mai PC-s vil�gban nincs szabv�nyos m�dszer\n"
-"    a RAM mennyis�g�nek lek�rdez�s�re. Ez�rt a Linux nem mindig tudja\n"
+"  - Fizikai RAM m�rete: sajnos a mai PC-s vil�gban nincs egys�ges m�dszer\n"
+"    a RAM mennyis�g�nek lek�rdez�s�re. Ez�rt a Linux nem mind�g tudja\n"
 "    meg�llap�tani, hogy mennyi mem�ria van a g�pben. Ha ez a helyzet,\n"
 "    add meg a helyes m�retet. Megjegyz�s: ha az elt�r�s csak 2 vagy 4 MB\n"
 "    (a val�di �s az automatikusan be�ll�tott mennyis�g k�z�tt), az\n"
-"    norm�lisnak tekinthet�.\n"
+"    m�g norm�lisnak tekinthet�.\n"
 "\n"
 "  - Elt�vol�that� m�dia automatikus mount-ol�sa: ha nem szeretn�d minden\n"
 "    esetben k�zzel mount-olni a cser�lhet� m�di�kat (floppy, CD, Zip), ezt\n"
 "    az opci�t Neked tal�lt�k ki.\n"
 "\n"
-"  - Num Lock bekapcsol�sa boot-ol�skor: Ha azt szeretn�d, hogy a Num Lock \n"
-"    bekapcsolt �llapotban legyen boot-ol�s ut�n, v�laszd ezt az opci�t. \n"
-"    (Megjegyz�s: A Num Lock vagy m�k�dik X alatt, vagy nem.)"
+"  - Num Lock bekapcsol�sa boot-ol�skor: Ha azt szeretn�d, hogy a Num Lock\n"
+"    bekapcsolt �llapotban legyen boot-ol�s ut�n, v�laszd ezt az opci�t.\n"
+"    (Megjegyz�s: A \"Num Lock\" vagy m�k�dik X alatt, vagy nem.)"
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2165,333 +2836,373 @@ msgstr ""
 "Ha ink�bb egy m�sik, kor�bban telep�tett oper�ci�s rendszert szeretn�l\n"
 "ind�tani, olvasd el a tov�bbi utas�t�sokat is."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "V�lassz nyelvet"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "V�lassz telep�t�si m�dot"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Merevlemez keres�se"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Eg�r be�ll�t�sa"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Billenty�zet kiv�laszt�sa"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Egyebek"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "F�jlrendszerek be�ll�t�sa"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Part�ci�k form�z�sa"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Csomagok kiv�laszt�sa"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Rendszer telep�t�se"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "H�l�zat be�ll�t�sa"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Titkos�t�s"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Id�z�na be�ll�t�sa"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Szolg�ltat�sok be�ll�t�sa"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Nyomtat� be�ll�t�sa"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
-msgstr "root jelsz� be�ll�t�sa"
+msgstr "Root jelsz� be�ll�t�sa"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Felhaszn�l� hozz�ad�sa"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Ind�t�lemez k�sz�t�se"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Bootmanager telep�t�se"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Az X be�ll�t�sa"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Automatikus telep�t�lemez"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Kil�p�s a telep�t�b�l"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Olvas�si hiba a $f f�jln�l"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "Teszteld le az egeret"
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Teszteld le az egeret"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+"N�melyik harver a rendszereden speci�lis driver-t ig�nyel m�k�d�s�hez.\n"
+"Inform�ci�k : %s"
+
+#: ../../install_interactive.pm_.c:41
 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 ""
-"Kell, hogy legyen root part�ci�d.\n"
-"Ehhez hozz�l l�tre egy part�ci�t (vagy kattints egy megl�v�re).\n"
-"Ezek ut�n add meg mount-ol�si pontnak a `/'-t."
+"Felt�tlen kell, hogy legyen root part�ci�d.\n"
+"Hozz l�tre egy part�ci�t (vagy kattints egy megl�v�re).\n"
+"Ut�na add meg mount-ol�si pontnak a `/'-t."
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Nem tudom beolvasni a part�ci�s t�bl�t, t�ls�gosan el van rontva :(\n"
-"Megpr�b�lom t�r�lni a rossz part�ci�kat"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "Kell egy swap part�ci� a m�k�d�shez"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"A DiskDrake nem tudta rendesen beolvasni a part�ci�s t�bl�t.\n"
-"Folytat�s saj�t felel�ss�gedre!"
+"Nincs swap part�ci�d.\n"
+"\n"
+"Ett�l f�ggetlen�l folytassam?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Root part�ci� keres�se."
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Szabad ter�let haszn�lata"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Inform�ci�"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "Nincs el�g szabad ter�let �j part�ci� l�trehoz�s�hoz"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: Ez nem egy root part�ci�, v�lassz m�sikat."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "M�r l�tez� part�ci� haszn�lata"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Root part�ci� nem tal�lhat�"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "Nincs olyan m�r l�tez� part�ci�, amit haszn�lhatn�k"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Nem lehet broadcast-ot haszn�lni NIS tartom�ny n�lk�l"
+#: ../../install_interactive.pm_.c:87
+#, fuzzy
+msgid "Use the Windows partition for loopback"
+msgstr "A loopbackhez A FAT part�ci� haszn�lata"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Olvas�si hiba: $f"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Melyik part�ci�ra szeretn�d a Linux4Win-t telep�teni?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Hiba t�rt�nt, de nem tudom sz�pen kezelni :(\n"
-"Folytat�s saj�t felel�ss�gedre."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Add meg a m�reteket"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "A %s mount pont k�tszer van megadva"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "A root part�ci� m�rete MB-ban: "
 
-#: ../../install_steps.pm_.c:323
-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 ""
-"N�h�ny fontos csomagot nem tudtam telep�teni.\n"
-"Ez azt jelenti, hogy vagy a CD-ROM meghajt�d, vagy a CD lemez\n"
-"hib�s. A CD lemezt egy, m�r feltelep�tett g�pen a k�vetkez�\n"
-"parancs seg�ts�g�vel tesztelheted:\n"
-"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Swap part�ci� (lapoz� ter�let) m�rete MB-ban: "
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "�dv, itt a(z) %s"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "A Windows part�ci�n l�v� szabad hely haszn�lata"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Nincs el�rhet� floppy-meghajt�"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Melyik part�ci�t szeretn�d �tm�retezni?"
+
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr ""
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+# msgstr "A Windows f�jlrendszer bounds kisz�m�t�sa"
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "K�vetkez� l�p�s: `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"A FAT �tm�retez� nem tudja kezelni a part�ci�t.\n"
+"A k�vetkez� hiba keletkezett : %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "Kell egy swap part�ci� is"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr "A FAT part�ci� t�lzottan t�redezett. Haszn�ld a `defrag'-ot el�bb"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"Nincs swap part�ci�d.\n"
+"FIGYELEM!\n"
 "\n"
-"Ett�l f�ggetlen�l folytassam?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Add meg a rendszer m�ret�t"
+"A DrakX most �tm�retezi a Windows-os part�ci�t. Vigy�zz, ez a m�velet\n"
+"vesz�lyes. Ha m�g nem tetted meg, futtasd le a scandisk-et a Windows-os\n"
+"part�ci�n (esetleg a defrag-ot is). Ehhez ki kell l�pned a telep�t�b�l.\n"
+"Mentsd le az adatokat, majd ind�tsd �jra a telep�t�t.\n"
+"Ha tudod, hogy mit teszel, nyomd meg az \"OK\"-ot."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "�sszm�ret: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "Mekkora helyet akarsz a Windows-nak fenntartani?"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "Verzi�: %s\n"
+msgid "partition %s"
+msgstr "%s part�ci�"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "M�ret: %d KB\n"
+msgid "FAT resizing failed: %s"
+msgstr "A FAT �tm�retez�s sikertelen: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "V�laszd ki a telep�tend� csomagokat"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+"Az �tm�retezni k�v�nt part�ci� nem FAT t�pus�, esetleg egy loopback "
+"haszn�lja (vagy nincs el�g hely)"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "Teljes lemez t�rl�se"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Telep�t�s"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "A Windows elt�vol�t�sa"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Telep�t�s"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr "T�bb merevlemezed van! Melyikre telep�tsem a Linux-ot?"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "K�rem v�rjon, "
+#: ../../install_interactive.pm_.c:156
+#, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "MINDEN l�tez� part�ci� �s rajtuk minden adat elv�sz a %s meghajt�n"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "H�tral�v� id� "
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "Halad� m�d"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "�sszid� "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "diskdrake haszn�lata"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Telep�t�s el�k�sz�t�se"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "fdisk haszn�lata"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "%s csomag telep�t�se"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Most a %s part�cion�l�sa folyik.\n"
+"Ha k�sz, ne felejtsd el elmenteni a v�ltoz�sokat a \"w\"-vel"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Ett�l f�ggetlen�l folytassam?"
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "A Windows part�ci�n l�v� szabad hely haszn�lata"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Hiba t�rt�nt a csomagok rendez�sekor:"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Nem hozhat� l�tre t�bb part�ci�"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Haszn�ljam a m�r megl�v� X11 be�ll�t�sokat?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "A DrakX Part�cion�l� var�zsl�ja a k�vetkez�k�ppen d�nt�tt:"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "K�rlek v�lassz a k�vetkez� telep�t�si m�dok k�z�l:"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Hiba a part�cion�l�sban: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Nincs egyetlen Windows-os part�ci�d sem!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "H�l�zat ind�t�sa"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Nincs el�g hely az Lnx4win sz�m�ra"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "H�l�zat le�ll�t�sa"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"FIGYELEM!\n"
-"\n"
-"DrakX most �jram�retezi a Windows-os part�ci�t. Vigy�zz, ez a m�velet \n"
-"vesz�lyes. Ha m�g nem tetted meg, futtasd le a scandisk-et a Windows-os \n"
-"part�ci�n (esetleg a defrag-et is). Ehhez ki kell l�pned a telep�t�b�l. \n"
-"Mentsd le az adatokat, majd ind�tsd �jra a telep�t�t.\n"
-"Ha tudod, hogy mit teszel, nyomd meg az OK-t."
+"Hiba t�rt�nt, de nem tudom norm�lisan lekezelni :-(\n"
+"Folytat�s csak saj�t felel�ss�gedre!"
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Az automatikus �tm�retez�s nem siker�lt"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "A %s mount pont k�tszer van megadva"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Melyik part�ci�ra szeretn�d a Linux4Win-t telep�teni?"
+#: ../../install_steps.pm_.c:375
+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 ""
+"N�h�ny fontos csomagot nem tudtam telep�teni.\n"
+"Ez azt jelenti, hogy vagy a CD-ROM meghajt�d, vagy a CD lemez\n"
+"hib�s. A CD lemezt egy, m�r feltelep�tett g�pen a k�vetkez�\n"
+"parancs seg�ts�g�vel tesztelheted:\n"
+"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Add meg a m�reteket"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "�dv, itt a(z) %s"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "A root part�ci� m�rete MB-ban: "
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Nincs el�rhet� floppy-meghajt�"
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Swap part�ci� (lapoz� ter�let) m�rete MB-ban: "
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "A k�vetkez� l�p�s: `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"A rendszer gyenge er�forrr�sokkal rendelkezik. Val�sz�n�leg probl�m�id\n"
+"lesznek a Linux-Mandrake telep�t�s�vel. Pr�b�lkozz a \"Sz�veges m�d�\n"
+"telep�t�s\"-el. Nyomj \"F1\"-et bootol�skor, majd add meg: \"text\"."
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "V�lassz a k�vetkez� telep�t�si m�dok k�z�l:"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "Az �ltalad kiv�lasztott csomagcsoportok �sszm�rete kb. %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2502,11 +3213,11 @@ msgstr ""
 "Ha enn�l kevesebb helyet sz�nsz a rendszernek,\n"
 "adj meg egy sz�zal�kos �rt�ket.\n"
 "\n"
-"Ha alacsony sz�zal�kot adsz meg, akkor a kiv�lasztott csomagok k�z�l\n"
+"Ha alacsony �rt�ket adsz meg, akkor a kiv�lasztott csomagok k�z�l\n"
 "csak a fontosabbak ker�lnek telep�t�sre; ha 100%%-ot adsz meg,\n"
 "a DrakX minden kijel�lt csomagot telep�t."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2521,108 +3232,192 @@ msgstr ""
 "v�ltoztasd meg a kijelzett sz�zal�k �rt�k�t.\n"
 "Ha alacsony sz�zal�k-�rt�ket adsz meg, a telep�t� csak a\n"
 "legfontosabb csomagokat telep�ti; ha hagyod a %d%%-ot,\n"
-"a lehet� legt�bb csomag ker�l telep�t�sre."
+"a lehet� legt�bb csomag telep�t�sre ker�l."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "R�szletesebben v�logathatsz a k�vetkez� l�p�s r�szek�nt."
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Telep�tend� csomagok sz�zal�ka"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "V�laszd ki a telep�tend� csomagokat"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Telep�t�s"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Automatikus f�gg�s�gek"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
-msgstr "Fa lenyit�sa"
+msgstr "Fa kibont�sa"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
-msgstr "Fa felcsuk�sa"
+msgstr "Fa bez�r�sa"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "V�lt�s sima �s csoportok szerint rendezett n�zet k�z�tt"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Rossz csomag"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "N�v: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Verzi�: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "M�ret: %d kB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Fontoss�g: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "�sszm�ret: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+"Nem v�laszthatod ki ezt a csomagot, mert nincs el�g hely a merevlemezen."
+
+#: ../../install_steps_gtk.pm_.c:386
+msgid "The following packages are going to be installed"
+msgstr "A telep�t� a k�vetkez� csomagokat fogja telep�teni"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "A telep�t� a k�vetkez� csomagokat t�vol�tja el"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Ez a csomag nem jel�lhet� ki illetve nem t�r�lhet� a kijel�l�se"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
-msgstr "Ez egy k�telez�en telep�tend� csomag, nem lehet elt�vol�tani."
+msgstr "Ez egy k�telez�en telep�tend� csomag, nem lehet elt�vol�tani"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr ""
-"Nem tudod t�r�lni ennek a csomagnak a kijel�l�s�t, mert m�r telep�tve van."
+"Nem tudod t�r�lni ennek a csomagnak a kijel�l�s�t, mert m�r telep�tve van"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
-"Ezt a csomagot friss�teni kell\n"
+"Ezt a csomagot friss�teni kell!\n"
 "Biztos, hogy t�r�lni akarod a kijel�l�s�t?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr ""
-"Nem t�r�lheted ennek a csomagnak a kijel�l�s�t. Ez a csomag friss�tend�."
-
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-"Nem v�laszthatod ki ezt a csomagot, mert nincs el�g hely a merevlemezen."
+"Nem t�r�lheted ennek a csomagnak a kijel�l�s�t. Ez a csomag friss�tend�!"
 
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "A telep�t� a k�vetkez� csomagokat telep�ti/t�vol�tja el"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "Ez a csomag nem jel�lhet� ki illetve nem t�r�lhet� a kijel�l�se."
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Telep�t�s"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Megsaccolom..."
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "K�rem v�rjon, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "H�tral�v� id� "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "�sszid� "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "M�gsem"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Telep�t�s el�k�sz�t�se"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d csomag"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "A %s csomag telep�t�se"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "Elfogad"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2633,204 +3428,414 @@ msgid ""
 msgstr ""
 "Cser�ld ki a CD-t a meghajt�ban!\n"
 "\n"
-"Tedd be a(z) \"%s\" felirat� lemezt, �s nyomd meg az OK gombot.\n"
-"Ha nincs ilyen lemezed, nyomd meg a M�gsem gombot, �gy err�l a CD-r�l\n"
+"Tedd be a(z) \"%s\" felirat� lemezt, �s nyomd meg az \"Ok\" gombot.\n"
+"Ha nincs ilyen lemezed, nyomd meg a \"M�gsem\" gombot, �gy err�l a CD-r�l\n"
 "nem t�rt�nik telep�t�s."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "Elutas�t"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Ett�l f�ggetlen�l folytassam?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Hiba t�rt�nt a csomagok rendez�sekor:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Hiba t�rt�nt a csomagok telep�t�sekor:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Hiba l�pett fel"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "V�lassz nyelvet."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Billenty�zet"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "V�lassz billenty�zetkioszt�st."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr "V�laszthatsz m�s nyelvet is, ez a telep�t�s ut�n lesz el�rhet�."
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Root part�ci�"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "Mind"
 
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Melyik a root part�ci� (/) a rendszereden?"
-
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Telep�t�si m�d"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Melyik telep�t�si m�dot v�lasztod?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Telep�t�s/Friss�t�s"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr "Telep�t�s vagy friss�t�s?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
+msgstr "Telep�t�s vagy Helyre�ll�t�s?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Automatikus"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Javasolt"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Egyedi"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Halad�"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
-"Biztos vagy benne, hogy halad� vagy? \n"
-"Hat�kony de vesz�lyes dolgokat enged�lyezek ezzel az opci�val."
+"Biztos hogy \"Profi\" vagy?\n"
+"Amennyiben Igen a v�laszod, komoly �s esetleg vesz�lyes k�rd�sek v�rnak "
+"r�d.\n"
+"Ilyen k�rd�seket fogsz kapni, hogy: \"Shadow f�jl alkalmaz�sa "
+"ajelszavakhoz?\"\n"
+"Akarsz (�s tudsz) ilyen k�rd�sekre v�laszolni?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Friss�t�s"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Szok�sos"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "Munka�llom�s"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Fejleszt�"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Szerver"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+#, fuzzy
+msgid "What is your system used for?"
 msgstr "Milyen c�lra szeretn�d haszn�lni a g�pet?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
-msgstr "Jel�ld meg az eg�r t�pus�t."
+msgstr "Jel�ld meg az egered t�pus�t."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Eg�r port"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "V�laszd ki, hogy melyik soros porthoz csatlakozik az egered."
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "PCMCIA k�rty�k be�ll�t�sa..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "IDE be�ll�t�sok"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "nincs el�rhet� part�ci�"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%d MB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "V�laszd ki a root part�ci�t."
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "V�laszd ki a mount pontokat"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Nem tudom olvasni a part�ci�s t�bl�t, vagy t�l rossz sz�momra :-(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Beleegyezel hogy elvesszen az �sszes part�ci�?\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"A DiskDrake nem tudta rendesen beolvasni a part�ci�s t�bl�t.\n"
+"Folytat�s csak saj�t felel�ss�gedre!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Root part�ci�"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Melyik a root part�ci� (/) a rendszereden?"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
-"�jra kell ind�tanod a g�pet, hogy a part�ci�s t�bla v�ltoz�sai �rv�nyre \n"
+"�jra kell ind�tanod a g�pet, hogy a part�ci�s t�bla v�ltoz�sai �rv�nyre\n"
 "jussanak"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "V�laszd ki a form�zand� part�ci�kat"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Ellen�rizzem a rossz blokkokat?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "A part�ci�k form�z�sa"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "%s f�jl l�trehoz�sa �s form�z�sa"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Elfogyott a swap ter�let, n�veld meg a telep�t�s befejez�s�hez"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
-msgstr "Az el�rhet� csomagok keres�se"
+msgstr "A rendelkez�sre �ll� csomagok keres�se"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "A friss�tend� csomagok keres�se"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr "A rendszereden nem maradt el�g hely a telep�t�shez vagy friss�t�shez"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
+msgstr ""
+"A rendszereden nem maradt el�g hely a telep�t�shez vagy friss�t�shez (%d > "
+"%d)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "Teljes (%d MB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "Minim�lis (%d MB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Javasolt (%d MB)"
+
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "Egyedi"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Add meg a rendszer m�ret�t"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Csomag-csoportok kiv�laszt�sa"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
-msgstr "Egyedi csomagok kiv�laszt�sa"
+msgstr "Csomagok egyedi kiv�laszt�sa"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 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 ""
-"Ha megvan minden felsorolt CD, kattints az OK-ra.\n"
+"Ha megvan minden felsorolt CD, kattints az Ok-ra.\n"
 "Ha a felsoroltak k�z�l egy CD sem �ll rendelkez�sedre, kattints a M�gsem "
 "gombra.\n"
 "Ha a felsoroltak k�z�l egyes CD-k hi�nyoznak, t�r�ld a kijel�l�s�ket, majd\n"
-"kattints az OK-ra."
+"kattints az Ok-ra."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "A \"%s\" c�mk�j� CD-ROM"
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2838,172 +3843,11 @@ msgstr ""
 "A %s csomag telep�t�se\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Telep�t�s ut�ni be�ll�t�sok"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "A jelenlegi IP be�ll�t�s megtart�sa"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "A h�l�zat �jrakonfigur�l�sa"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Ne �ll�tsd be a h�l�zatot"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "H�l�zati be�ll�t�s"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "A lok�lis h�l�zat m�r be van �ll�tva. Szeretn�d:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Szeretn�d be�ll�tani a lok�lis h�l�zatot a rendszeren?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "nem tal�ltam h�l�zati k�rty�t"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "A modem be�ll�t�sai"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "Szeretn�l be�ll�tani modemes csatlakoz�st a rendszeren?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "%s h�l�zati csatol� be�ll�t�sa"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"K�rlek add meg a g�p IP be�ll�t�sait.\n"
-"Minden mez�be IP-c�met �rj�l pontozott decim�lis form�tumban\n"
-"(pl.: 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Automatikus IP-c�m"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP-c�m:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "H�l�zati maszk:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP-c�m, a form�tuma 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "H�l�zat be�ll�t�sa"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"�rd be a g�p nev�t.\n"
-"A teljes nevet kell be�rnod, pl.: ``mybox.mylab.myco.com''.\n"
-"Be�rhatod m�g az �tj�r�d (gateway) IP-c�m�t is, ha van ilyened."
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS szerver:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "�tj�r�-eszk�z:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "�tj�r� (gateway):"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "G�pn�v:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Megkeressem a modemet?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "V�laszd ki, hogy melyik soros porthoz csatlakozik a modemed."
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Modemes csatlakoz�s be�ll�t�sai"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Csatlakoz�s neve"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Telefonsz�m"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Felhaszn�l�i n�v"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Autentik�ci�"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Szkript-tel"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Termin�lon kereszt�l"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Tartom�nyn�v"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Els�dleges n�vkiszolg�l�"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "M�sodlagos n�vkiszolg�l�"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3056,11 +3900,11 @@ msgstr ""
 "felhaszn�l� nem tartja be ezeket a t�rv�nyeket, s�lyos b�ntet�s szabhat� ki "
 "r�.\n"
 "\n"
-"A Mandrakesoft, a gy�rt�i, vagy a sz�ll�t�i semmilyen k�r�lm�nyek k�z�tt "
+"A Mandrakesoft, a gy�rt�k, vagy a sz�ll�t�k semmilyen k�r�lm�nyek k�z�tt "
 "sem\n"
 "tehet�k felel�ss� azon speci�lis, k�zvetett vagy j�rul�kos k�rok "
 "keletkez�s��rt\n"
-"(bele�rtve, de nem kiz�r�lagosan, a k�vetkez�k: profitvesztes�g, "
+"(bele�rtve, de nem kiz�r�lagosan, a k�vetkez�ket: profitvesztes�g, "
 "�zletmenetben\n"
 "bek�vetkezett zavarok, kereskedelmi adatok veszt�se, valamint b�rmilyen m�s\n"
 "anyagi k�r �s esetleges b�r�s�g �ltal meg�t�lt k�rt�r�t�s), amik azon\n"
@@ -3076,90 +3920,96 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "V�lassz t�k�rkiszolg�l�t, ahonnan let�lt�d a csomagokat"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 "Kapcsolatfelv�tel a t�k�rkiszolg�l�val, el�rhet� csomagok list�j�nak "
 "let�lt�se"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "V�laszd ki a telep�tend� csomagokat."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
+#, fuzzy
 msgid "Which is your timezone?"
-msgstr "Melyik id�z�n�ban vagy?"
+msgstr "Milyen c�lra szeretn�d haszn�lni a g�pet?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "A hardver-�r�d GMT id�t mutat?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "Milyen part�ci�-t�pust szeretn�l?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Nincs jelsz�"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "\"Shadow\" f�jl alkalmaz�sa"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "MD5 jelszavak alkalmaz�sa"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "NIS haszn�lata"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "yellow pages"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
-msgstr "Ez a jelsz� t�l egyszer� (legal�bb %d karakter kell)"
+msgstr "Ez a jelsz� t�l egyszer� (legal�bb %d karaktert adj meg)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "NIS azonos�t�s"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS tartom�ny"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS szerver"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
-msgstr "Felhaszn�l� felv�tele"
+msgstr "Felhaszn�l� elfogad�sa"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Felhaszn�l� hozz�ad�sa"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(m�r hozz�adtam %s -t)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3169,61 +4019,88 @@ msgstr ""
 "Adj meg egy felhaszn�l�t\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
-msgstr "Igazi n�v"
+msgstr "Val�di n�v"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Felhaszn�l�n�v"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Ez a jelsz� t�l egyszer�"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "K�rlek �rj be egy felhaszn�l�nevet"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
-"A felhaszn�l�n�v a k�vetkez�ket tartalmazhatja: kisbet�k, sz�mok, `-' �s `_'"
+"A felhaszn�l�n�v a k�vetkez�ket tartalmazhatja: kisbet�k, sz�mok, \"-\" "
+"�s\"_\""
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "M�r van ilyen felhaszn�l�n�v"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+#, fuzzy
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Az ind�t�lemez lehet�v� teszi, hogy elind�tsd a Linux oper�ci�s rendszert\n"
+"a bootmanager n�lk�l. Ez akkor hasznos, ha nem akarsz LILO-t (vagy grub-ot)\n"
+"telep�teni a g�pre, vagy egy m�sik oper�ci�s rendszer let�rli a LILO-t,\n"
+"vagy a LILO nem m�k�dik az adott hardver-konfigur�ci�ddal. Az ind�t�lemezt\n"
+"haszn�lhatod a \"Mandrake rescue image\"-el egy�tt, �gy sokkal k�nnyebb\n"
+"kijav�tani a rendszer s�lyos be�ll�t�si hib�it. Szeretn�l most ind�t�lemezt\n"
+"k�sz�teni a rendszeredhez?"
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Els� floppy-meghajt�"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "M�sodik floppy-meghajt�"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
-msgstr "Kihagy"
+msgstr "�tl�p"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3240,198 +4117,160 @@ msgstr ""
 "a bootmanager n�lk�l. Ez akkor hasznos, ha nem akarsz LILO-t (vagy grub-ot)\n"
 "telep�teni a g�pre, vagy egy m�sik oper�ci�s rendszer let�rli a LILO-t,\n"
 "vagy a LILO nem m�k�dik az adott hardver-konfigur�ci�ddal. Az ind�t�lemezt\n"
-"haszn�lhatod a \"Mandrake rescue image\"-dzsel egy�tt, �gy sokkal k�nnyebb\n"
+"haszn�lhatod a \"Mandrake rescue image\"-el egy�tt, �gy sokkal k�nnyebb\n"
 "kijav�tani a rendszer s�lyos be�ll�t�si hib�it. Szeretn�l most ind�t�lemezt\n"
 "k�sz�teni a rendszeredhez?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Sajnos nincs el�rhet� floppy-meghajt�"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 "V�laszd ki azt a floppy-meghajt�t, amelyiket haszn�lni akarod a boot-diszk "
-"k�sz�t�s�hez"
+"k�sz�t�shez"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Tegy�l egy floppy-t a(z) %s meghajt�ba"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Boot-diszk k�sz�l"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "A LILO telep�t�se nem siker�lt. A hiba a k�vetkez�:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Szeretn�d a SILO-t haszn�lni?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "A SILO f�bb opci�i"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Itt vannak a SILO jelenlegi bejegyz�sei.\n"
-"Adhatsz a megl�v�kh�z �jakat, vagy m�dos�thatod a megl�v�ket."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Part�ci�"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "M�r van ilyen c�mke"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "A SILO telep�t�se nem siker�lt. A hiba a k�vetkez�:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Rendszerbet�lt� el�k�sz�t�se"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
+#, fuzzy
 msgid "Do you want to use aboot?"
 msgstr "Szeretn�d az aboot-ot haszn�lni?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
-"Hiba az aboot telep�t�sekor, \n"
-"pr�b�ljam �jra a telep�t�st, akkor is, ha ez esetleg t�nkreteszi az els� "
+"Hiba az aboot telep�t�sekor,\n"
+"pr�b�ljam �jra a telep�t�st akkor is, ha ez esetleg t�nkreteszi az els� "
 "part�ci�t?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Proxy-be�ll�t�sok"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "A proxy valami ilyen kell, hogy legyen: http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "A proxy valami ilyen kell, hogy legyen: ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "A rendszerbet�lt� telep�t�se nem siker�lt. A hiba a k�vetkez�:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Cracker Paradicsom!"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
-msgstr "Gyenge"
+msgstr "Sil�ny"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Alacsony"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "K�zepes"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Magas"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoi�s vagy..."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Egy�b k�rd�sek"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(adatveszt�st okozhat)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Haszn�ljak merevlemez-optimaliz�l�st?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "V�laszd ki a biztons�gi szintet"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Fizikai RAM m�rete (jelenleg %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Elt�vol�that� m�dia automatikus felcsatol�sa"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "/tmp t�rl�se minden �jraindul�skor"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Multi profile-ok enged�lyez�se"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Num Lock bekapcsol�sa boot-ol�skor"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Add meg a fizikai mem�ria m�ret�t MB-ban"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Nem lehet a supermount-ot haszn�lni ilyen magas biztons�gi szinten"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
+msgstr ""
+"Figyelem: E BIZTONS�GI SZINTEN, A ROOT BEJELENTKEZ�S KONZOLON NEM "
+"MEGENGEDETT!\n"
+"Amennyiben root jogosults�g sz�ks�ges, jelentkezz be felhaszn�l�k�nt,\n"
+"�s haszn�ld a \"su\" parancsot. More generally, do not expect to use\n"
+"your machine for anything but as a server.\n"
+"You have been warned."
+
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
 msgstr ""
-"A DrakX l�trehozza az X konfigur�ci�s f�jlt az XFree 3.3-as �s 4.0-s\n"
-"verzi�j�hoz is. Alap�rtelmez�sben a 3.3-as szervert haszn�ljuk, mert t�bb\n"
-"videok�rty�t t�mogat.\n"
-"\n"
-"Ki akarod pr�b�lni a 4-es XFree-t?"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "PCI eszk�z�k keres�se?"
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Haszn�ljam a m�r megl�v� X11 be�ll�t�sokat?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr "Szeretn�l automatikus telep�t�shez telep�t�lemezt k�sz�teni?"
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Tegy�l egy �res floppy-t a(z) %s meghajt�ba"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Automatikus telep�t� floppy k�sz�t�se"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3441,7 +4280,7 @@ msgstr ""
 "\n"
 "Biztos, hogy ki akarsz l�pni?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3462,154 +4301,18 @@ msgstr ""
 "Tov�bbi inform�ci�kat a rendszer be�ll�t�s�hoz a Hivatalos \n"
 "Linux-Mandrake Felhaszn�l�i K�zik�nyvben tal�lsz."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Rendszer le�ll�t�sa"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Driver telep�t�se a(z) %s k�rty�hoz (%s)"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(%s modul)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Melyik %s driver-t pr�b�ljam meg?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"Egyes esetekben a %s driver-nek tov�bbi param�terekre van sz�ks�ge a helyes\n"
-"m�k�d�shez, b�r ez nem jellemz�. Szeretn�l tov�bbi param�tereket megadni a\n"
-"driver-nek, vagy hagyod, hogy az mag�t�l k�rdezze le a hardvert�l a "
-"sz�ks�ges\n"
-"inform�ci�t? Esetenk�nt az automatikus keres�s lefagyaszthatja a \n"
-"sz�m�t�g�pet, de ez semmilyen k�rosod�ssal nem j�r."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Automatikus keres�s"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "R�szletes be�ll�t�sok"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Most adhatod meg a %s modul param�tereit."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"�tadhatsz a %s modulnak param�tereket.\n"
-"A param�terek szintaktik�ja: ``n�v=�rt�k n�v2=�rt�k2 ...''.\n"
-"P�ld�ul: ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Modul be�ll�t�sok:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"%s modul bet�lt�se sikertelen.\n"
-"Megpr�b�lod m�s param�terekkel?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Pr�b�ljam megkeresni a PCMCIA k�rty�kat?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "PCMCIA k�rty�k be�ll�t�sa..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "%s eszk�z�k keres�se?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Tal�ltam: %s %s csatol�t"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Van m�sik is?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Van valamilyen %s csatol�d?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Nem"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Igen"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "N�zd meg a hardver inf�t"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "H�l�zat ind�t�sa"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "H�l�zat le�ll�t�sa"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake Telep�t�s %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 " <Tab>/<Alt-Tab> elemek k�z�tt | <Space> kiv�laszt | <F12> k�vetkez� k�perny�"
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"Most part�cion�lhatod a %s merevlemezedet.\n"
-"Ha befejezted, ne felejtsd el elmenteni a v�ltoz�sokat a `w'-vel."
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "K�rlek v�rj"
 
@@ -3619,469 +4322,972 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "F�lre�rthet� (%s), l�gy pontosabb\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Rossz v�laszt�s, pr�b�lkozz �jra\n"
 
 #: ../../interactive_stdio.pm_.c:39
 #, c-format
 msgid " ? (default %s) "
-msgstr " ? (alap�rtelmezett: %s) "
+msgstr " ? (alap�rtelmez�s: %s) "
 
 #: ../../interactive_stdio.pm_.c:52
 #, c-format
 msgid "Your choice? (default %s) "
-msgstr "Mit v�lasztasz? (alap�rtelmezett: %s) "
+msgstr "Mit v�lasztasz? (alap�rtelmez�s: %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
-msgstr "Mit v�lasztasz? (alap�rtelmezett: %s, �rd `none' a semmihez) "
+msgstr "Mit v�lasztasz? (alap�rtelmez�s: %s, �rd `none' a semmihez) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "Cseh"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "N�met"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Spanyol"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Finn"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Francia"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norv�g"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Lengyel"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Orosz"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Angol (UK) billenty�zet"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "USA-billenty�zet"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "�rm�ny (r�gi)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "�rm�ny (�r�g�p)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "�rm�ny (fonetikus)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "Azerbajdzs�n (latin)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "Azerbajdzs�n (cirill)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bolg�r"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazil (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "Feh�rorosz"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Sv�jci (n�met kioszt�s)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Sv�jci (francia kioszt�s)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "N�met (\"dead key\" n�lk�l)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "D�n"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak (Amerikai)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (Norv�g)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "�szt"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gr�z (\"Orosz\" kioszt�s)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gr�z (\"Latin\" kioszt�s)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "G�r�g"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Horv�t"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Izraeli"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Izraeli (Fonetikus)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Ir�ni"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Izlandi"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Olasz"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "Jap�n 106 billenty�s"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Latin-amerikai"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Holland"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litv�n AZERTY (r�gi)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litv�n AZERTY (�j)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litv�n \"sz�msor\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litv�n \"fonetikus\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Lengyel (qwerty kioszt�s)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Lengyel (qwertz kioszt�s)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portug�l"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanadai (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Orosz (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Sv�d"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Szlov�n"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Szlov�k"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Thai billenty�zet"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "T�r�k (hagyom�nyos \"F\" modell)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "T�r�k (modern \"Q\" modell)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukr�n"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "USA-billenty�zet (nemzetk�zi)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vietn�mi \"sz�msor\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Jugoszl�v (latin kioszt�s)"
 
-# 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
-#
-# '\202' is '�' (eacute) in cp437 encoding
-# '\242' is '�' (oacute) in cp437 encoding
-# '\224' is '�' (odiaeresis) in cp437 encoding.
-# '\201' is '�' (udiaeresis) in cp437 encoding
-# '\240' is '�' (aacute) in cp437 encoding
-# '\241' is '�' (iacute) in cp437 encoding
-# there is no '�' (odoubleacute) in cp437 using o" ...
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun eg�r"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "Szabv�nyos"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+ eg�r"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "�ltal�nos"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "G�rg�s"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "soros"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "�ltal�nos 2 gombos eg�r"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "�ltal�nos 3 gombos eg�r"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan eg�r"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (soros, r�gi C7 t�pus)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Nincs eg�r"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2 gombos"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3 gombos"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "egyiket sem"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Nincs eg�r"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "K�vetkez� ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Rendben?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Internet be�ll�t�sok"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Kipr�b�ljuk az Internet kapcsolatot most?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Internet kapcsolat be�ll�t�sa"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Ne �ll�tsd be a h�l�zatot"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
 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"
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Internet kapcsolat / Helyi h�l�zat be�ll�t�sa"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "ISDN Be�ll�t�sok"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
 msgstr ""
-"L�gy �dv�z�lve a LILO bootmanager-ben!\n"
+"Add meg a Szolg�ltat�d nev�t!\n"
+"Ha nincs az al�bbi list�ban, v�laszd az \"Unlisted\"-et"
+
+#: ../../netconnect.pm_.c:158
+msgid "Connection Configuration"
+msgstr "Kapcsolat be�ll�t�sa"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "T�ltsd ki vagy ellen�rizd le az al�bbi mez�ket"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "K�rtya IRQ"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "K�rtya DMA"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "K�rtya IO"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "K�rtya IO_0"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "K�rtya IO_1"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "Saj�t telefonsz�mod"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "Szolg�ltat� neve (provider.net)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Szolg�ltat� telefonsz�ma"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "Els�dleges n�vkiszolg�l�"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "M�sodlagos n�vkiszolg�l�"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "T�rcs�z�si m�d"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "Felhaszn�l� n�v"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Jelsz�"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Jelsz� (m�gegyszer)"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "Eur�pa"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Eur�pa (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr ""
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "Milyen protokoll-t szeretn�l haszn�lni?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "Nem tudom"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "Milyen t�pus� k�rty�d van?"
+
+#: ../../netconnect.pm_.c:239
+#, fuzzy
+msgid "Continue"
+msgstr "Ett�l f�ggetlen�l folytassam?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "Megszak�t�s"
+
+#: ../../netconnect.pm_.c:245
+msgid ""
 "\n"
-"A lehets�ges alternat�v�k megtekint�s�hez nyomj egy <TAB>-ot.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"Egy adott oper�ci�s rendszer bet�lt�s�hez �rd be a megfelelo\" image nev�t "
-"�s\n"
-"nyomj egy <ENTER>-t, vagy v�rj %d m�sodpercet �s az alap�rtelmezett "
-"elindul.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
 "\n"
+"Amennyiben ISA k�rty�d van, a k�vetkez� k�perny�n l�that� �rt�kek fontosak.\n"
+"Ha PCMCIA k�rty�d van, tudnod kell a k�rtya IRQ �s IO �rt�keit.\n"
 
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "L�gy �dv�z�lve! Ez a GRUB, az oper�ci�s rendszer v�laszt�."
+#: ../../netconnect.pm_.c:257
+#, fuzzy
+msgid "Which is your ISDN card ?"
+msgstr "Milyen ISDN k�rty�d van?"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "Haszn�ld a(z) %c �s %c gombokat a bejegyz�s kijel�l�s�re."
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "Tal�ltam egy ISDN k�rty�t:\n"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../netconnect.pm_.c:287
+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 ""
-"Az `enter' megnyom�s�val a kiv�lasztott Op. rendszer indul, az `e' gombbal"
+"�rz�keltem egy ISDN PCI k�rty�t, de nem ismertem fel a t�pus�t. K�rem "
+"v�lassz ki egy PCI k�rty�t a k�vetkez� k�perny�n."
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr "Nem tal�ltam ISDN PCI k�rty�t. V�lassz ki egyet a k�vetkez� k�perny�n"
+
+#: ../../netconnect.pm_.c:331
+#, fuzzy
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"szerkesztheted a boot-ol�s el�tt a parancsokat, a `c' gombbal parancssort "
-"kapsz."
+"Nem tat�lhat� Ethernet h�l�zati adapter a rendszerben. Futtasd a \"Hadver "
+"konfigur�ci�s eszk�z\"-t."
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "H�l�zati interf�sz kiv�laszt�sa"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "V�laszd ki, hogy melyik interf�szt haszn�lod az Internet kapcsolathoz"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "H�l�zati interf�sz"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
+"\n"
+"Do you agree?"
 msgstr ""
-"A kijel�lt oper�ci�s rendszer %d m�sodpercen bel�l automatikusan elindul."
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "nincs el�g hely a /boot part�ci�n"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "�jra kell ind�tani a h�l�zati interf�szt. Mehet?"
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Munkaasztal"
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "ADSL be�ll�t�sok"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Start Men�"
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "Az Internet kapcsolat elinduljon a rendszer indul�sakor?"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun eg�r"
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Megkeressem a modemet?"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB eg�r"
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "V�laszd ki, hogy melyik soros portra csatlakozik a modemed."
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB eg�r (2 gomb)"
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Modemes csatlakoz�s be�ll�t�sai"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB eg�r (3 vagy t�bb gomb)"
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Csatlakoz�s neve"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB eg�r"
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "Telefonsz�m"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB eg�r (2 gomb)"
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Felhaszn�l�i n�v"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB eg�r (3 vagy t�bb gomb)"
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Autentik�ci�"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "�ltal�nos eg�r (PS/2)"
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (PS/2)"
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Szkript alap�"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "�ltal�nos 3 gombos eg�r (PS/2)"
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Termin�lon kereszt�li"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Tartom�nyn�v"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Els�dleges n�vkiszolg�l�"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "M�sodlagos n�vkiszolg�l�"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Internet kapcsolat / Helyi h�l�zat be�ll�t�sa"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "Internet kapcsolat be�ll�t�sa"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Ne �ll�tsd be a h�l�zatot"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Ne �ll�tsd be a h�l�zatot"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Csatlakoz�s az Internethez"
+
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Internet kapcsolat megszak�t�sa"
+
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Internet kapcsolat be�ll�t�sa"
+
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "Internet kapcsolat & be�ll�t�s"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+#, fuzzy
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr "�jra kell ind�tani a h�l�zati interf�szt. Mehet?"
+
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Internet kapcsolat be�ll�t�sa"
+
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Internet kapcsolat be�ll�t�sa"
+
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Bels� ISDN k�rtya"
+
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "K�ls� modem"
+
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "Kapcsolat az Internethez"
+
+#: ../../netconnect.pm_.c:672
+#, fuzzy
+msgid "What kind is your ISDN connection?"
+msgstr "Milyen fajta az ISDN kapcsolatod?"
+
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Internet kapcsolat be�ll�t�sa"
+
+#: ../../netconnect.pm_.c:700
+#, fuzzy
+msgid "France"
+msgstr "Francia"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus eg�r"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "Egy�b nemzetek"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus eg�r"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "Melyik orsz�gban �lsz?"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus eg�r"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "Alcatel modem"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB eg�r"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "ECI modem"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB eg�r (3 vagy t�bb gomb)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
+"Ha az DSL modemed Alcatel one, v�laszd az Alcatel-t. Egy�bk�nt az ECI-t."
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Nincs eg�r"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "pppoe haszn�lata"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A vagy magasabb (soros)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "ne haszn�lja a pppoe-t"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (soros)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (soros)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Internet kapcsolat be�ll�t�sa"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (soros)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Milyen protokoll-t szeretn�l haszn�lni?"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (soros)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Internet kapcsolat be�ll�t�sa"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (soros)"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "Helyi h�l�zat be�ll�t�sa"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (soros)"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "H�l�zati be�ll�t�s"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (soros)"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Leteszteled a be�ll�t�sokat?"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (soros, r�gi C7 t�pus)"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "H�l�zat kikapcsol�sa"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (soros)"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Internet kapcsolat / Helyi h�l�zat be�ll�t�sa"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "�ltal�nos eg�r (soros)"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"A lok�lis h�l�zat m�r be van �ll�tva.\n"
+"Szeretn�d:"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft-kompat�bilis (soros)"
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "Hogyan akarsz kapcsol�dni az Internet-re?"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "�ltal�nos 3 gombos eg�r (soros)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "H�l�zati be�ll�t�s"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (soros)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Rendben?"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "nem tal�ltam h�l�zati k�rty�t"
 
-#: ../../partition_table.pm_.c:528
-msgid "Extended partition not supported on this platform"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "H�l�zat be�ll�t�sa"
+
+#: ../../network.pm_.c:274
+#, fuzzy
+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 ""
-"A kiterjesztett (extended) part�ci� nem\n"
-"t�mogatott ezen a platformon"
+"�rd be a g�ped nev�t.\n"
+"N�mely DHCP szerver megk�veteli a g�pnevet.\n"
+"A teljes nevet kell be�rnod, pl.: \"mybox.mylab.myco.com\".\n"
 
-#: ../../partition_table.pm_.c:546
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+#, fuzzy
+msgid "Host name"
+msgstr "G�pn�v:"
+
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+
+#: ../../network.pm_.c:302
+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 ""
+"K�rlek add meg a g�p IP be�ll�t�sait.\n"
+"Minden mez�be IP-c�met �rj pontozott decim�lis form�tumban\n"
+"(pl.: 192.169.10.11)."
+
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "%s h�l�zati csatol� be�ll�t�sa"
+
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Automatikus IP-c�m"
+
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "IP address"
+msgstr "IP-c�m"
+
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Netmask"
+msgstr "H�l�zati maszk"
+
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP-c�m, a form�tuma 192.168.10.11"
+
+#: ../../network.pm_.c:341
+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 ""
+"�rd be a g�ped nev�t.\n"
+"N�mely DHCP szerver megk�veteli a g�pnevet.\n"
+"\n"
+"A teljes nevet kell be�rnod, pl.: \"mybox.mylab.myco.com\"."
+
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "DNS szerver"
+
+#: ../../network.pm_.c:347
+#, fuzzy
+msgid "Gateway"
+msgstr "�tj�r� (gateway)"
+
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "�tj�r�-eszk�z"
+
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Proxy be�ll�t�sok"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "A proxy valami ilyen kell, hogy legyen: http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "A proxy valami ilyen kell, hogy legyen: ftp://..."
+
+#: ../../partition_table.pm_.c:540
+msgid "Extended partition not supported on this platform"
+msgstr "A kiterjesztett (extended) part�ci� nem t�mogatott ezen a platformon"
+
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4091,21 +5297,21 @@ msgstr ""
 "Az egyetlen megold�s az els�dleges part�ci� �thelyez�se �gy, hogy a\n"
 "kiterjesztett part�ci�k mell� ker�lj�n az �res hely."
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Hiba a %s f�jl olvas�sa k�zben"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "A %s f�jlb�l val� vissza�ll�t�s sikertelen: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
-msgstr "Hib�s ment�s"
+msgstr "Hib�s ment�s f�jl"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Hiba a %s f�jl �r�sa k�zben"
@@ -4139,42 +5345,55 @@ msgstr "�rdekes"
 msgid "maybe"
 msgstr "esetleg"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (fontos)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (nagyon sz�p)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (sz�p)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Mutass kevesebbet"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Mutass t�bbet"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Helyi nyomtat�"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "T�voli lpd"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "T�voli nyomtat�"
+
+#: ../../printer.pm_.c:21
+#, fuzzy
+msgid "Remote CUPS server"
+msgstr "T�voli CUPS szerver"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:22
+#, fuzzy
+msgid "Remote lpd server"
+msgstr "T�voli lpd szerver"
+
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "Network nyomtat� (socket) be�ll�t�sai"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Nyomtat� eszk�z URI"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Eszk�z�k keres�se..."
@@ -4186,13 +5405,13 @@ msgstr "Portok tesztel�se"
 #: ../../printerdrake.pm_.c:35
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
-msgstr "%s t�pus� nyomtat�t tal�ltam itt: "
+msgstr "\"%s\" t�pus� nyomtat�t tal�ltam "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Helyi nyomtat� eszk�z"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4200,37 +5419,37 @@ msgstr ""
 "Melyik eszk�zre van a nyomtat�d csatlakoztatva\n"
 "(megjegyz�s: /dev/lp0 megfelel az LPT1:-nek)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Nyomtat� eszk�z"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "T�voli nyomtat�-d�mon be�ll�t�sai"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 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."
 msgstr ""
-"T�voli lpd nyomtat�sor haszn�lat�hoz meg kell adnod a t�voli \n"
+"T�voli lpd nyomtat�sor haszn�lat�hoz meg kell adnod a t�voli\n"
 "nyomtat�-kiszolg�l� nev�t, valamint annak a nyomtat�sornak a nev�t\n"
 "amelyikre a nyomtat�sokat k�ldeni szeretn�d."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "T�voli host neve"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "T�voli nyomtat�sor neve"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) nyomtat�si be�ll�t�sok"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4240,31 +5459,30 @@ msgid ""
 msgstr ""
 "Ahhoz, hogy SMB nyomtat�ra tudj nyomtatni, meg kell adnod a nyomtat�-\n"
 "kiszolg�l� SMB nev�t (Megjegyz�s: nem biztos, hogy ugyanaz, mint a TCP/IP\n"
-"g�pn�v!) �s az IP-c�m�t, valamint a megosztott nyomtat� nev�t �s a "
-"megfelel�\n"
+"g�pn�v!) �s az IP-c�m�t, a megosztott nyomtat� nev�t �s egy megfelel�\n"
 "jogosults�gokkal rendelkez� felhaszn�l� nev�t, munkacsoportj�t �s jelszav�t."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "SMB szerver g�pneve"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
-msgstr "SMB szerver IP"
+msgstr "SMB szerver IP c�me"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Megosztott k�nyvt�r neve"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Munkacsoport"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "NetWare nyomtat� be�ll�t�sai"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4273,134 +5491,160 @@ msgid ""
 msgstr ""
 "Ahhoz, hogy NetWare nyomtat�ra tudj nyomtatni, meg kell adnod a NetWare\n"
 "nyomtat�-kiszolg�l� nev�t (Vigy�zz! Ez nem biztos, hogy megegyezik a TCP/IP\n"
-"g�pn�vvel!) �s a nyomtat�sor nev�t, valamint egy, a megfelel� "
-"jogosults�gokkal \n"
+"g�pn�vvel!), a nyomtat�sor nev�t, �s egy megfelel� jogosults�gokkal\n"
 "rendelkez� felhaszn�l�i nevet �s jelsz�t."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Nyomtat� szerver"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Nyomtat�si sor neve"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "Socket nyomtat� be�ll�t�sai"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"Ahhoz, hogy egy socket printerre nyomtathassz, meg kell adnod a nyomtat�\n"
+"g�pnev�t �s opcion�lisan a nyomtat� portsz�m�t."
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "Nyomtat� g�pneve"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Milyen t�pus� nyomtat�d van?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Ki akarod pr�b�lni a nyomtat�st?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Teszt oldal(ak) kinyomtat�sa..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"A teszt oldalt/oldalakat elk�ldtem a nyomtat�-d�monnak.\n"
+"Eltarthat egy kis ideig, am�g a nyomtat�s elindul.\n"
+"Nyomtat�si �llapot:\n"
+"%s\n"
+"\n"
+"Megfelel�en m�k�dik?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"A teszt oldalt/oldalakat elk�ldtem a nyomtat�-d�monnak.\n"
+"Eltarthat egy kis ideig, am�g a nyomtat�s elindul.\n"
+"Megfelel�en m�k�dik?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Igen, nyomtass ASCII pr�ba oldalt"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Igen, nyomtass PostScript pr�ba oldalt"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Igen, nyomtasd ki mind a k�t pr�ba oldalt"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Nyomtat� be�ll�t�sa"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Milyen t�pus� nyomtat�d van?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Nyomtat�-be�ll�t�sok"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Pap�rm�ret"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Lapdob�s nyomtat�s ut�n?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Uniprint driver be�ll�t�sai"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Sz�nm�lys�g be�ll�t�sai"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "PostScript-k�nt nyomtassam a sz�veget?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
-msgstr "Oldalak sorrendj�nek megv�ltoztat�sa"
+msgstr "Oldalak sorrendj�nek megford�t�sa"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
-msgstr "Jav�tsam a l�pcs�zetes sz�veget?"
+msgstr "Jav�tsam a l�pcs�zetes nyomtat�st?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Oldalak sz�ma laponk�nt"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Jobb/bal marg� pontokban (1/72 inch)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Als�/fels� marg� pontokban (1/72 inch)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Tov�bbi GhostScript opci�k"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Tov�bbi Text opci�k"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Ki akarod pr�b�lni a nyomtat�st?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Teszt oldal(ak) kinyomtat�sa..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"A teszt oldalt/oldalakat elk�ldtem a nyomtat�-d�monnak.\n"
-"Eltarthat egy kis ideig, am�g a nyomtat�s elindul.\n"
-"Nyomtat�si �llapot:\n"
-"%s\n"
-"\n"
-"M�k�dik?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"A teszt oldalt/oldalakat elk�ldtem a nyomtat�-d�monnak.\n"
-"Eltarthat egy kis ideig, am�g a nyomtat�s elindul.\n"
-"M�k�dik?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Nyomtat�"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
-msgstr "Szeretn�l nyomtat�t be�ll�tani?"
+msgstr "Szeretn�d a nyomtat�t be�ll�tani?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4408,19 +5652,67 @@ msgstr ""
 "Itt vannak a jelenleg be�ll�tott nyomtat�sorok.\n"
 "Adhatsz a megl�v�kh�z �jakat, vagy m�dos�thatod a r�gieket."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "V�lassz nyomtat�-kapcsolatot"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Hogyan van a nyomtat� csatlakoztatva?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+#, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "V�lassz t�voli nyomtat�-kapcsolatot"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Nyomtat�sor t�rl�se"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+#, fuzzy
+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 ""
+"Minden nyomtat�sornak (itt �llnak sorban a nyomtat�sok) kell adni egy nevet\n"
+"(ami gyakran lp) �s hozz� kell rendelni egy spool k�nyvt�rat. Milyen sor- "
+"�s\n"
+"k�nyvt�rnevet �ll�tsak be ehhez a nyomtat�sorhoz?"
+
+#: ../../printerdrake.pm_.c:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "Helyi nyomtat�"
+
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "R�szletes be�ll�t�sok"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4428,80 +5720,80 @@ msgid ""
 "connected?"
 msgstr ""
 "Minden nyomtat�sornak (itt �llnak sorban a nyomtat�sok) kell adni egy nevet\n"
-"(ami gyakran lp) �s kell rendelni hozz� egy spool k�nyvt�rat. Milyen sor- "
+"(ami gyakran lp) �s hozz� kell rendelni egy spool k�nyvt�rat. Milyen sor- "
 "�s\n"
 "k�nyvt�rnevet �ll�tsak be ehhez a nyomtat�sorhoz?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Nyomtat�sor neve"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Spool k�nyvt�r"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Nyomtat�-kapcsolat"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Nem tudok part�ci�t hozz�adni a _form�zott_ RAID md%d-hez"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Nem tudom �rni a $file f�jlt"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid sikertelen"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid sikertelen (lehet, hogy hi�nyzik a raidtools?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Nincs el�g part�ci� a RAID level %d -hez/-hoz/-h�z\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
-msgstr "Anacron, a parancs�temez�."
+msgstr "Anacron, a peri�dikus parancs�temez�."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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 ""
 "Az apmd monitorozza a telepek �llapot�t �s napl�z a syslog-ba.\n"
-"Seg�ts�g�vel le�ll�thatod a g�pet, ha a telep lemer�l."
+"Seg�ts�g�vel le�ll�thatod a g�pet, miel�tt a telep lemer�l."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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 ""
 "Az at parancs �ltal �temezett utas�t�sokat hajtja v�gre a megadott "
 "id�pontban, \n"
-"valamint k�tegelt (batch-elt) parancsokat futtat, amikor a g�p terhel�se \n"
+"valamint k�tegelt (batch-elt) parancsokat futtat, amikor a g�p terhel�se\n"
 "alacsony."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 ""
-"A cron a szabv�nyos parancs�temez� program a UNIX oper�ci�s rendszereken. \n"
+"A cron a szabv�nyos parancs�temez� program a UNIX oper�ci�s rendszereken.\n"
 "Seg�ts�g�vel a felhaszn�l�k �ltal megadott programok futtathat�k "
 "periodikusan.\n"
-"A vixie cron kicsit t�bbet tud az alap cron-n�l, biztons�gosabb �s \n"
+"A vixie cron kicsit t�bbet tud az alap cron-n�l, biztons�gosabb �s\n"
 "k�nnyebb konfigur�lni."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4512,7 +5804,7 @@ msgstr ""
 "mint pl. a Midnight Commander. Seg�ts�g�vel lehet kiv�gni �s beilleszteni,\n"
 "valamint felbukkan� men�ket haszn�lni a konzolon."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4520,7 +5812,7 @@ msgstr ""
 "Az Apache egy WWW szerver. HTML f�jlokat �s CGI-t tesz el�rhet�v�\n"
 "a h�l�zaton kereszt�l."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4529,46 +5821,46 @@ msgid ""
 "disables\n"
 "all of the services it is responsible for."
 msgstr ""
-"Az ``internet szuperszerver d�mon'' (r�viden inetd) felel�s sok h�l�zati \n"
-"szolg�ltat�s ind�t�s��rt, mint pl. a telnet, ftp, rsh �s rlogin. Az inetd \n"
+"Az \"internet szuperszerver d�mon\" (inetd) felel�s sok h�l�zati\n"
+"szolg�ltat�s ind�t�s��rt, mint pl. telnet, ftp, rsh �s rlogin. Az inetd\n"
 "le�ll�t�s�val minden �ltala ir�ny�tott szolg�ltat�s le�ll."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 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 ""
-"Ez a csomag t�lti be a billenty�zetkioszt�st, amit a \n"
-"/etc/sysconfig/keyboard -ban �ll�thatsz be. A be�ll�t�st megv�ltoztathatod \n"
+"Ez a csomag t�lti be a billenty�zetkioszt�st, amit a\n"
+"/etc/sysconfig/keyboard -ban �ll�thatsz be. A be�ll�t�st megv�ltoztathatod\n"
 "a kbdconfig programmal. Ezt bekapcsolva kell hagyni a legt�bb rendszeren."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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 ""
-"Az lpd a nyomtat�-d�mon, ez kell az lpr rendes m�k�d�s�hez. Az lpd \n"
-"alapj�ban v�ve egy nyomtat�szerver, elrendezi a nyomtat�sokat a k�l�nb�z� \n"
+"Az lpd a nyomtat�-d�mon, ez kell az lpr rendes m�k�d�s�hez. Az lpd\n"
+"alapj�ban v�ve egy nyomtat�szerver, elrendezi a nyomtat�sokat a k�l�nb�z�\n"
 "nyomtat�k k�z�tt."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
-"A named (BIND) egy DNS, azaz Tartom�nyn�v-kiszolg�l�, ennek seg�ts�g�vel \n"
+"A named (BIND) egy DNS, azaz Tartom�nyn�v-kiszolg�l�, ennek seg�ts�g�vel\n"
 "feleltetik meg a g�pek az IP-c�meket �s a host neveket."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
-"Fel- �s lecsatolja (mount-olja) a k�l�nb�z� h�l�zati f�jlrendszereket, \n"
+"Fel- �s lecsatolja (mount-olja) a k�l�nb�z� h�l�zati f�jlrendszereket,\n"
 "mint pl. az NFS, az SMB (LAN Manager/Windows) �s az NCP (NetWare)."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4576,17 +5868,17 @@ msgstr ""
 "Aktiv�lja vagy deaktiv�lja a boot-ol�sn�l automatikusan indul� h�l�zati\n"
 "interf�szeket."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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 ""
 "Az NFS egy n�pszer�, TCP/IP h�l�zaton haszn�latos f�jlmegoszt�si protokoll.\n"
-"Ez a szolg�ltat�s egy NFS kiszolg�l�, konfigur�l�sa a /etc/exports \n"
+"Ez a szolg�ltat�s egy NFS kiszolg�l�, konfigur�l�sa a /etc/exports\n"
 "f�jlon �t t�rt�nik."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4594,7 +5886,7 @@ msgstr ""
 "Az NFS egy n�pszer�, TCP/IP h�l�zaton haszn�latos f�jlmegoszt�si protokoll.\n"
 "Ez a szolg�ltat�s az NFS lock-ol�st oldja meg."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4603,11 +5895,11 @@ msgid ""
 msgstr ""
 "A PCMCIA-t�mogat�sra �ltal�ban azoknak a laptop felhaszn�l�knak van "
 "sz�ks�g�k,\n"
-"akik PCMCIA modemet vagy h�l�zati k�rty�t haszn�lnak a g�p�kben. \n"
-"A szolg�ltat�s nem indul el, ha nincs be�ll�tva, teh�t nyugodtan fel lehet \n"
+"akik PCMCIA modemet vagy h�l�zati k�rty�t haszn�lnak a g�p�kben.\n"
+"A szolg�ltat�s nem indul el, ha nincs be�ll�tva, teh�t nyugodtan fel lehet\n"
 "telep�teni olyan g�pre is, ahol nincs r� sz�ks�g."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4618,44 +5910,44 @@ msgstr ""
 "az NFS-nek van sz�ks�ge. A portmap szerverre csak a (NIS vagy NFS) szerver\n"
 "g�peken van sz�ks�g."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr ""
-"A Postfix egy Lev�l �tviteli Program, ez mozgatja a leveleket egyik g�pr�l \n"
-"a m�sikra."
+"A Postfix egy Lev�l Tov�bb�t� (MTA) Program. � mozgatja a leveleket egyik\n"
+"g�pr�l a m�sikra."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
-"Elmenti �s vissza�ll�tja a rendszer entr�pia t�rol�j�t, �gy jobb \n"
+"Elmenti �s vissza�ll�tja a rendszer entr�pia t�rol�j�t, �gy jobb\n"
 "v�letlensz�mokat lehet gener�lni."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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 ""
 "A routed d�mon lehet�v� teszi, hogy a RIP protokoll seg�ts�g�vel "
-"automatikusan \n"
+"automatikusan\n"
 "friss�lj�n az IP protokoll �ltal haszn�lt �tv�laszt� t�bla (IP routing "
 "table).\n"
-"A RIP elterjedt a kis h�l�zatokon, a nagyobb, bonyolultabb h�l�zatok m�s \n"
+"A RIP elterjedt a kis h�l�zatokon, a nagyobb, bonyolultabb h�l�zatok m�s\n"
 "�tv�laszt� protokollokat ig�nyelnek."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
-"Az rstat protokoll seg�ts�g�vel a felhaszn�l�k inform�ci�t kaphatnak a \n"
+"Az rstat protokoll seg�ts�g�vel a felhaszn�l�k inform�ci�t kaphatnak a\n"
 "(lok�lis) h�l�zaton m�k�d� g�pekr�l."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4663,84 +5955,241 @@ msgstr ""
 "Az rusers protokoll seg�ts�g�vel a felhaszn�l�k lek�rdezhetik, hogy melyik\n"
 "g�pre ki van bejelentkezve."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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 ""
-"Az rwho protokoll seg�ts�g�vel t�voli felhaszn�l�k kaphatnak egy list�t az \n"
+"Az rwho protokoll seg�ts�g�vel t�voli felhaszn�l�k kaphatnak egy list�t az\n"
 "rwho d�mont futtat� g�p aktu�lis felhaszn�l�ir�l (olyan, mint a finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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 ""
 "A syslog-on kereszt�l napl�znak a d�monok, k�l�nb�z� napl�f�jlokba.\n"
-"A syslog haszn�lata mindig aj�nlott."
+"A syslog haszn�lata mind�g aj�nlott."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr ""
 "Ez az indul�sn�l v�grehajtott szkript megpr�b�lja bet�lteni a modulokat az\n"
 "USB eg�rhez."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
 "Elind�tja �s le�ll�tja az X Font Szervert a g�p indul�sakor �s\n"
 "le�ll�sakor."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr ""
-"V�laszd ki, hogy boot-ol�skor milyen szolg�ltat�sok induljanak automatikusan"
+"V�laszd ki, hogy boot-ol�skor milyen szolg�ltat�sok induljanak automatikusan "
+"el"
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"L�gy �dv�z�lve a SILO bootmanager-ben!\n"
-"\n"
-"A lehets�ges alternat�v�k megtekint�s�hez nyomj egy <TAB>-ot.\n"
-"\n"
-"Egy adott oper�ci�s rendszer bet�lt�s�hez �rd be a megfelel� image nev�t\n"
-"�s nyomj egy <ENTER>-t, vagy v�rj %d m�sodpercet �s az alap�rtelmezett "
-"elindul.\n"
-"\n"
+"Nem tudom beolvasni a part�ci�s t�bl�t, t�ls�gosan el van rontva :-(\n"
+"Megpr�b�lom t�r�lni a rossz part�ci�kat"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
-msgstr "A LILO/GRUB be�ll�t�sai"
+msgstr "A LILO/GRUB be�ll�t�sa"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Ind�t�lemez k�sz�t�se"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Floppy form�z�sa"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "V�laszt�s"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "A LILO telep�t�se nem siker�lt. A hiba a k�vetkez�:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Az Internet Kapcsolat Megoszt�sa enged�lyezett"
+
+#: ../../standalone/drakgw_.c:104
+#, fuzzy
+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 "Az Internet Kapcsolat Megoszt�s m�r l�tezik.\n"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "T�bla (table)"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Az X be�ll�t�sa"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Az Internet Kapcsolat Megoszt�s nem enged�lyezett"
+
+#: ../../standalone/drakgw_.c:123
+#, fuzzy
+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 "Az Internet Kapcsolat Megoszt�s m�r l�tezik.\n"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "T�bla (table)"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "A konfigur�ci�s f�jl tartalma nem �rtelmezhet�"
+
+#: ../../standalone/drakgw_.c:151
+#, fuzzy
+msgid "Internet Connection Sharing"
+msgstr "Internet Kapcsolat Megoszt�sa"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "T�rcs�z�si m�d"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "Nincs h�l�zati adapter a sz�m�t�g�pben!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Nem tat�lhat� Ethernet h�l�zati adapter a rendszerben. Futtasd a \"Hadver "
+"konfigur�ci�s eszk�z\"-t."
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+#, fuzzy
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"V�laszd ki, hogy melyik h�l�zati adapterrel csatlakozol a Helyi h�l�zatra."
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"Figyelem! A h�l�zati adaptere m�r be van �ll�tva.\n"
+"�jb�l be k�v�nja �ll�tani?"
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr "H�l�zati c�mhib�t �szleltem az aktu�lis konfigur�ci�ban $_!\n"
+
+#: ../../standalone/drakgw_.c:268
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "T�zfal be�ll�t�sokat �rz�keltem!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+"Figyelem! L�zet� T�zfal be�ll�t�sokat �rz�keltem. K�zileg lehets�ges a "
+"be�ll�t�sok m�dos�t�sa telep�t�s ut�n. Mehet?"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "Be�ll�t� szkriptek, szoftver telep�t�s, szerverek ind�t�sa..."
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "IDE be�ll�t�sok"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "Nem tudom telep�teni az ipcahains RPM-et az urpmi-vel."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "Nem tudom telep�teni a dhcp RPM-et az urpmi.vel."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "Nem tudom telep�teni a linuxconf RPM-et az urpmi-vel."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "Nem tudom telep�teni a bind RPM-et az urpmi-vel."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "Nem tudom telep�teni a caching-nameserver RPM-et az urpmi-vel."
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Gratul�lok!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
 "but very sensitive: it must not be used for a machine connected to others\n"
 "or to the Internet. There is no password access."
 msgstr ""
-"Ezt a szintet csak k�r�ltekint�ssel haszn�ld. Egyszer�bben tudod �ltala a \n"
+"Ezt a szintet csak k�r�ltekint�ssel haszn�ld. Egyszer�bben tudod �ltala a\n"
 "rendszert haszn�lni, de �gy az sebezhet�bb is lesz: ne v�laszd ezt a "
-"szintet, \n"
+"szintet,\n"
 "ha a g�p h�l�zatba van k�tve, vagy az Internethez csatlakozik. A hozz�f�r�s\n"
 "nem jelsz� �ltal v�dett."
 
@@ -4749,7 +6198,7 @@ msgid ""
 "Password are now enabled, but use as a networked computer is still not "
 "recommended."
 msgstr ""
-"A jelszavakat bekapcsoltam, de ez a konfigur�ci� m�g mindig nem aj�nlott\n"
+"A jelszavakat bekapcsoltam, de ez a konfigur�ci� m�g mind�g nem aj�nlott\n"
 "h�l�zatra kapcsol�d� g�p eset�n."
 
 #: ../../standalone/draksec_.c:32
@@ -4795,23 +6244,36 @@ msgstr "Biztons�gi szint be�ll�t�sa"
 msgid "Choose the tool you want to use"
 msgstr "V�laszd ki az eszk�zt, amit haszn�lni szeretn�l"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Milyen billenty�zetkioszt�st haszn�lsz?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Felbont�s megv�ltoztat�sa"
+
+#: ../../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 ""
+"Cser�ld ki a CD-t a meghajt�ban!\n"
+"\n"
+"Tedd be a(z) \"%s\" felirat� lemezt, �s nyomd meg az \"Ok\" gombot.\n"
+"Ha nincs ilyen lemezed, nyomd meg a \"M�gsem\" gombot, �gy err�l a CD-r�l\n"
+"nem t�rt�nik telep�t�s."
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Milyen t�pus� egered van?"
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "nem tal�ltam serial_usb -t\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Emul�ljam a harmadik gombot?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Melyik soros porthoz csatlakozik az egered?"
 
@@ -4859,15 +6321,15 @@ msgstr "Telep�tett csomagok"
 
 #: ../../standalone/rpmdrake_.c:60
 msgid "Available packages"
-msgstr "El�rhet� csomagok"
+msgstr "Hozz�f�rhet� csomagok"
 
 #: ../../standalone/rpmdrake_.c:62
 msgid "Show only leaves"
-msgstr "Csak leveleket mutat"
+msgstr "Csak leveleket(?) mutat"
 
 #: ../../standalone/rpmdrake_.c:67
 msgid "Expand all"
-msgstr "Mindent lenyit"
+msgstr "Mindent kinyit"
 
 #: ../../standalone/rpmdrake_.c:68
 msgid "Collapse all"
@@ -4879,7 +6341,7 @@ msgstr "Be�ll�t�sok"
 
 #: ../../standalone/rpmdrake_.c:71
 msgid "Add location of packages"
-msgstr "Add meg a csomagok el�rhet�s�g�t"
+msgstr "Add meg a csomagok hely�t"
 
 #: ../../standalone/rpmdrake_.c:75
 msgid "Update location"
@@ -4962,7 +6424,7 @@ msgid ""
 "rpmdrake is currently in ``low memory'' mode.\n"
 "I'm going to relaunch rpmdrake to allow searching files"
 msgstr ""
-"Az rpmdrake jelenleg ``kev�s mem�ria'' �zemm�dban m�k�dik.\n"
+"Az rpmdrake jelenleg \"kev�s mem�ria\" �zemm�dban m�k�dik.\n"
 "�jraind�tom, hogy a keres�s m�k�dj�n"
 
 #: ../../standalone/rpmdrake_.c:253
@@ -4975,7 +6437,7 @@ msgstr "Mit keresel?"
 
 #: ../../standalone/rpmdrake_.c:289
 msgid "Give a name (eg: `extra', `commercial')"
-msgstr "Adj meg egy nevet (pl.: `extra', `commercial')"
+msgstr "Adj meg egy nevet (pl.: \"extra\", \"commercial\")"
 
 #: ../../standalone/rpmdrake_.c:291
 msgid "Directory"
@@ -5018,11 +6480,822 @@ msgstr "%s bejegyz�s elt�vol�t�sa"
 
 #: ../../standalone/rpmdrake_.c:360
 msgid "Finding leaves"
-msgstr "Levelek keres�se"
+msgstr "Levelek(?) keres�se"
 
 #: ../../standalone/rpmdrake_.c:360
 msgid "Finding leaves takes some time"
-msgstr "A levelek keres�se egy kis id�be telik"
+msgstr "A levelek(?) keres�se egy kis id�be telik"
+
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Internet"
+
+msgid "Internet"
+msgstr "Internet"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Iroda"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multim�dia"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multim�dia"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Dokument�ci�"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Choose the size you want to install"
+#~ msgstr "V�laszd ki a telep�tend� csomagokat"
+
+#~ msgid "Total size: "
+#~ msgstr "�sszm�ret: "
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "A h�l�zat �jrakonfigur�l�sa"
+
+#~ msgid ""
+#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "A sz�m�t�g�p nem �ll�that� be Internet Kapcsolat Megoszt�s�ra.\n"
+#~ "\n"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "Minden be lett �ll�tva!\n"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Kapcsolat az Internethez norm�l modemmel"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Internet kapcsolat ISDN haszn�lat�val"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Kapcsolat az Internethez DSL (ADSL)"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Internet kapcsolat k�belen kereszt�l"
+
+#~ msgid "Germany"
+#~ msgstr "N�met"
+
+#~ msgid "Germany (1TR6)"
+#~ msgstr "N�met (1TR6)"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "Mit szeretn�l tenni?"
+
+#, fuzzy
+#~ msgid "Install/Rescue"
+#~ msgstr "Telep�t�s/Helyre�ll�t�s"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "Helyre�ll�t�s"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Milyen part�ci� t�pust szeretn�l?"
+
+#, 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "V�laszd a \"Telep�t�s\"-t, ha nincs kor�bbi Linux verzi� install�lva,\n"
+#~ "vagy ha t�bb k�l�nb�z� disztrib�ci�t vagy verzi�t szeretn�l haszn�lni.\n"
+#~ "\n"
+#~ "\n"
+#~ "V�laszd a \"Helyre�ll�t�s\"-t, ha van m�r egy Mandrake Linux rendszered\n"
+#~ "telep�tve, �s azt k�v�nod valami hiba ut�n rendbehozni.\n"
+#~ "\n"
+#~ "\n"
+#~ "V�lassz:\n"
+#~ "\n"
+#~ "  - Aj�nlott: Ha m�g sohasem telep�tett�l Linuxot, v�laszd ezt az opci�t.\n"
+#~ "\n"
+#~ "  - Egyedi: Ha m�r j�l ismered a GNU/Linuxot, kiv�laszthatod, \n"
+#~ "    hogy milyen c�lra sz�nod a rendszert. A r�szleteket l�sd lentebb.\n"
+#~ "\n"
+#~ "  - Halad�: Ez azt felt�telezi, hogy szak�rt�je vagy a GNU/Linux\n"
+#~ "    rendszereknek, �s teljesen egyedi telep�t�st szeretn�l v�gezni.\n"
+#~ "    Hasonl�an, mint az \"Egyedi\" opci�n�l, megadhatod, hogy milyen c�lra\n"
+#~ "    sz�nod a rendszert, de k�rlek CSAK AKKOR V�LASZD EZT, HA TUDOD, HOGY\n"
+#~ "    MIT TESZEL!\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "Most megadhatod, hogy melyik part�ci�kra telep�lj�n a Linux-Mandrake,\n"
+#~ "ha m�r l�teznek a part�ci�k (egy r�gebbi Linuxb�l, vagy ha m�r l�trehoztad\n"
+#~ "�ket valamilyen m�sik part�cion�l� programmal). Ha m�g nincsenek\n"
+#~ "part�ci�id, itt az ideje, hogy l�trehozd �ket. Ez azt jelenti, hogy a\n"
+#~ "fizikai merevlemezt kisebb logikai r�szekre kell osztanod.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ha �j part�ci�kat kell l�trehoznod, haszn�ld az \"Automatikus allok�l�s\"-t\n"
+#~ "�s a DrakX l�trehozza majd �ket. A megfelel� merevlemez kiv�laszt�sa a\n"
+#~ "k�vetkez�k valamelyik�re val� kattint�ssal lehets�ges: \"hda\" (els� IDE\n"
+#~ "lemez), \"hdb\" (m�sodik IDE lemez), \"sda\" (els� SCSI lemez), stb.\n"
+#~ "\n"
+#~ "\n"
+#~ "K�t l�nyeges part�ci� a root part�ci� (/), ami a f�jlrendszer k�nyvt�r-\n"
+#~ "hierarchi�j�nak kiindul�pontja, �s a /boot, ami a rendszer indul�s�hoz\n"
+#~ "(boot-ol�s�hoz) sz�ks�ges f�jlokat tartalmazza.\n"
+#~ "\n"
+#~ "\n"
+#~ "Mivel a part�cion�l�s hat�sai maradand�ak �s visszaford�thatatlanok, ez�rt\n"
+#~ "a kev�sb� tapasztalt felhaszn�l�k �ltal�ban tartanak ett�l a m�velett�l.\n"
+#~ "A DiskDrake egyszer�s�ti a m�veletet annak �rdek�ben, hogy ez ne legyen\n"
+#~ "�gy. Sz�nj r� egy kis id�t �s olvasd el a dokument�ci�t, miel�tt\n"
+#~ "hozz�fogn�l.\n"
+#~ "\n"
+#~ "\n"
+#~ "El�rhetsz minden opci�t a billenty�zet seg�ts�g�vel is: a <TAB> �s a\n"
+#~ "Fel/Le billenty�kkel v�lthatsz a part�ci�k k�z�tt. Ha kiv�lasztott�l egy\n"
+#~ "part�ci�t, a k�vetkez� kombin�ci�kat haszn�lhatod:\n"
+#~ "\n"
+#~ "- Ctrl-C: �j part�ci� l�trehoz�sa (amikor �res part�ci� van kiv�lasztva)\n"
+#~ "\n"
+#~ "- Ctrl-D: l�tez� part�ci� t�rl�se\n"
+#~ "\n"
+#~ "- Ctrl-M: csatol�si pont be�ll�t�sa\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."
+#~ msgstr ""
+#~ "Minden �jonnan l�trehozott part�ci�t form�zni kell (a form�z�s azt\n"
+#~ "jelenti, hogy egy f�jlrendszert kell r� l�trehozni). Itt az alkalom,\n"
+#~ "hogy esetleg �jraform�zz egyes, kor�bbr�l megmaradt part�ci�kat, hogy\n"
+#~ "a rajtuk lev� adatok t�rl�djenek.\n"
+#~ "Megjegyz�s: nem sz�ks�ges �jraform�zni a m�r l�tez� part�ci�kat, f�leg\n"
+#~ "abban az esetben, ha sz�ks�ged van a r�gi adatokra. Tipikusan ilyenek a\n"
+#~ "/home �s a /usr/local f�jlrendszerek."
+
+#~ 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."
+#~ msgstr ""
+#~ "A kiv�lasztott csomagokat most telep�ti a Telep�t�. Ez a m�velet n�h�ny\n"
+#~ "percig eltarthat.\n"
+#~ "\n"
+#~ "Ha egy l�tez� rendszert friss�tesz, a folyamat hosszabb id�t is ig�nybe "
+#~ "vehet!"
+
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Ha a DrakX nem tudta meghat�rozni az egered t�pus�t, vagy csak ellen�rizni\n"
+#~ "szeretn�d a be�ll�t�st, felaj�nl egy list�t az ismert eg�rt�pusokkal.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ha egyet�rtesz a DrakX be�ll�t�saival, csak v�laszd az 'Ok' gombot.\n"
+#~ "Ha nem, akkor v�lassz egy egeret a list�b�l, lehet�leg egy olyat, ami\n"
+#~ "k�zel �ll az egered t�pus�hoz.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ha az egered soros portra csatlakozik, meg kell mondanod, hogy melyikre."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "Ez a r�sz arra hivatott, hogy seg�tsen be�ll�tani a lok�lis h�l�zatot\n"
+#~ "(LAN) vagy a modemet.\n"
+#~ "\n"
+#~ "V�laszd a \"Lok�lis h�l�zat (LAN)\"-t �s a DrakX megpr�b�lja megkeresni a\n"
+#~ "h�l�zati k�rty�t a g�pedben. A PCI-os k�rty�kat t�bbnyire megtal�lja �s\n"
+#~ "be�ll�tja automatikusan. Ezzel ellent�tben, ha ISA-s k�rty�d van, az\n"
+#~ "automatikus felismer�s nem fog m�k�dni.\n"
+#~ "Ekkor k�zzel kell kiv�lasztanod a megfelel� driver-t\n"
+#~ "a megjelen� list�b�l.\n"
+#~ "\n"
+#~ "Mint a SCSI k�rty�n�l, hagyhatod, hogy a driver ismerje fel a hardvert,\n"
+#~ "de ha ez nem m�k�dik, k�zzel kell opci�kat megadnod, amiket megtal�lsz\n"
+#~ "a hardver dokument�ci�j�ban.\n"
+#~ "\n"
+#~ "Ha a Linux-Mandrake-et egy m�r h�l�zathoz k�t�tt g�pre telep�ted, a\n"
+#~ "h�l�zat rendszergazd�ja l�t el a sz�ks�ges inform�ci�kkal\n"
+#~ "(IP-c�m, h�l�zati maszk �s g�pn�v).\n"
+#~ "\n"
+#~ "Ha otthon hozol l�tre egy saj�t h�l�zatot, Neked kell a c�meket\n"
+#~ "kiv�lasztanod.\n"
+#~ "\n"
+#~ "V�laszd a \"Csatlakoz�s modemmel\"-t �s a DrakX megpr�b�lja felismerni a\n"
+#~ "modemedet. Ha nem siker�lne neki, add meg a soros portot, amihez a\n"
+#~ "modem csatlakozik."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "A Linux sokf�le nyomtat�t tud kezelni. A t�pust�l f�gg�en m�s �s m�s a\n"
+#~ "be�ll�t�s menete. Nem szabad figyelmen k�v�l hagyni, hogy a print spooler\n"
+#~ "az \"lp\" nevet haszn�lja az alap�rtelmezett nyomtat� nevek�nt, �gy l�tezni\n"
+#~ "kell egy ilyen nev� nyomtat�nak. Adhatsz viszont t�bb nevet is egy\n"
+#~ "nyomtat�nak, ezeket a \"|\" jellel kell elv�lasztani egym�st�l. Teh�t ha\n"
+#~ "valami �rtelmesebb nevet szeretn�l adni a nyomtat�dnak, egyszer�en �rd\n"
+#~ "azt az els� helyre, p�ld�ul: \"Az �n nyomtat�m|lp\".\n"
+#~ "Az a nyomtat� lesz az alap�rtelmezett, amelyiknek a nevei k�zt szerepel\n"
+#~ "az \"lp\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Ha a nyomtat�d a g�phez van k�tve (a nyomtat�-porton), v�laszd a\n"
+#~ "\"Lok�lis nyomtat�\"-t. Ekkor meg kell mondanod a telep�t�nek, hogy\n"
+#~ "melyik porton van a nyomtat�, valamint ki kell v�lasztanod a megfelel�\n"
+#~ "filtert (sz�r�t).\n"
+#~ "\n"
+#~ "\n"
+#~ "Ha egy t�voli UNIX g�pre csatlakoztatott nyomtat�t szeretn�l el�rni,\n"
+#~ "v�laszd a \"T�voli lpd\"-t. Ahhoz, hogy ez m�k�dj�n, nem kell\n"
+#~ "felhaszn�l�i nevet vagy jelsz�t megadni, de ismerni kell a t�voli\n"
+#~ "g�pen l�v� nyomtat�sor pontos nev�t.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ha egy SMB nyomtat�t k�v�nsz el�rni (ez azt jelenti, hogy a nyomtat� egy\n"
+#~ "t�voli Windows 9x/NT g�phez van k�tve), meg kell adnod a t�voli g�p SMB\n"
+#~ "nev�t (ami nem biztos hogy megegyezik a TCP/IP-n haszn�lt g�pn�vvel),\n"
+#~ "tov�bb� val�sz�n�leg az IP-c�m�t, valamint egy felhaszn�l�i nevet, a\n"
+#~ "munkacsoport nev�t �s egy jelsz�t, illetve term�szetesen a nyomtat�\n"
+#~ "nev�t is. Ugyanez igaz NetWare nyomtat� eset�n is, azzal a kiv�tellel,\n"
+#~ "hogy nem kell munkacsoportot megadni."
+
+#~ 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."
+#~ msgstr ""
+#~ "K�rlek v�laszolj \"Igen\"-el! Ha p�ld�ul k�s�bb telep�ted a Microsoft\n"
+#~ "Windows-t, az fel�l�rja a boot szektort. Ha ilyen esetben nincs boot\n"
+#~ "floppy-d, csak nehezen tudod ezut�n elind�tani a Linuxot!"
+
+#~ msgid "Move your wheel!"
+#~ msgstr "Mozgasd a g�rg�det!"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "V�ltoztat�sok elvet�se?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "Nyomtat�-kapcsolat"
+
+#~ msgid "Host name:"
+#~ msgstr "G�pn�v:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Milyen t�pus� egered van?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Automatikus felbont�sok"
+
+#~ 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"
+#~ msgstr ""
+#~ "Megkeresem a m�k�d�k�pes felbont�sokat. Ezalatt a monitor villogni fog...\n"
+#~ "Ha ez zavar, nyugodtan kikapcsolhatod, csipog�ssal jelzem, amikor befejeztem."
+
+#~ 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?"
+#~ msgstr ""
+#~ "Megpr�b�lhatom megkeresni az el�rhet� felbont�sokat (pl. 800x600).\n"
+#~ "Ez rossz esetben lefagyaszthatja a sz�m�t�g�pet.\n"
+#~ "Megpr�b�ljam?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Nem tal�ltam �rv�nyes videom�dot.\n"
+#~ "Pr�b�ld meg egy m�sik videok�rtya vagy monitor be�ll�t�ssal"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Felbont�s automatikus keres�se"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB eg�r"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB eg�r (2 gomb)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB eg�r (3 vagy t�bb gomb)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB eg�r"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB eg�r (2 gomb)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB eg�r (3 vagy t�bb gomb)"
+
+#, fuzzy
+#~ msgid "Generic Mouse"
+#~ msgstr "�ltal�nos eg�r (PS/2)"
+
+#, fuzzy
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse (PS/2)"
+
+#, fuzzy
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus eg�r"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Bus eg�r"
+
+#, fuzzy
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech MouseMan eg�r"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB eg�r"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB eg�r (3 vagy t�bb gomb)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A vagy magasabb (soros)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (soros)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (soros)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (soros)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "�ltal�nos eg�r (soros)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsoft-kompat�bilis (soros)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "�ltal�nos 3 gombos eg�r (soros)"
+
+#, fuzzy
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse (PS/2)"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "NFS felcsatol�s sikertelen"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Titkos�t�s"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "Szeretn�d be�ll�tani a lok�lis h�l�zatot a rendszeren?"
+
+#~ msgid "Show less"
+#~ msgstr "Mutass kevesebbet"
+
+#~ msgid "Show more"
+#~ msgstr "Mutass t�bbet"
+
+#~ msgid "curly"
+#~ msgstr "g�nd�r"
+
+#~ msgid "default"
+#~ msgstr "alap�rtelmezett (default)"
+
+#~ msgid "tie"
+#~ msgstr "nyakkend�s"
+
+#~ msgid "brunette"
+#~ msgstr "barna"
+
+#~ msgid "girl"
+#~ msgstr "l�ny"
+
+#~ msgid "woman-blond"
+#~ msgstr "sz�ke n�"
+
+#~ msgid "automagic"
+#~ msgstr "automatikus"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Milyen billenty�zetkioszt�st haszn�lsz?"
+
+#~ msgid "Normal"
+#~ msgstr "Szok�sos"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Pr�b�ljam megkeresni a PCMCIA k�rty�kat?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "%s eszk�z�k keres�se?"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "A modem be�ll�t�sai"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "Szeretn�l be�ll�tani modemes csatlakoz�st a rendszeren?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "PCI eszk�z�k keres�se?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "Root part�ci� keres�se."
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: Ez nem egy root part�ci�, v�lassz m�sikat."
+
+#~ msgid "No root partition found"
+#~ msgstr "Root part�ci� nem tal�lhat�"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "Nem lehet broadcast-ot haszn�lni NIS tartom�ny n�lk�l"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "V�laszd ki a root part�ci�t."
+
+#~ msgid "You don't have any windows partitions!"
+#~ msgstr "Nincs egyetlen Windows-os part�ci�d sem!"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "Nincs el�g hely az Lnx4win sz�m�ra"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "Automatikus"
+
+# 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
+#
+# '\202' is '�' (eacute) in cp437 encoding
+# '\242' is '�' (oacute) in cp437 encoding
+# '\224' is '�' (odiaeresis) in cp437 encoding.
+# '\201' is '�' (udiaeresis) in cp437 encoding
+# '\240' is '�' (aacute) in cp437 encoding
+# '\241' is '�' (iacute) in cp437 encoding
+# there is no '�' (odoubleacute) in cp437 using o" ...
+#
+#~ 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 ""
+#~ "L�gy �dv�z�lve a LILO bootmanager-ben!\n"
+#~ "\n"
+#~ "A lehets�ges alternat�v�k megtekint�s�hez nyomj egy <TAB>-ot.\n"
+#~ "\n"
+#~ "Egy adott oper�ci�s rendszer bet�lt�s�hez �rd be a megfelelo\" image nev�t "
+#~ "�s\n"
+#~ "nyomj egy <ENTER>-t, vagy v�rj %d m�sodpercet �s az alap�rtelmezett "
+#~ "elindul.\n"
+#~ "\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "A SILO f�bb opci�i"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "Itt vannak a SILO jelenlegi bejegyz�sei.\n"
+#~ "Adhatsz a megl�v�kh�z �jakat, vagy m�dos�thatod a megl�v�ket."
+
+#~ msgid "This label is already in use"
+#~ msgstr "M�r van ilyen c�mke"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "A SILO telep�t�se nem siker�lt. A hiba a k�vetkez�:"
+
+#~ 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."
+#~ msgstr ""
+#~ "A DrakX el�sz�r ellen�rzi, hogy tal�l-e egy vagy t�bb PCI-os SCSI vez�rl�t.\n"
+#~ "Ha tal�l ilyet (ilyeneket) �s megtal�lja a hozz� (hozz�juk) tartoz�\n"
+#~ "driver-t (driver-eket), automatikusan beilleszti azt (azokat).\n"
+#~ "\n"
+#~ "\n"
+#~ "Ha a SCSI vez�rl� k�rty�d ISA-s, vagy olyan PCI-os, amelyr�l a DrakX nem\n"
+#~ "tudja eld�nteni, hogy melyik driver-t haszn�lja hozz�, vagy ha nincs is\n"
+#~ "SCSI k�rty�d, a DrakX megk�rdi, hogy van-e k�rty�d. Ha nincsen, v�laszolj\n"
+#~ "\"Nem\"-mel. Ha van egy vagy t�bb SCSI k�rty�d, v�laszolj \"Igen\"-nel.\n"
+#~ "Ez esetben megjelenik egy lista a driver-ekkel, ebb�l v�laszthatod ki\n"
+#~ "a megfelel�t.\n"
+#~ "\n"
+#~ "\n"
+#~ "A driver kiv�laszt�sa ut�n a DrakX megk�rdezi, szeretn�l-e opci�kat megadni\n"
+#~ "hozz�. Els� k�rben c�lszer� a driver-re hagyni a hardver meghat�roz�s�t,\n"
+#~ "�ltal�ban m�k�dni szokott.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ha m�gse m�k�dik, akkor haszn�ld a hardverrel j�r� dokument�ci�t, \n"
+#~ "vagy n�zd meg, hogy a Windows milyennek ismeri fel a k�rty�t (persze, ha \n"
+#~ "van Windows a g�peden), ahogyan ezt a Telep�t�si �tmutat� �rja. Ezeket az \n"
+#~ "opci�kat kell megadnod a driver-nek."
+
+#~ msgid "Shutting down"
+#~ msgstr "Rendszer le�ll�t�sa"
 
 #~ msgid "useless"
 #~ msgstr "haszontalan"
@@ -5030,9 +7303,6 @@ msgstr "A levelek keres�se egy kis id�be telik"
 #~ msgid "garbage"
 #~ msgstr "szem�t"
 
-#~ msgid "Recommended"
-#~ msgstr "Javasolt"
-
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
@@ -5144,9 +7414,6 @@ msgstr "A levelek keres�se egy kis id�be telik"
 #~ msgid "Which language do you want?"
 #~ msgstr "Melyik nyelvet v�lasztod?"
 
-#~ msgid "Which usage do you want?"
-#~ msgstr "Melyiket v�lasztod?"
-
 #~ 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"
@@ -5164,9 +7431,6 @@ msgstr "A levelek keres�se egy kis id�be telik"
 #~ msgid "Downloading cryptographic packages"
 #~ msgstr "A titkos�t� csomagok let�lt�se"
 
-#~ msgid "Local Printer Options"
-#~ msgstr "Helyi nyomtat� be�ll�t�sai"
-
 #~ msgid "server"
 #~ msgstr "szerver"
 
@@ -5246,9 +7510,6 @@ msgstr "A levelek keres�se egy kis id�be telik"
 #~ msgid "Installation CD Nr 1"
 #~ msgstr "Telep�t� CD Nr 1"
 
-#~ msgid "Dialup with modem"
-#~ msgstr "Csatlakoz�s modemmel"
-
 #~ msgid "Local LAN"
 #~ msgstr "Lok�lis h�l�zat (LAN)"
 
@@ -5263,3 +7524,111 @@ msgstr "A levelek keres�se egy kis id�be telik"
 
 #~ msgid "What usage do you want?"
 #~ msgstr "Mire szeretn�d haszn�lni?"
+
+#~ msgid "Logitech MouseMan/FirstMouse (ps/2)"
+#~ msgstr "Logitech MouseMan/FirstMouse (PS/2)"
+
+#~ msgid "Genius NetMouse Pro (PS/2)"
+#~ msgstr "Genius NetMouse Pro (PS/2)"
+
+#~ msgid "Microsoft IntelliMouse (serial)"
+#~ msgstr "Microsoft IntelliMouse (soros)"
+
+#~ msgid "Logitech MouseMan/FirstMouse (serial)"
+#~ msgstr "Logitech MouseMan/FirstMouse (soros)"
+
+#, fuzzy
+#~ 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?"
+#~ msgstr ""
+#~ "A DrakX l�trehozza az X konfigur�ci�s f�jlt az XFree 3.3-as �s 4.0-s\n"
+#~ "verzi�j�hoz is. Alap�rtelmez�sben a 3.3-as szervert haszn�ljuk, mert t�bb\n"
+#~ "videok�rty�t t�mogat.\n"
+#~ "\n"
+#~ "Ki akarod pr�b�lni a 4-es XFree-t?"
+
+#, fuzzy
+#~ msgid "Configure LAN"
+#~ msgstr "Az X be�ll�t�sa"
+
+#, fuzzy
+#~ msgid "End configuration"
+#~ msgstr "Be�ll�t�sok"
+
+#, fuzzy
+#~ msgid "Do not set up networking"
+#~ msgstr "H�l�zat be�ll�t�sa"
+
+#, fuzzy
+#~ msgid "URI for Local printer"
+#~ msgstr "Helyi nyomtat�"
+
+#, fuzzy
+#~ msgid "Local Printer Device (URI)"
+#~ msgstr "Helyi nyomtat� eszk�z"
+
+#, fuzzy
+#~ msgid ""
+#~ "What URI device is your printer connected to\n"
+#~ "(note that parallel:/dev/lp0 is equivalent to LPT1:)?\n"
+#~ msgstr ""
+#~ "Melyik eszk�zre van a nyomtat�d csatlakoztatva\n"
+#~ "(megjegyz�s: /dev/lp0 megfelel az LPT1:-nek)?\n"
+
+#, fuzzy
+#~ msgid "Network:"
+#~ msgstr "H�l�zati maszk:"
+
+#, fuzzy
+#~ msgid "Everything configured!"
+#~ msgstr "be�ll�t�sok beolvas�sa"
+
+#, fuzzy
+#~ msgid "Configure my card"
+#~ msgstr "Az X be�ll�t�sa"
+
+#, fuzzy
+#~ msgid "pptp alcatel"
+#~ msgstr "Automatikus helyfoglal�s"
+
+#, fuzzy
+#~ msgid "Small(%dMB)"
+#~ msgstr "(%d MB)"
+
+#, fuzzy
+#~ msgid "Do you want to configure a ISDN connection for your system?"
+#~ msgstr "Szeretn�d be�ll�tani a lok�lis h�l�zatot a rendszeren?"
+
+#, fuzzy
+#~ msgid "Autologin at startup"
+#~ msgstr "Grafikus bejelentkez�s"
+
+#, fuzzy
+#~ msgid "Autologin - Choose default user"
+#~ msgstr "Add meg az �j m�retet"
+
+# 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
+#
+#, fuzzy
+#~ 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 ""
+#~ "L�gy �dv�z�lve a SILO bootmanager-ben!\n"
+#~ "\n"
+#~ "A lehets�ges alternat�v�k megtekint�s�hez nyomj egy <TAB>-ot.\n"
+#~ "\n"
+#~ "Egy adott oper�ci�s rendszer bet�lt�s�hez �rd be a megfelel� image nev�t\n"
+#~ "�s nyomj egy <ENTER>-t, vagy v�rj %d m�sodpercet �s az alap�rtelmezett "
+#~ "elindul.\n"
+#~ "\n"
diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po
index 79c00606d..9e62bef23 100644
--- a/perl-install/share/po/id.po
+++ b/perl-install/share/po/id.po
@@ -8,51 +8,99 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
-"PO-Revision-Date: 2000-06-09 16:48+0700\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
+"PO-Revision-Date: 2000-07-04 14:40+0700\n"
 "Last-Translator: Mohammad DAMT <mdamt@cdl2000.com>\n"
 "Language-Team: Indonesian <i18n@i18n.linux.or.id>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "Generik"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Card Grafik"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Pilih kartu grafis"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Pilih server X"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "Server X"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, fuzzy, c-format
+msgid "XFree %s"
+msgstr "Server XFree86: %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Tipe entri mana yang hendak ditambahkan"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+#, fuzzy
+msgid "XFree configuration"
+msgstr "Konfigurasi Instalasi akhir"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Pilih memori kartu grafis Anda"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Pilih opsi untk server"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Pilih jenis monitor anda"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -74,39 +122,40 @@ msgstr ""
 "Anda akan rusak berat.\n"
 "Kalau Anda ragu, gunakan setting yang umum saja."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Laju refresh horisontal"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Laju refresh vertikal"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Monitor tidak dikonfigurasi"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Kartu grafis belum dikonfigurasi"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Resolusi belum ditentukan"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Anda ingin test konfigurasi ini?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+#, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Awas: testing ini berbahaya untuk card grafik"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Test konfigurasi"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -114,184 +163,168 @@ msgstr ""
 "\n"
 "coba ubah beberapa parameter"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Ada error nih:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Cabut dalam %d detik"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "Apa sudah sesuai settingnya?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Ada kesalahan, coba ubah beberapa parameter"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Resolusi otomatis"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Untuk mencari resolusi lain, sekarang gue mau coba-coba.\n"
-"Screennya akan berkedip...\n"
-"Anda bisa mematikannya kalau mau, dan akan bunyi tiit kalau selesai"
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Resolusi"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Pilih resolusi dan kedalaman warna"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Card Grafik: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Server XFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Tunjukan seluruhnya"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Resolusi"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Saya bisa cari resolusi lain (misal: 800x600).\n"
-"Tetapi kadangkala bisa bikin mesin hengki (baca: hang)\n"
-"Mau coba?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Tidak ada mode lain\n"
-"COba gunakan video card lain atau ganti monitor"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Layout Keyboard: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Jenis Mouse: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Device Mouse: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "HorizSync Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "VertRefresh Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Card Grafik: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Memori Grafik: %s KB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Pilihan kedalaman warna"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Resolusi"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Server XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "Server XFree86: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Siap-siap konfigurasikan X "
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Ubah Monitor"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Ubah kartu grafis"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Ubah Parameter Server"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Ubah Resolusi"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Pencarian resolusi otomatis"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Lihat info"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Test lagi"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Apa yang akan anda mau?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Lupakan saja perubahan yang engkau perbuat?"
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Biarkan konfigurasi IP sekarang"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Silahkan masuk lagi ke %s untuk mengaktifkan perubahan"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Silahkan log out dan tekan Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X saat startup"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -299,227 +332,225 @@ msgstr ""
 "Saya bisa bikin komputermu akan menjalankan X saat booting.\n"
 "Kamu mau fasilitas ini ?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1152
+#, 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."
+msgstr ""
+"Saya bisa bikin komputermu akan menjalankan X saat booting.\n"
+"Kamu mau fasilitas ini ?"
+
+#: ../../Xconfigurator.pm_.c:1154
+#, fuzzy
+msgid "Choose the default user:"
+msgstr "Pilih ukuran baru"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Pilih tool yang hendak digunakan"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 warna (8 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 ribu warna (15 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 ribu warna (16 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 juta warna (24 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 milyar warna (32 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kb"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kb"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 mb atau lebih"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "standard VGA, 640x480 pada 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 pada 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 Kompatibel, 1024x768 pada 87 Hz interlaced (no 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "High Frequency SVGA, 1024x768 pada 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frequency yang dapat mencapai 1280x1024 pada 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frequency yang dapat mencapai 1280x1024 pada 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frequency yang dapat mencapai 1280x1024 pada 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor yang dapat mencapai 1600x1200 pada 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor yang dapat mencapai 1600x1200 pada 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "Si Kribo"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "Default"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "dasi"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "Si Brunet"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "cewek"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "gadis pirang"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "IP otomatis"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Sektor pertama di partisi boot"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Sektor pertama di drive (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "Instalasi LILO/grub"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "Instalasi SILO"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Bootloader akan diinstall di mana?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "Instalasi LILO/grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Tidak ada"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Bootloader mana yang hendak digunakan"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Instalasi Bootloader"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Device boot"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (tidak bisa dipakai pada BIOS kuno)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Compact"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "compact"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Delay sebelum boot ke image default"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Mode video"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Delay sebelum boot ke image default"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Password"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Password (lagi)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Batasi parameter command line"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "batasi"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Parameter Bootloader utama"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Silahkan ulangi"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Password tidak sama"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -527,226 +558,416 @@ msgstr ""
 "Ini adalah entri yang lain lagi.\n"
 "Anda boleh tambahkan atau mengubah yang sudah ada."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Tambah"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Selesai"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Tipe entri mana yang hendak ditambahkan"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "OS Lain (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "OS Lain (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Tipe entri mana yang hendak ditambahkan"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Image"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Sambung"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Read-write"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Table"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Tidak aman"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Label"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Default"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Hapus entri"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Label tidak boleh kosong"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Label ini sudah dipakai"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Ketemu interface %s %s"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Anda punya lagi?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Punya %s interface?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Tidak"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Ya"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Menginstall driver untuk card %s %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(module %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Driver %s mana yang hendak saya coba?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"Kadangkala, driver %s butuh informasi tambahan agar dapat bekerja normal\n"
+"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."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Probe otomatis"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Tuliskan optionnya"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Sekarang Anda boleh berikan parameter untuk module %s."
+
+#: ../../any.pm_.c:557
+#, 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"
+"Parameter biasanya dalam format ``nama=nilai nama2=nilai2...''.\n"
+"Misalnya, ``io=0x300 irq=8''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Pilihan Module:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Module %s gagal diload.\n"
+"Mau coba lagi dengan parameter yang lain?"
+
+# 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)
+#
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Selamat datang di Sang Pemilih Sistem Operasi, %s!\n"
+"\n"
+"Untuk melihat daftar pilihan, tekan <TAB>.\n"
+"\n"
+"Untuk meload salah satu, tulis namanya, dan tekan <ENTER> atau tunggu %d "
+"detik untuk boot ke default.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Selamat datang di sang pemilih sistem operasi, GRUB"
+
+#: ../../bootloader.pm_.c:597
+#, 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"
+
+#: ../../bootloader.pm_.c:598
+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"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "perintah sebelum booting, atau 'c' untuk command line."
+
+#: ../../bootloader.pm_.c:600
+#, 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:604
+msgid "not enough room in /boot"
+msgstr "Waah /boot nggak cukup spacenya nih"
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Desktop"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Start Menu"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "Cabut dalam %d detik"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Buat"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Unmount"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Hapus"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Format"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Ubah ukuran"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Tipe"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Posisi mount"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Tulis /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Berubah ke modus pakar"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Berubah ke modus normal"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Baca dari file"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Simpan di file"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Pulihkan dari floppy"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Simpan di floppy"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Hapus semua"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Format semua"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Pengalokasian otomatis"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Semua partisi primary telah digunakan"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Aku tak bisa menambah partisi lagi"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr ""
 "Untuk menambahkan partisi lagi, hapus satu agar dapat membuat partisiextended"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Selamatkan dulu tabel partisi"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Nggak Jadi (undo)"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Tulis tabel partisi"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Reload"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Kosong"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Lainnya"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Kosong"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Lainnya"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Tipe filesystem:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Detil"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -758,17 +979,17 @@ msgstr ""
 "Saya sarankan untuk meresize partisi ini\n"
 "(click di situ, dan pilih \"Ubah ukuran\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Mohon untuk membackup data Anda dulu"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Baca dengan seksama!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -778,77 +999,77 @@ msgstr ""
 "deh)\n"
 "di awal disk"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Hati-hati nih: operasi ini sangat berbuahayyya"
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Ada Kesalahan"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Posisi mount: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Device: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS letter: %s (hanya tebakan)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Tipe: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Mulai: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Ukuran: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektor"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Dari silinder %d sampai silinder %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Telah diformat\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Belum diformat\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Telah di-mount\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "File loopback: %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -856,79 +1077,79 @@ msgstr ""
 "Partisi di-boot secara default\n"
 "    (untuk MS-DOS boot, bukan untuk lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Level %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Ukuran chunk %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "Disk RAID %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Nama file loopback: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Silahkan pilih partisinya"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Ukuran: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Ukuran: %s silinber, %s head, %s sektor\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Partisi tipe: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "pada bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Mount"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Aktif"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Tambahkan ke RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Hapus dari RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Ganti RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "digunakan untuk loopback"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Pilih maunya apa"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -939,7 +1160,7 @@ msgstr ""
 "Kalau Anda pakai LILO dan nggak jalan, atau Anda nggak mau LILO dan nggak "
 "mau /boot juga"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -950,70 +1171,70 @@ msgstr ""
 "dan anda tidak memiliki partisi /boot. Apabila anda akan menggunakan lilo\n"
 "(boot manager), hati-hati dalam menambahkan partisi /boot"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"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 kalau mau pakai liloatawa "
-"grub"
+"Jadi hati-hati yah untuk tambahkan partisi /boot"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Gunakan ``%s'' saja"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Gunakan ``unmount'' terlebih dahulu"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, 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.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Cuek aja?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Keluar tanpa menyimpan"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Keluar dari program tanpa menyimpan dalam tabel partisi?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Merubah tipe partisi"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Tipe partisi yang anda diinginkan?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "Bahasa apa yang anda inginkan"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 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.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Device loopback %s akan di mount ke mana?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Mount device %s akan di mount ke mana?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1021,138 +1242,143 @@ msgstr ""
 "Nggak bisa unset mount point karena partisi ini sudah digunakan untuk\n"
 "loopback. Hapus dulu loopbacknya kalau mau begitu."
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, 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:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "sedang memformat"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Sekarang sedang memformat file loopback %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Melakukan format partisi %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Setelah melakukan format semua partisi,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "seluruh data dalam partisi-partisi ini akan hilang"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Pindah"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Disk mana yang hendak dipindah?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Sektor mana yang hendak dipindah"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Pindah"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Memindahkan partisi..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, 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:549
+#: ../../diskdrake.pm_.c:548
 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:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Sedang menghitung bound filesystem fat"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Sedang merubah ukuran"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Tipe partisi yang anda diinginkan?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "semua data pada partisi ini sebaiknya dibackup dulu"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, 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:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Pilih ukuran baru"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Membuat partisi baru"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Sektor awal: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Ukuran dalam MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Tipe filesystem: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Seting:"
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Partisi ini nggak bisa dipakai sebagai loopback"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Nama file loopback: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "File sudah digunakan loopback yang lain, pilih yang lainnya dong"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "File sudah ada. Gunakan file ini ?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Pilih file"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1160,11 +1386,11 @@ msgstr ""
 "Backup tabel partisi tidak memiliki ukuran yg sama\n"
 "Cuek saja?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Awas"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1172,79 +1398,79 @@ msgstr ""
 "Maukkan disket di drive\n"
 "semua data pada disket ini akan hilang"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Sedang mencoba menyelamatkan tabel partisi"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "device"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "level"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "ukuran chunk"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Pilih RAID yang ada untuk ditambahkan ke"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "baru"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s proses format dari %s gagal"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, 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:186
-msgid "nfs mount failed"
-msgstr "gagal mount nfs"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "gagal melakukan mount: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "error melakukan unmount %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Mount point harus diawali dengan /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, 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:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Mount melingkar %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 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"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "error membuka file %s untuk ditulisi: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1252,74 +1478,81 @@ msgstr ""
 "Error - tidak ada device yang valid untuk membuat filesystem baru.Periksa "
 "kembali hardware untuk mencari penyebabnya"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Kok belum punya partisi ?"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+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:10
-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:13
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "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 ""
+
+#: ../../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"
-"  - 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"
-msgstr ""
-"Pilihlah \"Instal\" jika Anda belum pernah menginstal Linux di komputer\n"
-"ini atawa ingin menginstall ulang Linux di mesin ini.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Pilih \"Upgrade\" kalau ingin mengupdate sistem Mandrake 5.1 (Venice),\n"
-"5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold 2000 atau 7.0 "
-"(Air).\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"
-"Pilih:\n"
+"\t* Recommanded: 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"
-"  - Otomatis (disarankan):  Bila Anda belum pernah install Linux.\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"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - Ahli     :  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\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1327,12 +1560,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Pilih:\n"
 "\n"
@@ -1347,33 +1581,31 @@ msgstr ""
 " 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\n"
+" belom cukup makan asam garam di dunia PERLINUXAN"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "Berikut adalah pilihan penggunaan mesin Anda yang telah aku sediakankarena "
 "dikau tadi memilih kelas instalasi \"Custom\" atau \"Pakar\":\n"
@@ -1396,149 +1628,367 @@ msgstr ""
 "          Karena itu jangan mengharapken saya menyediakan rupa-rupa\n"
 "          software yang ngejreng (KDE,GNOME...) di sini.\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
+#, fuzzy
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 akan coba mencari adapter SCSI PCI. Kalau ketemu dan punya\n"
-"drivernya, maka gue akan menggunakannya otomatis.\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 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"
+"\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"
+"Kalau Anda tidak mau, Anda bisa coba kasih optionnya\n"
+"Coba baca Petunjuk Instalasi 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: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"
+"\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"
-"Kalau adapter SCSI milikmu adalah ISA atau PCI tapi DrakX tidak\n"
-"tahu drivernya, atawa kalau emang ente nggak punya adapter SCSI\n"
-"Anda akan saya tanya lagi apakah benar punya SCSI atau nggak.\n"
-"Kalau nggak jawab \"Tidak\". Kalau punya, jawab \"Ya\" dong.\n"
-"Nanti akan muncul daftar driver, trus pilih deh.\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"
-"Habis itu, DrakX akan tanya lagi apakah akan memberikan parameter\n"
-"tambahan. Pertama kali, biarkan drivernya cari parameter sendiri\n"
-"biasanya sih bisa langsung tokcer.\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"
-"Kalau gagal, jangan lupa bahwa Anda harus tahu informasi hardwarenya\n"
-"cari di manualnya atau bahkan dari Windows (itu juga kalau ente punya)\n"
-"Nah informasi ini yang harus kamu isikan nantinya."
+"\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."
+msgstr ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:160
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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"
 "\n"
+"   * Auto allocate:: this option allows you to automatically create Ext2 and "
+"swap partitions in free space of your\n"
+"     hard drive.\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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
+msgstr ""
+
+#: ../../help.pm_.c:218
+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"
-"- Ctrl-d  to delete a partition\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"
-"- Ctrl-m  to set the mount point\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 ""
+
+#: ../../help.pm_.c:252
+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 ""
-"Sekarang, kamu bisa memilih partisi yang hendak digunakan untuk tempat\n"
-"menginstall sistem Linux-Mandrake pada partisi yang sudah dibuat sebelum\n"
-"nya (dengan Linux atau program partisi lain). Bila belum ada partisi\n"
-"silahkan buat. Pembuatan partisi adalah membagi hard disk komputer menjadi\n"
-"beberapa area untuk dikapling.\n"
+
+#: ../../help.pm_.c:257
+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 ""
+
+#: ../../help.pm_.c:267
+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"
-"Bila Anda telah membuat partisi baru, gunakan \"Alokasi otomatis\" untuk\n"
-"secara otomatis membuatkan partisi Linux. Anda bisa pilih drive yang\n"
-"hendak dipartisi dengan mengklik \"hda\" untuk drive pertama IDE,\n"
-"\"hdb\" untuk drive kedua atau \"sda\" untuk drive SCSI pertama dst.\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"
-"Ada dua partisi yang umum: partisi root (/), yang merupakan titik awal\n"
-"hirarki direktori filesystem, dan /boot, yang berisi file-file penting\n"
-"bagi sistem operasi untuk bekerja saat komputer dinyalakan.\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"
-"Karena biasanya proses ini tidak dapat dikembalikan ke asal, maka proses\n"
-"ini sangat menjengkelkan dan membikin stress bagi user yang belum berpe\n"
-"ngalaman. DiskDrake menyederhanakan proses ini sehingga sekarang tidak\n"
-"perlu jengkel dan stress lagi. Silahkan baca dokumentasi dan belajar\n"
-"dulu sebelum memulai.\n"
 "\n"
-"Anda bisa pakai macam-macam tombol di keyboard: bergerak di partisi\n"
-"pakai Tab/panah atas/bawah. Dan di partisi itu Anda bisa tekan:\n"
-" - Ctrl-c untuk buat partisi baru (pada partisi kosong)\n"
-" - Ctrl-d untuk hapus partisi\n"
-" - Ctrl-m untuk set titik mountnya\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 ""
+
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:303
 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."
+"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 ""
-"Partisi sekarang harus diformat agar dapat digunakan oleh sistem.Kalau ANda\n"
-"mau, Anda bisa format partisi lama yang sudah ada kalau ingin menghapus\n"
-"habisisi datanya\n"
-"Oh ya, partisi lama tidak perlu diformat lho...apalagi kalau\n"
-"Anda masih butuh datanya (misalnya: /home dan /usr/local)."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
+#, 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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 kamu pilih dulu grup paket yang mau kamu install\n"
 "atau yang mau diupgrade.\n"
@@ -1551,155 +2001,188 @@ msgstr ""
 "pilih \"Pilih paket sendiri\"; kalau-kalau kamu pingin melihat \n"
 "paket-paket yang ada (ada 1000an lebih lho...)"
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:358
+#, 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 ""
 "Kalau kamu punya semua CD pada daftar di atas, tekan OK.\n"
 "Kalau nggak punya sama sekali, click Cancel.\n"
 "Kalau cuma punya beberapa aja, pilih aja, trus klik Ok."
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:363
 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."
+"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 ""
-"Paket yang telah dipilih sedang diinstall. Proses ini makan waktu\n"
-"beberapa menit kecuali bila Anda sedang mengupgrade sistem, yang\n"
-"makan waktu lebih lama lagi, bahkan sebelum proses upgrade berlangsung."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:371
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"Bila DrakX gagal menemukan mouse, atau bila Anda mau\n"
-"tahu apa saja yg telah dilakukannya, Anda akan diberikan daftar\n"
-"mouse di atas.\n"
-"\n"
-"\n"
-"Bila Anda setuju dgn setting DrakX, langsung saja ke section\n"
-"lain dgn mengkliknya pada menu di kiri. Atau, pilih tipe mouse\n"
-"di menu yang lebih pas dengan mouse Anda.\n"
-"\n"
-"\n"
-"Bila mousenya merupakan mouse serial, jangan lupa bilang DrakX\n"
-"port serialnya sekalian."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
-"Pilih port yang betul. Misalnya COM1 di Windows sama dengan ttyS0 di Linux."
+"Pilih port yang betul. Misalnya COM1 di Windows sama dengan ttyS0 di "
+"GNU/Linux."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
+"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"
-"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"
-"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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"Bagian ini adalah untuk mengkonfigurasikan Local Area Network\n"
-"(LAN) atau Modem.\n"
-"\n"
-"Bila Anda jawab \"LAN Lokal\" sekarang, DrakX akan mencoba\n"
-"mencari adapter Ethernet di mesin ini. Adapter PCI biasanya akan\n"
-"mudah ditemukan dan diinit otomatis. Tapi kalau Anda punya ISA,\n"
-"deteksi otomatis tidak bisa dilakukan, dan Anda perlu pilih\n"
-"drivernya dari daftar yang akan muncul kemudian.\n"
-"\n"
-"\n"
-"Untuk adapter SCSI, drivernya bisa melakukan deteksi untuk \n"
-"adapter pertama kali, atau Anda perlu berikan parameter yang\n"
-"digunakan oleh drivernya, yang Anda bisa contek dari Control\n"
-"Panelnya Windows.\n"
-"\n"
-"\n"
-"Bila Anda menginstall sistem Linux-Mandrake di mesin yang merupakan\n"
-"bagian dari jaringan, Anda perlu data penting dari orang Network Anda\n"
-"berupa alamat IP, submask atau netmask Jaringan, dan hostname).\n"
-"Bila Anda melakukan konfigurasi jaringan privat di rumah misalnya, Anda\n"
-"perlu pilih alamatnya\n"
-"\n"
-"\n"
-"Pilih \"Dialup dengan modem\" untuk mengkonfigurasi koneksi \n"
-"ke Internet. DrakX akan mencari modem Anda, dan mengkonfigurasikannya\n"
-"Bila ia gagal mendeteksi modem, silahkan pilih serial port yang tepat\n"
-"tempat modem Anda disambungkan."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"Anda bisa masukkan dialup sekarang. Bila Anda nggak yakin apa yang harus "
+"dimasukkan,\n"
+"informasi ini bisa diperoleh dari ISP."
+
+#: ../../help.pm_.c:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
 "Masukkan:\n"
 "\n"
 "  - Alamat IP: Kalau Anda nggak tahu, tanyakan sana pada network "
-"administratornya.\n"
+"administratornya atau ISP.\n"
 "\n"
 "\n"
 "  - Netmask: Pilih aja \"255.255.255.0\", kecuali kalau ragu tanya juga ke\n"
-" network administratornya.\n"
+" network administratornya atau ISP.\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.\n"
+" Anda ragu juga, tanya lagi ke network administrator atau ISP.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"Bila network Anda menggunakan NIS, pilih \"Gunakan NIS\". Kalau nggak tahu, "
+"tanya\n"
+"network admin Anda dong."
+
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1708,7 +2191,7 @@ msgstr ""
 "dimasukkan,\n"
 "informasi ini bisa diperoleh dari ISP."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1718,13 +2201,15 @@ msgstr ""
 "nggak tahu pakai proxy apa nggak, tanya gih ke network administratornya atau "
 "ISP."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1735,29 +2220,42 @@ msgstr ""
 "Perhatikan bahwa Anda harus pilih mirror dan kriptografi sesuai ketentuan\n"
 "yang berlaku di daerah Anda."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "Sekarang Anda bisa pilih timezone sesuai dengan tempat tinggal Anda.\n"
 "\n"
 "\n"
-"Linux mengatur jam dengan GMT atawa \"Greenwich Mean Time\" dan \n"
+"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:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 "
@@ -1767,80 +2265,159 @@ msgstr ""
 "Hati-hati pilihnya ya, apalagi kalau mau pakai sistem ini sebagai server\n"
 "jangan sembarang nyalakan service yang nggak perlu"
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
+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:490
+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:505
+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 ""
+
+#: ../../help.pm_.c:521
 msgid ""
-"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"
+"Please turn on your printer before continuing to let DrakX detect it.\n"
+"\n"
+"You have to enter some informations here.\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"
+"   * 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"
-"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"
+"   * 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"
-"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."
+"   * 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 ""
-"Linux bisa menggunakan berbagai macam printer. Tiap jenis\n"
-"membutuhkan setingan yang berbeda pula. Perhatikan bahwa\n"
-"walaupun nama default spool print adalah 'lp', Anda bisa\n"
-"tambahkan keterangan lain dengan memberi karakter '|' sebagai\n"
-"batasnya. Jadi misalnya Anda ingin memberi keterangan\n"
-"dengan \"Printer Gue nih|lp\" pada printer, maka dia adalah\n"
-"sekaligus dijadikan printer defaultnya\n"
+
+#: ../../help.pm_.c:542
+msgid ""
+"You need to enter some informations here.\n"
 "\n"
 "\n"
-"Kalau printernya langsung dicolok ke komputermu, pilih\n"
-"\"Printer Lokal\". Anda akan diminta menyebutkan port tempat\n"
-"si printer disambung, dan pilihlah filter yang tepat.\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:567
+msgid ""
+"Your printer has not been detected. Please enter the name of the device on\n"
+"which it is connected.\n"
 "\n"
 "\n"
-"Kalah Anda ingin mengakses printer yang ada di mesin Unix remote,\n"
-"silahkan pilih \"Antrian lpd remote\". Agar bisa digunakan \n"
-"silahkan berikan nama antrian printer di server ini, tidak usah\n"
-"pakai username atau password\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:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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"
-"Atau bila ingin menggunakan printer SMB (yang berarti printernya\n"
-"ada di mesin Windows 9x/NT), Anda harus berikan nama SMBnya\n"
-"(biasanya nama komputernya, bukan nama TCP/IP), dan alamat IP\n"
-"nya sekalian. Jangan lupa username, workgroup, dan password\n"
-"agar bisa mengakses printernya, dan juga jangan ketinggalan nama\n"
-"printernya. Setup ini juga mirip kalau ingin pakai printer Netware\n"
-"tapi nggak usah pakai informasi workgroup."
+"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 ""
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:585
+#, fuzzy
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"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 untuk root untuk\n"
 "sistem Linux-Mandrake ini. Passwordnya harus diketikkan dua kali untuk\n"
@@ -1856,7 +2433,7 @@ msgstr ""
 "pernah menuliskan password Anda di kertas atau dimana saja. Jangan\n"
 "buat password Anda terlalu panjang atau rumit, ntar bisa lupa."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1864,7 +2441,7 @@ msgstr ""
 "Agar sistem Anda lebih secure, silahkan pilih \"Gunakan file shadow\" dan \n"
 "\"Password Pakai MD5\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1873,7 +2450,7 @@ msgstr ""
 "tanya\n"
 "network admin Anda dong."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1916,35 +2493,31 @@ msgstr ""
 "yang telah Anda buat disini, dan login sebagai root, hanya untuk \n"
 "keperluan administratif dan maintenance saja yah."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Hooi, mas, mbak, jawab \"Ya\" di sini! Ibaratnya, kalau Anda\n"
-"reinstall Windows, dia akan overwrite boot sectornya. Kecuali kalau\n"
-"Anda punya bootdisknya, maka Anda tidak akan bisa boot ke Linux\n"
-"lagi!"
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
-"Sistem sekarang sedang dibuat di disk Anda,\n"
-"nah sekarang tolong dong diberitahu di mana saya akan membuatnya.\n"
+"Sekarang saya ingin tanya kepada Anda\n"
+"tempat saya bisa meletakkan informasi yang akan dipakai GNU/Linux saat "
+"boot.\n"
 "\n"
 "\n"
 "Kalau Anda kurang tahu, yah pilih saja \"Sektor pertama di \n"
 "drive (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1952,10 +2525,10 @@ 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:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1966,7 +2539,7 @@ msgid ""
 "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"
-"Linux atau sistem operasi lain yang ada di komputer ini.\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"
@@ -1978,7 +2551,8 @@ msgstr ""
 "itu\n"
 "kamu perlu bootdisk nantinya."
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1995,7 +2569,9 @@ msgid ""
 "\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."
 msgstr ""
 "Pilihan LILO dan grub adalah:\n"
@@ -2017,10 +2593,63 @@ msgstr ""
 "  * normal: pilih mode text 80x25\n"
 "  * <angka>: gunakan mode text."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 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:692
+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."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2032,7 +2661,7 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 "Sekarang Anda akan mengkonfigurasikan X Window System, yang merupakan\n"
-"inti GUI (Graphical User Interface) bagi Linux. Sekarang,\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"
@@ -2043,7 +2672,7 @@ msgstr ""
 "Kalau tidak cocok, Anda bisa kembali lagi dan merubah konfigurasi\n"
 "lalu coba lagi."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2051,7 +2680,7 @@ msgstr ""
 "Bila ada yang ngaco pada konfigurasi Xnya, silahken pakai pilihan ini untuk\n"
 "membuat X Window System lebih bagus."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2059,42 +2688,47 @@ msgstr ""
 "Bila Anda ingin menggunakan login grafik, pilih aje \"Ya\". Kalau nggak,\n"
 "pilih aje \"Tidak\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\n"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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"
+"\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."
 msgstr ""
 "Anda bisa pilih opsi berikut untuk sistem ini.\n"
 "\n"
@@ -2115,8 +2749,8 @@ msgstr ""
 " dengan mode ini juga khusus buat server aja yaaa.\n"
 "\n"
 "\n"
-"  - Penentuan RAM bila perlu: Kadang kala, Linux nggak bisa mendeteksi RAM "
-"yang\n"
+"  - Penentuan RAM bila perlu: Kadang kala, GNU/Linux nggak bisa mendeteksi "
+"RAM yang\n"
 " ada di sistem. Sayangnya walaupun dunia komputer udah canggih begini,\n"
 " nggak ada cara baku untuk cari tahu jumlah memori via BIOS dengan akurat.\n"
 " Kalau ini terjadi pada dirimu, tulis saja RAMnya. Oh ya,\n"
@@ -2132,7 +2766,7 @@ msgstr ""
 "booting, pilih aja ini (Perhatikan: Num Lock bisa nyala bisa juga nggak di "
 "X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2146,96 +2780,117 @@ msgstr ""
 "Bila ANda ingin boot ke sistem operasi lain, silahkan baca instruksi\n"
 "tambahan."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Pilih Bahasamu"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Pilih kelas instalasi"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Deteksi hard disk"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Konfigurasi mouse"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Pilih Keyboardmu"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Lain-lain"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Setup filesystem"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Melakukan format partisi"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Paket yang akan diinstall"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Instal system"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Konfigureasi jaringan"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Kriptografi"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Konfigurasi timezone"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Konfigurasi service"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Konfigurasi printer"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Set password root"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Menambah user"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Membuat bootdisk"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Install bootloader"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Konfigurasi X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Disket auto install"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Keluar dari proses instal"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Error saat membaca file $f"
+
+#: ../../install_gtk.pm_.c:426
+#, fuzzy
+msgid "Please test the mouse"
+msgstr "Tipe mouse yang anda punya?"
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Tipe mouse yang anda punya?"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2245,232 +2900,250 @@ msgstr ""
 "Caranya, buatlah partisi (atau pilih di yang sudah ada).\n"
 "Lalu pilih ``Mount point'' dan set ke `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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"
-"Aku akan coba hapus partisi yg jeleknya"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "Anda harus buat partisi swap"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake gagal membaca tabel partisi Anda.\n"
-"Lanjutkan tapi resiko tanggung kendiri!"
+"Anda belum punya partisi swap\n"
+"\n"
+"Cuek aja?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Mencari partisi root."
+#: ../../install_interactive.pm_.c:68
+#, fuzzy
+msgid "Use free space"
+msgstr "digunakan untuk loopback"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Informasi"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: Ini bukan partisi root, silahkan pilih yang lain."
+#: ../../install_interactive.pm_.c:78
+#, fuzzy
+msgid "Use existing partition"
+msgstr "Melakukan format partisi"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Tidak ada partisi root"
+#: ../../install_interactive.pm_.c:80
+#, fuzzy
+msgid "There is no existing partition to use"
+msgstr "Sedang mencoba menyelamatkan tabel partisi"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Saya tidak bisa gunakan broadcast tanpa domain NIS"
+#: ../../install_interactive.pm_.c:87
+#, fuzzy
+msgid "Use the Windows partition for loopback"
+msgstr "digunakan untuk loopback"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Error saat membaca file $f"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Partisi mana yang hendak dipakai oleh Linux4Win?"
 
-#: ../../install_steps.pm_.c:75
-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"
-"Lanjutkan saja, tapi resiko tanggung sendiri yah."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Pilih ukurannya"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Lokasi mount %s ada dua"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Ukuran partisi root dalam MB: "
 
-#: ../../install_steps.pm_.c:323
-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"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Ukuran partisi swap dalam MB: "
+
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
 msgstr ""
-"Ada paket yang penting nggak 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:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Selamat Datang di %s"
+#: ../../install_interactive.pm_.c:105
+#, fuzzy
+msgid "Which partition do you want to resize?"
+msgstr "Tipe partisi yang anda diinginkan?"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Wah maaf nih, nggak ada floppy drive yah ?"
+#: ../../install_interactive.pm_.c:107
+#, fuzzy
+msgid "Computing Windows filesystem bounds"
+msgstr "Sedang menghitung bound filesystem fat"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "Memulai langkah `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "Anda harus buat partisi swap"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
+#, fuzzy
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"Anda belum punya partisi swap\n"
+"AWAS!\n"
 "\n"
-"Cuek aja?"
+"DrakX sekarang hendak merubah ukuran partisi Windows Anda. Hati-hati:\n"
+"prosesnya ini suanguat berbuahaya. Bila Anda belum melakukannya, silahkan\n"
+"untuk scandisk dulu (dan defrag juga) di partisi ini lalu backup datanya.\n"
+"Habis itu yakin dulu, baru tekan Ok."
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Pilih ukuran yang akan diinstal"
+#: ../../install_interactive.pm_.c:122
+#, fuzzy
+msgid "Which size do you want to keep for windows on"
+msgstr "Sektor mana yang hendak dipindah"
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Ukuran total: "
+#: ../../install_interactive.pm_.c:123
+#, fuzzy, c-format
+msgid "partition %s"
+msgstr "Partisi"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Versi: %s\n"
+#: ../../install_interactive.pm_.c:129
+#, fuzzy, c-format
+msgid "FAT resizing failed: %s"
+msgstr "Resize otomatis gagal"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "Ukuran: %d KB\n"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Pilih paket yang akan diinstal"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Instal"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Sedang melakukan instal"
+#: ../../install_interactive.pm_.c:156
+#, fuzzy, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "Sehabis meresize partisi %s, semua data pada partisi ini akan hilang"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Silahkan tunggu, "
+#: ../../install_interactive.pm_.c:164
+#, fuzzy
+msgid "Expert mode"
+msgstr "Ahli"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Sisa waktu "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Total waktu"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Sedang menyiapkan instalasi"
+#: ../../install_interactive.pm_.c:171
+#, fuzzy, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Anda bisa buat partisi di hard disk %s \n"
+"Habis itu, jangan lupa simpan dengan menekan tombol `w'"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
-#, c-format
-msgid "Installing package %s"
-msgstr "Sedang instal paket %s"
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Eh, kamu kan nggak punya partisi windows!"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Cuek aja?"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Aku tak bisa menambah partisi lagi"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Ada error mengurutkan paket"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Gunakan konfigurasi X11 yang ada?"
+#: ../../install_interactive.pm_.c:218
+#, fuzzy, c-format
+msgid "Partitioning failed: %s"
+msgstr "Partisi tipe: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Ehm, silahkan pilih kelas instalasi di bawah:"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Up-kan Jaringan"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Eh, kamu kan nggak punya partisi windows!"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Matikan Jaringan"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Wah, kamu nggak punya cukup space buat Lnx4win"
+#: ../../install_steps.pm_.c:74
+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"
+"Lanjutkan saja, tapi resiko tanggung sendiri yah."
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Lokasi mount %s ada dua"
+
+#: ../../install_steps.pm_.c:375
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"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 ""
-"AWAS!\n"
-"\n"
-"DrakX sekarang hendak merubah ukuran partisi Windows Anda. Hati-hati:\n"
-"prosesnya ini suanguat berbuahaya. Bila Anda belum melakukannya, silahkan\n"
-"untuk scandisk dulu (dan defrag juga) di partisi ini lalu backup datanya.\n"
-"Habis itu yakin dulu, baru tekan Ok."
+"Ada paket yang penting nggak 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_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Resize otomatis gagal"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Selamat Datang di %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Partisi mana yang hendak dipakai oleh Linux4Win?"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Wah maaf nih, nggak ada floppy drive yah ?"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Pilih ukurannya"
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Memulai langkah `%s'\n"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Ukuran partisi root dalam MB: "
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Ukuran partisi swap dalam MB: "
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Ehm, silahkan pilih kelas instalasi di bawah:"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2485,7 +3158,7 @@ msgstr ""
 "dan sebaliknya persentase 100% akan install semua paket yang tadi sudah\n"
 "dipilih"
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2502,58 +3175,102 @@ msgstr ""
 "dan sebaliknya persentase %d%% akan install paket yang tadi sudah\n"
 "dipilih sebanyak-banyaknya"
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 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:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Persentase paket yang akan diinstall"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Pilih paket yang akan diinstal"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Instal"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Dependensi otomatis"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Buka Tree"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Tutup Tree"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Togel tampilan rata dan terurut grupnya"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Paket Error"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nama: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versi: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Ukuran: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Derajat: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Ukuran total: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+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"
+
+#: ../../install_steps_gtk.pm_.c:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "Paket ini yang akan diuninstall"
+
+#: ../../install_steps_gtk.pm_.c:387
+#, fuzzy
+msgid "The following packages are going to be removed"
+msgstr "Paket berikut adalah yang akan diinstall/dihapus"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Anda nggak bisa pilih/buang paket ini"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Paket ini harus diinstall, nggak bisa dibuang"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "Anda nggak bisa buang paket ini, sebab dia sudah diinstall"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2561,46 +3278,89 @@ msgstr ""
 "Paket ini mesti diupgrade\n"
 "Bener nggak mau dipilih?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Kamu nggak bisa buang paket ini. dia mesti diupgrade"
 
-#: ../../install_steps_gtk.pm_.c:493
-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"
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Paket berikut adalah yang akan diinstall/dihapus"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "Anda nggak bisa pilih/buang paket ini"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Sedang melakukan instal"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Perkiraan"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Silahkan tunggu, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Sisa waktu "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Total waktu"
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Batalkan"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Sedang menyiapkan instalasi"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d paket"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Sedang instal paket %s"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Accept"
+msgstr "Terima user"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2615,182 +3375,386 @@ msgstr ""
 "Kalau Anda nggak punya CDROM ini, teken Batal aja untuk membatalkan "
 "instalasidari CD ini."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Ubah ukuran"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Cuek aja?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Ada error mengurutkan paket"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Ada error saat menginstall paket"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Ada error"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Pilih dulu bahasanya dong bow"
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Keyboard"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Pilih Keyboardmu"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 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:91
-msgid "Root Partition"
-msgstr "Partisi root"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Apa sih partisi root (/) di sistem ini?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Kelas Instal"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Kelas instalasi yang anda diinginkan?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Instal/Upgrade"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "Akan instal atau upgrade?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Otomatis"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Disarankan"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Customized"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Ahli"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
+#, fuzzy
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
-"Ah, enter Pakar? Yang bener nihh...\n"
+"Ah, ente Pakar? Yang bener nihh...\n"
 "Lo bakalan bisa ngutak-atik dengan leluasa namun berbahaya dengan mode ini."
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Upgrade"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Normal"
+#: ../../install_steps_interactive.pm_.c:222
+#, fuzzy
+msgid "Workstation"
+msgstr "Informasi"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Development"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Server"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+#, fuzzy
+msgid "What is your system used for?"
 msgstr "Ngomong-ngomong, sistem Anda nanti dipakai untuk apa?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Tipe mouse yang anda punya?"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Port Mouse"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 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:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Konfigurasikan card PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "konfigurasi IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "Tidak ada partisi"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Partisi mana yang hendak digunakan sebagai partisi root"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Pilih lokasi mount"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, fuzzy, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Saya nggak bisa baca tabel partisi, udah hancur lebur nih :(\n"
+"Aku akan coba hapus partisi yg jeleknya"
+
+#: ../../install_steps_interactive.pm_.c:329
+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!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Partisi root"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Apa sih partisi root (/) di sistem ini?"
+
+#: ../../install_steps_interactive.pm_.c:352
 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:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Pilih partisi yang akan diformat"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Periksa bad block ?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Melakukan format partisi"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Membuat dan memformat file %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 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:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Sedang mencari paket yang tersedia"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Mencari paket untuk diupgrade"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, fuzzy, 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"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Complete (%dMB)"
+msgstr "Normal"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Minimum (%dMB)"
+msgstr "(%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Recommended (%dMB)"
+msgstr "Disarankan"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "Customized"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Pilih ukuran yang akan diinstal"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Pilihan Grup Paket"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Pilih paket sendiri"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2800,12 +3764,12 @@ msgstr ""
 "Kalau nggak punya sama sekali, click Cancel.\n"
 "Kalau cuma punya beberapa aja, pilih aja, trus klik Ok."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Label CD-ROM \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2813,173 +3777,11 @@ msgstr ""
 "Sedang instal paket %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Konfigurasi Instalasi akhir"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Biarkan konfigurasi IP sekarang"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Ayo kita konfigurasi jaringan"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Jangan Konfigurasi jaringan"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Konfigurasi Jaringan"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Jaringan LAN telah dikonfigurasikan sebelumnya. Sekarang Anda ingin:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Anda ingin konfigurasikan jaringan lokal untuk sistem ini ?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "Tidak ada card network ya?"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Konfigurasi Modem"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "Anda ingin konfigurasikan koneksi dialup untuk sistem ini ?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Konfigurasi perangkat jaringan %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Masukkan konfigurasi IP untuk mesin ini.\n"
-"Tiap item harus diberikan sebagai alamat IP dalam notasi decimal\n"
-"bertitik (misalnya 202.159.35.32)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "IP otomatis"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "Alamat IP:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Netmask:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "Alamat IP harus dalam format 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Konfigureasi jaringan"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Masukkan nama komputernya.\n"
-"Hostname (nama komputer) sebaiknya merupakan nama host yg fully-qualified\n"
-"misalnya ``mdamt.fdns.net''.\n"
-"Anda juga bisa masukkan alamat IP gatewaynya kalau ada"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "Server DNS:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Device Gateway: "
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Gateway:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Nama Host:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Cari Modem?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Di serial port mana modem Anda disambungkan?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Parameter Dialup"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Nama koneksi"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Nomor telepon"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Login ID"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Autentikasi"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Script-based"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Terminal-based"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Nama domain"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Server DNS Primary"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Server DNS Sekondari"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3046,88 +3848,94 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Pilih mirror tempat Anda ingin mengambil paket program"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 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:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Pilih paket yang akan diinstal"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
+#, fuzzy
 msgid "Which is your timezone?"
-msgstr "Timezone Anda?"
+msgstr "Ngomong-ngomong, sistem Anda nanti dipakai untuk apa?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Apakah jam hardwarenya di set ke GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "Tipe partisi yang anda diinginkan?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Tak berpassword"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Gunakan file shadow"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Password pakai MD5"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Gunakan NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "yellow pages"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, 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:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Autentikasi NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "Domain NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "Server NIS"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Terima user"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Menambah user"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(Sudah ditambahkan %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3137,60 +3945,86 @@ msgstr ""
 "Masukkan user\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Nama sebenarnya"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Nama user"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Password ini terlalu sederhana"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Silahkan memberikan nama user"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Nama user hanya boleh terdiri dari huruf, angka, `-' dan `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "User ini sudah ada sebelumnya"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Bootdisk baru membantu Anda untuk melakukan boot sistem Linux tanpa\n"
+"tergantung pada bootloader. Kadang ini berguna bila Anda tidak mau install\n"
+"SILO  di sistem Anda, atau saat sistem operasi lain menghapus SILO, atau "
+"SILO\n"
+"tidak bisa digunakan pada konfigurasi hardware Anda. Bootdisk ini juga bisa "
+"digunakan\n"
+"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:869
 msgid "First floppy drive"
 msgstr "Drive Disket Pertama"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Drive disket kedua"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Lewatkan"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3212,64 +4046,33 @@ 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:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Wah maaf nih, nggak ada floppy drive yah ?"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 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:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Masukkan disket di drive %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Membuat bootdisk"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "Instalasi LILO gagal. Ada kesalahan berikut:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Mau pakai SILO saja?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "Parameter SILO utama"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Ini adalah entri di SILO.\n"
-"Anda boleh tambahkan atau mengubah yang sudah ada."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Partisi"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Label ini sudah dipakai"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "Instalasi SILO gagal. Ada kesalahan berikut:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Membuat bootloader"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
+#, fuzzy
 msgid "Do you want to use aboot?"
-msgstr "Mau pakai aboot saja?"
+msgstr "Mau pakai SILO saja?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3277,125 +4080,119 @@ msgstr ""
 "Wah ada error saat install aboot,\n"
 "Paksakan instalasi nggak walaupun nanti bisa merusak partisi awal?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Konfigurasi Proxy"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "Proxy HTTP"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "Proxy FTP"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy biasanya http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy biasanya ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+#, fuzzy
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "Instalasi LILO gagal. Ada kesalahan berikut:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Selamat Datang di Crackers"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Lemah Buanget"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Lemah"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Sedang"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Kuat"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Wah Sinting nih"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Pertanyaan Tambahan"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(mungkin akan membuat disk corrupt)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Gunakan optimasi hard drive?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Pilih Tingkat Security"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Ukuram RAM yg tepat (saya nemu %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Automount media removable"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Hapus /tmp saat boot"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Buat multi profil"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Enable num lock saat startup"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Berikan jumlah RAM dalam satuan MB"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Wah nggak bisa pakai supermount di level security Tinggi"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX akan membuat file konfigurasi untuk XFree 3.3 dan XFree 4.0\n"
-"Sebagai defaultnya, server 3.3 akan dipakai karena banyak drivernya.\n"
-"\n"
-"Apakah Anda ingin coba XFree 4.0 saja ?"
+"perhatian: DI LEVEL SEKURITI INI, LOGIN SEBAGAI ROOT PADA KONSOLE TIDAK "
+"AKAN\n"
+"DIPERBOLEHKAN!!! Kalau ingin jadi root, Anda perlu login sebagai user dan\n"
+"kemudian gunakan \"su\". Jangan pakai mesin ini selain jadi server yah!\n"
+"Udah aku bilangin lho..."
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Cari Device PCI?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Gunakan konfigurasi X11 yang ada?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 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:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Masukkan disket kosong di drive %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Lagi buat disket auto install"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3405,7 +4202,7 @@ msgstr ""
 "\n"
 "Anda ingin keluar sekarang?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3424,153 +4221,18 @@ msgstr ""
 "Informasi untuk konfigurasi sistem juga tersedia di \n"
 "bab Instalasi di Buku Petunjuk Resmi Linux Mandrake."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Lagi matiin komputer"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Menginstall driver untuk card %s %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(module %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Driver %s mana yang hendak saya coba?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"Kadangkala, driver %s butuh informasi tambahan agar dapat bekerja normal\n"
-"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."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Probe otomatis"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Tuliskan optionnya"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Sekarang Anda boleh berikan parameter untuk module %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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"
-"Parameter biasanya dalam format ``nama=nilai nama2=nilai2...''.\n"
-"Misalnya, ``io=0x300 irq=8''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Pilihan Module:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Module %s gagal diload.\n"
-"Mau coba lagi dengan parameter yang lain?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Cari card PCMCIA?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Konfigurasikan card PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Cari Device %s ?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Ketemu interface %s %s"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Anda punya lagi?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Punya %s interface?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Tidak"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Ya"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Lihat info hardware"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Up-kan Jaringan"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Matikan Jaringan"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Instalasi Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> untuk pindah | <Spasi> untuk pilih | <F12> Layar berikut"
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"Anda bisa buat partisi di hard disk %s \n"
-"Habis itu, jangan lupa simpan dengan menekan tombol `w'"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Silahkan menunggu"
 
@@ -3580,7 +4242,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Tidak jelas (%s), coba yang lebih tepat\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Pilihan salah, silahkan ulangi\n"
 
@@ -3594,442 +4256,968 @@ msgstr " ? (default %s) "
 msgid "Your choice? (default %s) "
 msgstr "Pilihan anda? (default %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Pilihan anda? (default %s  pilih 'none' untuk tidak ada) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "Ceko"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Jerman"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Spanyol"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Finland"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Perancis"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norwegia"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Polandia"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Rusia"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Keyboard UK"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "Keyboard US"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armenia (lama)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armenia (mesintik)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armenia (phonetic)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belgia"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulgaria"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazilia"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "Belarusia"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Swiss (layout Jerman)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Swiss (layout Perancis)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Jerman (tanpa dead key)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Denmark"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+#, fuzzy
+msgid "Dvorak (US)"
+msgstr "Dvorak"
+
+#: ../../keyboard.pm_.c:139
+#, fuzzy
+msgid "Dvorak (Norwegian)"
+msgstr "Norwegia"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Estonia"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgia (layout \"Rusia\")"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgia (layout \"Latin\")"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Yunani"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Hungaria"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Kroasia"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Ibrani"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Ibrani (Phonetic)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+#, fuzzy
+msgid "Iranian"
+msgstr "Ukrania"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islandia"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Itali"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Amerika Latin"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Belanda"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lithuania AZERTY (lama)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lithuania AZERTY (baru)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lithuania \"number row\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lithuania \"phonetic\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Polandia (layout qwerty)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Polandia (layout qwertz)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugis"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanada (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Rusia (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Swedia"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Slovenia"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slovakia"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Keyboard Thailand"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turki (model \"F\" tradisional)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turki (model \"Q\" modern)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukrania"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "Keyboard US (internasional)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+#, fuzzy
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Lithuania \"number row\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Yugoslavia (layout latin)"
 
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Mouse Sun"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Generik"
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "level"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "serial"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Mouse Generik 2 Tombol"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Mouse Generik 3 Tombol"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Sistem Mouse (serial)"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (serial, old C7 type)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Tidak pakai mouse"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "tidak ada"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Tidak pakai mouse"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Apa sudah sesuai?"
+
+#: ../../netconnect.pm_.c:93
+#, fuzzy
+msgid "Internet configuration"
+msgstr "Konfigurasi Proxy"
+
+#: ../../netconnect.pm_.c:94
+#, fuzzy
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Anda ingin test konfigurasi ini?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Konfigureasi jaringan"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Jangan Konfigurasi jaringan"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Nama koneksi"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+#, fuzzy
+msgid "ISDN Configuration"
+msgstr "konfigurasi"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "Konfigurasi Proxy"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr ""
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr ""
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr ""
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:169
+#, fuzzy
+msgid "Provider phone number"
+msgstr "Nomor telepon"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr ""
+
+#: ../../netconnect.pm_.c:172
+#, fuzzy
+msgid "Dialing mode"
+msgstr "Dialup dengan modem"
+
+#: ../../netconnect.pm_.c:174
+#, fuzzy
+msgid "Account Login (user name)"
+msgstr "Posisi mount"
+
+#: ../../netconnect.pm_.c:175
+#, fuzzy
+msgid "Account Password"
+msgstr "Password"
+
+#: ../../netconnect.pm_.c:176
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Password"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "Test konfigurasi"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:214
+#, fuzzy
+msgid "Which protocol do you want to use ?"
+msgstr "Tipe partisi yang anda diinginkan?"
+
+#: ../../netconnect.pm_.c:224
+#, fuzzy
+msgid "ISA / PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+#, fuzzy
+msgid "PCI"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr ""
+
+#: ../../netconnect.pm_.c:233
+#, fuzzy
+msgid "What kind of card do you have?"
+msgstr "Tipe printer yang anda inginkan?"
+
+#: ../../netconnect.pm_.c:239
+#, fuzzy
+msgid "Continue"
+msgstr "Cuek aja?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr ""
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:257
+#, fuzzy
+msgid "Which is your ISDN card ?"
+msgstr "Timezone Anda?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:287
+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 ""
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr ""
+
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "Pilih ukuran baru"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Di serial port mana mouse Anda dicolokkan ?"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
+"Do you agree?"
 msgstr ""
-"Selamat datang di Sang Pemilih Sistem Operasi, LILO!\n"
+
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Anda ingin test konfigurasi ini?"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "konfigurasi"
+
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "Mau pakai aboot saja?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Cari Modem?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Di serial port mana modem Anda disambungkan?"
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Parameter Dialup"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Nama koneksi"
+
+#: ../../netconnect.pm_.c:546
+#, fuzzy
+msgid "Phone number"
+msgstr "Nomor telepon"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Login ID"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Autentikasi"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Script-based"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Terminal-based"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Nama domain"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Server DNS Primary"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Server DNS Sekondari"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
 "\n"
-"Untuk melihat daftar pilihan, tekan <TAB>.\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Nama koneksi"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
 "\n"
-"Untuk meload salah satu, tulis namanya, dan tekan <ENTER> atau tunggu %d "
-"detik untuk boot ke default.\n"
+"You can reconfigure your connection."
+msgstr "Konfigureasi jaringan"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Jangan Konfigurasi jaringan"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
 "\n"
+"You can disconnect or reconfigure your connection."
+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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Selamat datang di sang pemilih sistem operasi, GRUB"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Jangan Konfigurasi jaringan"
 
-#: ../../lilo.pm_.c:432
-#, 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"
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Nama koneksi"
 
-#: ../../lilo.pm_.c:433
-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"
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Nama koneksi"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "perintah sebelum booting, atau 'c' untuk command line."
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Konfigureasi jaringan"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Entri yang dipilih akan diboot secara otomatis dalam %d detik."
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "Koneksi Printer"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "Waah /boot nggak cukup spacenya nih"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Desktop"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Konfigureasi jaringan"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Start Menu"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Konfigureasi jaringan"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Mouse Sun"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr ""
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Mouse ADB Apple"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Ahli"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Mouse ADB Apple (2 tombol)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+#, fuzzy
+msgid "Connect to the Internet"
+msgstr "Nama koneksi"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Mouse ADB Apple (3 tombol atau lebih)"
+#: ../../netconnect.pm_.c:672
+#, fuzzy
+msgid "What kind is your ISDN connection?"
+msgstr "Di serial port mana mouse Anda dicolokkan ?"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Mouse USB Apple"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Konfigureasi jaringan"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Mouse USB Apple (2 tombol)"
+#: ../../netconnect.pm_.c:700
+#, fuzzy
+msgid "France"
+msgstr "Batalkan"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Mouse USB Apple (3 tombol atau lebih)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr ""
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Mouse Generik (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr ""
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Mouse Generik 3 Tombol (PS/2)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "Ahli"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Konfigureasi jaringan"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Tipe partisi yang anda diinginkan?"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Konfigureasi jaringan"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "Konfigureasi jaringan"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "Bus Mouse ATI"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Konfigurasi Jaringan"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Bus Mouse Microsoft"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Anda ingin test konfigurasi ini?"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Bus Mouse Logitech"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "Konfigureasi jaringan"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "Mouse USB"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Nama koneksi"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "Mouse USB (3 tombol atau lebih)"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "Jaringan LAN telah dikonfigurasikan sebelumnya. Sekarang Anda ingin:"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Tidak pakai mouse"
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "Disk mana yang hendak dipindah?"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A atau yg baruan (serial)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Konfigurasi Jaringan"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (serial)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (serial)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "Tidak ada card network ya?"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (serial)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Konfigureasi jaringan"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (serial)"
+#: ../../network.pm_.c:274
+#, fuzzy
+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.\n"
+"Hostname (nama komputer) sebaiknya merupakan nama host yg fully-qualified\n"
+"misalnya ``mdamt.fdns.net''.\n"
+"Anda juga bisa masukkan alamat IP gatewaynya kalau ada"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (serial)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+#, fuzzy
+msgid "Host name"
+msgstr "Nama Host:"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (serial)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (serial)"
+#: ../../network.pm_.c:302
+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 ""
+"Masukkan konfigurasi IP untuk mesin ini.\n"
+"Tiap item harus diberikan sebagai alamat IP dalam notasi decimal\n"
+"bertitik (misalnya 202.159.35.32)."
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (serial, old C7 type)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Konfigurasi perangkat jaringan %s"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (serial)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "IP otomatis"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Mouse generik (serial)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "IP address"
+msgstr "Alamat IP:"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Mouse Microsoft (serial)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Netmask"
+msgstr "Netmask:"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Mouse Generik 3 tombol (serial)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Sistem Mouse (serial)"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "Alamat IP harus dalam format 1.2.3.4"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Apa sudah sesuai?"
+#: ../../network.pm_.c:341
+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 ""
+"Masukkan nama komputernya.\n"
+"Hostname (nama komputer) sebaiknya merupakan nama host yg fully-qualified\n"
+"misalnya ``mdamt.fdns.net''.\n"
+"Anda juga bisa masukkan alamat IP gatewaynya kalau ada"
+
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "Server DNS:"
+
+#: ../../network.pm_.c:347
+#, fuzzy
+msgid "Gateway"
+msgstr "Gateway:"
+
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "Device Gateway: "
+
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Konfigurasi Instalasi akhir"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "Proxy HTTP"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "Proxy FTP"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy biasanya http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy biasanya ftp://..."
 
-#: ../../partition_table.pm_.c:528
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr "Partisi extended nggak bisa dipakai di platform ini"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4039,21 +5227,21 @@ msgstr ""
 "Satu-satunya cara adalah memindahkan partisi primary Anda ke partisi\n"
 "extended selanjutnya"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Error saat membaca file %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Proses restore dari file %s gagal: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "File backup rusak"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Error pada saat menulis file %s"
@@ -4087,42 +5275,56 @@ msgstr "menarik"
 msgid "maybe"
 msgstr "yaah..gimana yaa"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (penting)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (bagus deh)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (bagus)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Tunjukan sedikit"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Tunjukkan lebih banyak"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Printer lokal"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+#, fuzzy
+msgid "Remote printer"
+msgstr "Pilihan printer lpd remote"
+
+#: ../../printer.pm_.c:21
+#, fuzzy
+msgid "Remote CUPS server"
+msgstr "Antrian remote"
+
+#: ../../printer.pm_.c:22
+#, fuzzy
+msgid "Remote lpd server"
 msgstr "Lpd remote:"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "Pilihan printer NetWare"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Device Printer"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Mendeteksi alat..."
@@ -4136,11 +5338,11 @@ msgstr "Test port"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Printer dengan tipe \"%s\" telah terdeteksi di "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Alat printer lokal"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4148,15 +5350,15 @@ msgstr ""
 "Device mana yang terhubung ke printer\n"
 "(ingat, /dev/lp0 = LPT1:) ?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Device Printer"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Pilihan printer lpd remote"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4166,19 +5368,19 @@ msgstr ""
 "tuliskan nama host server printer dan nama antrian\n"
 "yang digunakan untuk mencetak di server itu."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Nama Host Remote"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Antrian remote"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Pilihan printer SMB (Windows 95/NT)"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4192,27 +5394,27 @@ msgstr ""
 "dan juga nama share printer tersebut, oh iya...\n"
 "nama user, password, dan info workgroupnya juga."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "Host server SMB"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP server SMB"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Nama share"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Workgroup"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "Pilihan printer NetWare"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4224,130 +5426,155 @@ msgstr ""
 "dengan nama TCP/IPnya lho) juga nama antrian printer yang \n"
 "Anda ingin gunakan beserta nama user dan passwordnya."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Server Printer"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Nama antrian printer"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "Pilihan printer lokal"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "Parameter printer"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "Lemah Buanget"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Tipe printer yang anda inginkan?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Anda ingin test cetak?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Saya sedang test cetak..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\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?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"Halaman test telah dikirim ke daemon printer.\n"
+"Akan butuh waktu sebentar untuk mulai mencetak.\n"
+"Bisa tercetak nggak?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Ya, Test cetak ascii"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Ya, Test cetak postscript"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Ya, Test cetak postscript dan text ascii"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Konfigurasi Printer"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Tipe printer yang anda inginkan?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Parameter printer"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Ukuran Kertas"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Kertas di eject habis ngeprint?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Parameter driver Uniprint"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Pilihan kedalaman warna"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Cetak text dalam PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Balikkan urutan halaman"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Betulkan efek tangga pada teks ?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Jumlah halaman per output"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Margin Kiri/Kanan dalam point (1/72 inci)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Margin Atas/Bawah dalam point (1/72 inci)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Extra option pada GhostScript"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Pilihan text extra"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Anda ingin test cetak?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Saya sedang test cetak..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\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?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"Halaman test telah dikirim ke daemon printer.\n"
-"Akan butuh waktu sebentar untuk mulai mencetak.\n"
-"Bisa tercetak nggak?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Printer"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Anda ingin konfigurasikan printer?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4355,19 +5582,69 @@ msgstr ""
 "Ini adalah antrian print\n"
 "Anda boleh tambahkan atau mengubah yang sudah ada."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "Perkiraan"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Pilih koneksi Printer"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Bagaimana printer ini disambung ke komputer?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+#, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "Pilih koneksi Printer"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Hapus Antrian"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+#, fuzzy
+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) 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?"
+
+#: ../../printerdrake.pm_.c:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "Printer lokal"
+
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "Tuliskan optionnya"
+
+#: ../../printerdrake.pm_.c:406
+#, fuzzy
+msgid "Location"
+msgstr "Informasi"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4379,45 +5656,45 @@ msgstr ""
 "nama antrian dan direktori yang digunakan apa yah ?\n"
 "Juga saya mau tanya bagaimana printernya disambungkan ke situ?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Nama Antrian"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Direktori spool"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Koneksi Printer"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, 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:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Tidak bisa menulis ke file $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid gagal"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid gagal (mungkin raidtoolsnya nggak ada?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Partisi tidak cukup untuk level RAID %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Skeduler command periodik, Anacron"
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4425,7 +5702,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:17
+#: ../../services.pm_.c:18
 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."
@@ -4434,7 +5711,7 @@ msgstr ""
 "saat at dijalankan, dan memulai perintah secara batch waktu rata-rata load\n"
 "sedang rendah."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4446,7 +5723,7 @@ msgstr ""
 "dari cron UNIX biasa, termasuk pembenahan sekuriti yang lebih baik dan\n"
 "lebih mantapnya option pada konfigurasinya."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4458,7 +5735,7 @@ msgstr ""
 "konsol\n"
 "dan juga bikin menu pop-up di konsol."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4466,7 +5743,7 @@ msgstr ""
 "Apache adalah server World Wide Web. Dia dipakai untuk menyediakan file\n"
 "HTML dan CGI."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4480,7 +5757,7 @@ msgstr ""
 "atas banyak server, misalnya telnet, ftp, rsh, dan rlogin. Menonaktifkan\n"
 "inetd berarti menonaktifkan semua servis-servis tadi."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4490,7 +5767,7 @@ msgstr ""
 "/etc/sysconfig/keyboard. Mapnya bisa dipilih dari utility kbdconfig.\n"
 "Mending Anda aktifkan aja deh ini."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4498,7 +5775,7 @@ 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:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4506,7 +5783,7 @@ msgstr ""
 "named (BIND) adalah Domain Name Server (DNS) yang digunakan untuk\n"
 "menterjemahkan nama host ke IP address."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4514,7 +5791,7 @@ msgstr ""
 "Mount dan unmount semua Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), dan NCP (Netware)."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4522,7 +5799,7 @@ msgstr ""
 "Aktif/nonaktifkan semua interface network yang terkonfigurasi nyala\n"
 "pada saat boot."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4533,7 +5810,7 @@ msgstr ""
 "menggunakan\n"
 "konfigurasi pada file /etc/exports."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4541,7 +5818,7 @@ msgstr ""
 "NFS adalah protokol populer untuk file sharing di TCP/IP\n"
 "Servis ini memberikan fungsi file lock pada NFS."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4553,7 +5830,7 @@ msgstr ""
 "Dia nggak bisa jalan kecuali dikonfigurasikan di sini, jadi nggak apa-apa\n"
 "kalau nggak diinstall di mesin yang nggak perlu PCMCIA."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4564,7 +5841,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:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4572,7 +5849,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:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4580,7 +5857,7 @@ msgstr ""
 "Menyimpan dan mengembalikan pool entropi sistem untuk membuat\n"
 "angka acak dengan kualitas sangat acak."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4590,7 +5867,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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4598,7 +5875,7 @@ msgstr ""
 "Protokol rstat digunakan pada jaringan untuk mengambil\n"
 "ukuran kinerja sistem di network."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4606,7 +5883,7 @@ msgstr ""
 "Protokol ruser digunakan di jaringan untuk mengidentifikasi siapa\n"
 "yang lagi login di jaringan."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4614,7 +5891,7 @@ 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:66
+#: ../../services.pm_.c:67
 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."
@@ -4622,53 +5899,200 @@ msgstr ""
 "Syslog adalah fasilitas yang digunakan para daemon untuk mencatat\n"
 "pesan log sistem di file. Hidupkan aja deh syslognya."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr "Skrip ini akan meload modul untuk mouse usb"
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "Menghidupkan dan mematikan Server Font X saat boot dan mati."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Pilih service mana yang hendak dijalankan saat boot scr otomatis"
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Selamat datang di Sang Pemilih Sistem Operasi, SILO!\n"
-"\n"
-"Untuk melihat daftar pilihan, tekan <TAB>.\n"
-"\n"
-"Untuk meload salah satu, tulis namanya, dan tekan <ENTER> atau tunggu %d "
-"detik untuk boot ke default.\n"
-"\n"
+"Saya nggak bisa baca tabel partisi, udah hancur lebur nih :(\n"
+"Aku akan coba hapus partisi yg jeleknya"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Konfigurasi LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Membuat boot disk"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Format disket"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Pilihan"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "Instalasi LILO gagal. Ada kesalahan berikut:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Table"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Konfigurasi X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Table"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+#, fuzzy
+msgid "Internet Connection Sharing"
+msgstr "Koneksi Printer"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Dialup dengan modem"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "baca konfigurasi"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "konfigurasi IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Wah Selamat nih!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4731,23 +6155,36 @@ msgstr "Pilih Tingkat Security"
 msgid "Choose the tool you want to use"
 msgstr "Pilih tool yang hendak digunakan"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Pilih Keyboardmu"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Ubah Resolusi"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Tipe mouse yang anda punya?"
+#: ../../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 ""
+"Ganti CDROMnya!\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."
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
+
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "tidak ada serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Emulasikan tombol ketiga?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Di serial port mana mouse Anda dicolokkan ?"
 
@@ -4960,8 +6397,875 @@ msgstr "Membuat daun-daunnya"
 msgid "Finding leaves takes some time"
 msgstr "Sebentar yah. agak lama nih untuk mencari di daun2nya"
 
-#~ msgid "Recommended"
-#~ msgstr "Disarankan"
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Konfigurasi Proxy"
+
+#, fuzzy
+msgid "Internet"
+msgstr "menarik"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+#, fuzzy
+msgid "Office"
+msgstr "bagus"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Multimedia - Graphics"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Multimedia - Video"
+msgstr ""
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Multimedia"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Multimedia - Sound"
+msgstr ""
+
+#, fuzzy
+msgid "Gnome"
+msgstr "tidak ada"
+
+#, fuzzy
+msgid "Documentation"
+msgstr "Autentikasi"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Multimedia - CD Burning"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Pilih ukuran yang akan diinstal"
+
+#~ msgid "Total size: "
+#~ msgstr "Ukuran total: "
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "Ayo kita konfigurasi jaringan"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Nama koneksi"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Nama koneksi"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Nama koneksi"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Nama koneksi"
+
+#, fuzzy
+#~ msgid "Germany"
+#~ msgstr "Jerman"
+
+#, fuzzy
+#~ msgid "Germany (1TR6)"
+#~ msgstr "Jerman"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "Apa yang akan anda mau?"
+
+#, fuzzy
+#~ msgid "Install/Rescue"
+#~ msgstr "Instal"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "Ubah ukuran"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Tipe partisi yang anda diinginkan?"
+
+#, 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Pilihlah \"Instal\" jika Anda belum pernah menginstal Linux di komputer\n"
+#~ "ini atawa ingin menginstall ulang Linux di mesin ini.\n"
+#~ "\n"
+#~ "Pilih \"Upgrade\" kalau ingin mengupdate sistem Mandrake:\n"
+#~ "%s atau %s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Pilih:\n"
+#~ "\n"
+#~ "  - Otomatis (disarankan):  Bila Anda belum pernah install Linux.\n"
+#~ " pilih ini. CATATAN: Jaringan tidak bisa dikonfigurasikan saat instalasi\n"
+#~ " Anda harus pakai LinuxConf nanti setelah instalasi selesai\n"
+#~ "\n"
+#~ "  - Customized:  Bila Anda familiar dengan Linux, Anda akan dapat\n"
+#~ " memilih penggunaan sistem ini. Nanti akan dijelaskan lagi\n"
+#~ "\n"
+#~ "  - Ahli     :  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\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "Sekarang, kamu bisa memilih partisi yang hendak digunakan untuk tempat\n"
+#~ "menginstall sistem Linux-Mandrake pada partisi yang sudah dibuat sebelum\n"
+#~ "nya (dengan Linux atau program partisi lain). Bila belum ada partisi\n"
+#~ "silahkan buat. Pembuatan partisi adalah membagi hard disk komputer menjadi\n"
+#~ "beberapa area untuk dikapling.\n"
+#~ "\n"
+#~ "\n"
+#~ "Bila Anda telah membuat partisi baru, gunakan \"Alokasi otomatis\" untuk\n"
+#~ "secara otomatis membuatkan partisi Linux. Anda bisa pilih drive yang\n"
+#~ "hendak dipartisi dengan mengklik \"hda\" untuk drive pertama IDE,\n"
+#~ "\"hdb\" untuk drive kedua atau \"sda\" untuk drive SCSI pertama dst.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ada dua partisi yang umum: partisi root (/), yang merupakan titik awal\n"
+#~ "hirarki direktori filesystem, dan /boot, yang berisi file-file penting\n"
+#~ "bagi sistem operasi untuk bekerja saat komputer dinyalakan.\n"
+#~ "\n"
+#~ "\n"
+#~ "Karena biasanya proses ini tidak dapat dikembalikan ke asal, maka proses\n"
+#~ "ini sangat menjengkelkan dan membikin stress bagi user yang belum berpe\n"
+#~ "ngalaman. DiskDrake menyederhanakan proses ini sehingga sekarang tidak\n"
+#~ "perlu jengkel dan stress lagi. Silahkan baca dokumentasi dan belajar\n"
+#~ "dulu sebelum memulai.\n"
+#~ "\n"
+#~ "Anda bisa pakai macam-macam tombol di keyboard: bergerak di partisi\n"
+#~ "pakai Tab/panah atas/bawah. Dan di partisi itu Anda bisa tekan:\n"
+#~ " - Ctrl-c untuk buat partisi baru (pada partisi kosong)\n"
+#~ "\n"
+#~ " - Ctrl-d untuk hapus partisi\n"
+#~ "\n"
+#~ " - Ctrl-m untuk set titik mountnya\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."
+#~ msgstr ""
+#~ "Partisi sekarang harus diformat agar dapat digunakan oleh sistem.Kalau ANda\n"
+#~ "mau, Anda bisa format partisi lama yang sudah ada kalau ingin menghapus\n"
+#~ "habisisi datanya\n"
+#~ "Oh ya, partisi lama tidak perlu diformat lho...apalagi kalau\n"
+#~ "Anda masih butuh datanya (misalnya: /home dan /usr/local)."
+
+#~ 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."
+#~ msgstr ""
+#~ "Paket yang telah dipilih sedang diinstall. Proses ini makan waktu\n"
+#~ "beberapa menit kecuali bila Anda sedang mengupgrade sistem, yang\n"
+#~ "makan waktu lebih lama lagi, bahkan sebelum proses upgrade berlangsung."
+
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Bila DrakX gagal menemukan mouse, atau bila Anda mau\n"
+#~ "tahu apa saja yg telah dilakukannya, Anda akan diberikan daftar\n"
+#~ "mouse di atas.\n"
+#~ "\n"
+#~ "\n"
+#~ "Bila Anda setuju dgn setting DrakX, langsung saja klik 'Ok'\n"
+#~ "Atau, pilih tipe mouse\n"
+#~ "di menu yang lebih pas dengan mouse Anda.\n"
+#~ "\n"
+#~ "\n"
+#~ "Bila mousenya merupakan mouse serial, jangan lupa bilang DrakX\n"
+#~ "port serialnya sekalian."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "Bagian ini adalah untuk mengkonfigurasikan Local Area Network\n"
+#~ "(LAN) atau Modem.\n"
+#~ "\n"
+#~ "Bila Anda jawab \"LAN Lokal\" sekarang, DrakX akan mencoba\n"
+#~ "mencari adapter Ethernet di mesin ini. Adapter PCI biasanya akan\n"
+#~ "mudah ditemukan dan diinit otomatis. Tapi kalau Anda punya ISA,\n"
+#~ "deteksi otomatis tidak bisa dilakukan, dan Anda perlu pilih\n"
+#~ "drivernya dari daftar yang akan muncul kemudian.\n"
+#~ "\n"
+#~ "\n"
+#~ "Untuk adapter SCSI, drivernya bisa melakukan deteksi untuk \n"
+#~ "adapter pertama kali, atau Anda perlu berikan parameter yang\n"
+#~ "digunakan oleh drivernya, yang Anda bisa contek dari Control\n"
+#~ "Panelnya Windows.\n"
+#~ "\n"
+#~ "\n"
+#~ "Bila Anda menginstall sistem Linux-Mandrake di mesin yang merupakan\n"
+#~ "bagian dari jaringan, Anda perlu data penting dari orang Network Anda\n"
+#~ "berupa alamat IP, submask atau netmask Jaringan, dan hostname).\n"
+#~ "Bila Anda melakukan konfigurasi jaringan privat di rumah misalnya, Anda\n"
+#~ "perlu pilih alamatnya\n"
+#~ "\n"
+#~ "\n"
+#~ "Pilih \"Dialup dengan modem\" untuk mengkonfigurasi koneksi \n"
+#~ "ke Internet. DrakX akan mencari modem Anda, dan mengkonfigurasikannya\n"
+#~ "Bila ia gagal mendeteksi modem, silahkan pilih serial port yang tepat\n"
+#~ "tempat modem Anda disambungkan."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "GNU/Linux bisa menggunakan berbagai macam printer. Tiap jenis\n"
+#~ "membutuhkan setingan yang berbeda pula. Perhatikan bahwa\n"
+#~ "walaupun nama default spool print adalah 'lp', Anda bisa\n"
+#~ "tambahkan keterangan lain dengan memberi karakter '|' sebagai\n"
+#~ "batasnya. Jadi misalnya Anda ingin memberi keterangan\n"
+#~ "dengan \"Printer Gue nih|lp\" pada printer, maka dia adalah\n"
+#~ "sekaligus dijadikan printer defaultnya\n"
+#~ "\n"
+#~ "\n"
+#~ "Kalau printernya langsung dicolok ke komputermu, pilih\n"
+#~ "\"Printer Lokal\". Anda akan diminta menyebutkan port tempat\n"
+#~ "si printer disambung, dan pilihlah filter yang tepat.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kalah Anda ingin mengakses printer yang ada di mesin Unix remote,\n"
+#~ "silahkan pilih \"Antrian lpd remote\". Agar bisa digunakan \n"
+#~ "silahkan berikan nama antrian printer di server ini, tidak usah\n"
+#~ "pakai username atau password\n"
+#~ "\n"
+#~ "\n"
+#~ "Atau bila ingin menggunakan printer SMB (yang berarti printernya\n"
+#~ "ada di mesin Windows 9x/NT), Anda harus berikan nama SMBnya\n"
+#~ "(biasanya nama komputernya, bukan nama TCP/IP), dan alamat IP\n"
+#~ "nya sekalian. Jangan lupa username, workgroup, dan password\n"
+#~ "agar bisa mengakses printernya, dan juga jangan ketinggalan nama\n"
+#~ "printernya. Setup ini juga mirip kalau ingin pakai printer Netware\n"
+#~ "tapi nggak usah pakai informasi workgroup."
+
+#~ 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."
+#~ msgstr ""
+#~ "Hooi, mas, mbak, jawab \"Ya\" di sini! Ibaratnya, kalau Anda\n"
+#~ "reinstall Windows, dia akan overwrite boot sectornya. Kecuali kalau\n"
+#~ "Anda punya bootdisknya, maka Anda tidak akan bisa boot ke GNU/Linux\n"
+#~ "lagi!"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Lupakan saja perubahan yang engkau perbuat?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "Koneksi Printer"
+
+#~ msgid "Host name:"
+#~ msgstr "Nama Host:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Tipe mouse yang anda punya?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Resolusi otomatis"
+
+#~ 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"
+#~ msgstr ""
+#~ "Untuk mencari resolusi lain, sekarang gue mau coba-coba.\n"
+#~ "Screennya akan berkedip...\n"
+#~ "Anda bisa mematikannya kalau mau, dan akan bunyi tiit kalau selesai"
+
+#~ 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?"
+#~ msgstr ""
+#~ "Saya bisa cari resolusi lain (misal: 800x600).\n"
+#~ "Tetapi kadangkala bisa bikin mesin hengki (baca: hang)\n"
+#~ "Mau coba?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Tidak ada mode lain\n"
+#~ "COba gunakan video card lain atau ganti monitor"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Pencarian resolusi otomatis"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Mouse ADB Apple"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Mouse ADB Apple (2 tombol)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Mouse ADB Apple (3 tombol atau lebih)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Mouse USB Apple"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Mouse USB Apple (2 tombol)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Mouse USB Apple (3 tombol atau lebih)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Mouse Generik"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "Bus Mouse ATI"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Bus Mouse Microsoft"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Bus Mouse Logitech"
+
+#~ msgid "USB Mouse"
+#~ msgstr "Mouse USB"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "Mouse USB (3 tombol atau lebih)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A atau yg baruan (serial)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (serial)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (serial)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (serial)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Mouse generik (serial)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Mouse Microsoft (serial)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Mouse Generik 3 tombol (serial)"
+
+#, fuzzy
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "gagal mount nfs"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#, fuzzy
+#~ 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?"
+#~ msgstr ""
+#~ "DrakX akan membuat file konfigurasi untuk XFree 3.3 dan XFree 4.0\n"
+#~ "Sebagai defaultnya, server 3.3 akan dipakai karena banyak drivernya.\n"
+#~ "\n"
+#~ "Apakah Anda ingin coba XFree 4.0 saja ?"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Kriptografi"
+
+#, fuzzy
+#~ msgid "Configure LAN"
+#~ msgstr "Konfigurasi X"
+
+#, fuzzy
+#~ msgid "End configuration"
+#~ msgstr "konfigurasi"
+
+#, fuzzy
+#~ msgid "Do not set up networking"
+#~ msgstr "Konfigureasi jaringan"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "Anda ingin konfigurasikan jaringan lokal untuk sistem ini ?"
+
+#~ msgid "Show less"
+#~ msgstr "Tunjukan sedikit"
+
+#~ msgid "Show more"
+#~ msgstr "Tunjukkan lebih banyak"
+
+#, fuzzy
+#~ msgid "URI for Local printer"
+#~ msgstr "Printer lokal"
+
+#, fuzzy
+#~ msgid "Local Printer Device (URI)"
+#~ msgstr "Alat printer lokal"
+
+#, fuzzy
+#~ msgid ""
+#~ "What URI device is your printer connected to\n"
+#~ "(note that parallel:/dev/lp0 is equivalent to LPT1:)?"
+#~ msgstr ""
+#~ "Device mana yang terhubung ke printer\n"
+#~ "(ingat, /dev/lp0 = LPT1:) ?\n"
+
+#~ msgid "curly"
+#~ msgstr "Si Kribo"
+
+#~ msgid "default"
+#~ msgstr "Default"
+
+#~ msgid "tie"
+#~ msgstr "dasi"
+
+#~ msgid "brunette"
+#~ msgstr "Si Brunet"
+
+#~ msgid "girl"
+#~ msgstr "cewek"
+
+#~ msgid "woman-blond"
+#~ msgstr "gadis pirang"
+
+#~ msgid "automagic"
+#~ msgstr "IP otomatis"
+
+#, fuzzy
+#~ msgid "Network:"
+#~ msgstr "Netmask:"
+
+#, fuzzy
+#~ msgid "Everything configured!"
+#~ msgstr "baca konfigurasi"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Pilih Keyboardmu"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#, fuzzy
+#~ msgid "Configure my card"
+#~ msgstr "Konfigurasi X"
+
+#, fuzzy
+#~ msgid "pptp alcatel"
+#~ msgstr "Pengalokasian otomatis"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Cari card PCMCIA?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "Cari Device %s ?"
+
+#, fuzzy
+#~ msgid "Small(%dMB)"
+#~ msgstr "(%dMB)"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "Konfigurasi Modem"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "Anda ingin konfigurasikan koneksi dialup untuk sistem ini ?"
+
+#, fuzzy
+#~ msgid "Do you want to configure a ISDN connection for your system?"
+#~ msgstr "Anda ingin konfigurasikan jaringan lokal untuk sistem ini ?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "Cari Device PCI?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "Mencari partisi root."
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: Ini bukan partisi root, silahkan pilih yang lain."
+
+#~ msgid "No root partition found"
+#~ msgstr "Tidak ada partisi root"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "Saya tidak bisa gunakan broadcast tanpa domain NIS"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "Partisi mana yang hendak digunakan sebagai partisi root"
+
+#, fuzzy
+#~ msgid "Autologin at startup"
+#~ msgstr "X saat startup"
+
+#, fuzzy
+#~ msgid "Autologin - Choose default user"
+#~ msgstr "Pilih ukuran baru"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "Wah, kamu nggak punya cukup space buat Lnx4win"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "Otomatis"
+
+#~ 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 ""
+#~ "Selamat datang di Sang Pemilih Sistem Operasi, LILO!\n"
+#~ "\n"
+#~ "Untuk melihat daftar pilihan, tekan <TAB>.\n"
+#~ "\n"
+#~ "Untuk meload salah satu, tulis namanya, dan tekan <ENTER> atau tunggu %d "
+#~ "detik untuk boot ke default.\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
+#
+#~ 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 ""
+#~ "Selamat datang di Sang Pemilih Sistem Operasi, SILO!\n"
+#~ "\n"
+#~ "Untuk melihat daftar pilihan, tekan <TAB>.\n"
+#~ "\n"
+#~ "Untuk meload salah satu, tulis namanya, dan tekan <ENTER> atau tunggu %d "
+#~ "detik untuk boot ke default.\n"
+#~ "\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "Parameter SILO utama"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "Ini adalah entri di SILO.\n"
+#~ "Anda boleh tambahkan atau mengubah yang sudah ada."
+
+#~ msgid "This label is already in use"
+#~ msgstr "Label ini sudah dipakai"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "Instalasi SILO gagal. Ada kesalahan berikut:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX akan coba mencari adapter SCSI PCI. Kalau ketemu dan punya\n"
+#~ "drivernya, maka gue akan menggunakannya otomatis.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kalau adapter SCSI milikmu adalah ISA atau PCI tapi DrakX tidak\n"
+#~ "tahu drivernya, atawa kalau emang ente nggak punya adapter SCSI\n"
+#~ "Anda akan saya tanya lagi apakah benar punya SCSI atau nggak.\n"
+#~ "Kalau nggak jawab \"Tidak\". Kalau punya, jawab \"Ya\" dong.\n"
+#~ "Nanti akan muncul daftar driver, trus pilih deh.\n"
+#~ "\n"
+#~ "\n"
+#~ "Habis itu, DrakX akan tanya lagi apakah akan memberikan parameter\n"
+#~ "tambahan. Pertama kali, biarkan drivernya cari parameter sendiri\n"
+#~ "biasanya sih bisa langsung tokcer.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kalau gagal, jangan lupa bahwa Anda harus tahu informasi hardwarenya\n"
+#~ "cari di manualnya atau bahkan dari Windows (itu juga kalau ente punya)\n"
+#~ "Nah informasi ini yang harus kamu isikan nantinya."
+
+#~ msgid "Shutting down"
+#~ msgstr "Lagi matiin komputer"
 
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of Linux\n"
@@ -5082,21 +7386,12 @@ msgstr "Sebentar yah. agak lama nih untuk mencari di daun2nya"
 #~ msgid "Setup SCSI"
 #~ msgstr "Setup SCSI"
 
-#~ msgid "Which language do you want?"
-#~ msgstr "Bahasa apa yang anda inginkan"
-
 #~ msgid "Which packages do you want to install"
 #~ msgstr "Paket mana yang akan diinstal"
 
 #~ msgid "Local LAN"
 #~ msgstr "LAN lokal"
 
-#~ msgid "Dialup with modem"
-#~ msgstr "Dialup dengan modem"
-
-#~ msgid "Local Printer Options"
-#~ msgstr "Pilihan printer lokal"
-
 #~ msgid "server"
 #~ msgstr "server"
 
diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po
index 6158ff06f..ef1b53c56 100644
--- a/perl-install/share/po/is.po
+++ b/perl-install/share/po/is.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 2000-01-05 18:53-0500\n"
 "Last-Translator: Thorarinn Einarsson <thori@mindspring.com>\n"
 "Language-Team: Icelandic\n"
@@ -16,43 +16,91 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Skj�kort"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Veldu skj�kort"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Veldu X �j�n"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X �j�nn"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Hverju viltu b�ta vi�?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+#, fuzzy
+msgid "XFree configuration"
+msgstr "Lokauppsetning"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Veldu minnisst�r� skj�kortsins"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Veldu valm�guleika fyrir �j�n"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Veldu skj�"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Skj�r"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -72,39 +120,40 @@ msgstr ""
 "�a� er MJ�G MIKILV�GT a� velja ekki of h�tt t��nisvi� fyrir skj�inn. Hafir\n"
 "�� einhverjar efasemdir, veldu �� l�gri stillingar."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "L�r�tt t��ni"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "L��r�tt t��ni"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Skj�r ekki skilgreindur"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Skj�kort ekki skilgreint enn"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Upplausn ekki valin enn"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Viltu pr�fa skilgreininguna"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+#, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "A�v�run: Pr�fanir eru varasamar me� �etta skj�kort"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Pr�funar skilgreining"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -112,185 +161,169 @@ msgstr ""
 "\n"
 "pr�fa�u a� breyta stillingum"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Villa �tti s�r sta�"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "H�tti eftir %d sek�ndur"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 #, fuzzy
 msgid "Is this the correct setting?"
 msgstr "Er �etta r�tt?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Villa kom upp, reyndu a� breyta f�ribreytum"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Sj�lfvirk upplausn"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Til a� finna m�gulegar upplausnir munu nokkrar ver�a pr�fa�ar.\n"
-"Skj�rinn �inn mun blikka...\n"
-"�� getur sl�kkt � honum ef �� vilt, t�lvan flautar �egar �v� er loki�"
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Upplausn"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Veldu upplausn og fj�lda lita"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Skj�kort: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 �j�nn: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "S�na alla"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Upplausnir"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"�g get reynt a� finna m�gulegar upplausnir (t.d: 800x600).\n"
-"Stundum getur t�lvan frosi� vi� �a�.\n"
-"Viltu pr�fa?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Engar leyfilegar upplausnir fundust\n"
-"Pr�fa�u a� velja anna� skj�kort e�a skj�"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tegund lyklabor�s: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tegund m�sar: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "M�s: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Skj�r: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "L�r�tt t��ni skj�s: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "L��r�tt t��ni skj�s: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Skj�kort: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Skj�kortsminni: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Stillingar � litad�pt"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Upplausnir"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 �j�nn: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 �j�nn: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Undirb� X-Window skilgreiningu"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Skipta um skj�"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Skipta um skj�kort"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Breyta �j�ns m�guleikum"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Breyta upplausn"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Sj�lfvirk leit upplausna"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "S�na uppl�singar"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Pr�fa aftur"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "H�tta"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Hva� viltu gera?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Ey�a breytingum?"
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Halda n�verandi IP stillingum"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Stimpla�u �ig aftur inn � %s til a� virkja breytingarnar"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Stimpla�u �ig �t og sl��u � Ctrl-Alt-Backspace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X � r�singu"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -298,234 +331,231 @@ msgstr ""
 "�g get stillt t�lvuna ��na til a� kveikja sj�lfvirkt � X vi� r�singu\n"
 "Vilt �� kveikja � X vi� endurr�singu?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1152
+#, 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."
+msgstr ""
+"�g get stillt t�lvuna ��na til a� kveikja sj�lfvirkt � X vi� r�singu\n"
+"Vilt �� kveikja � X vi� endurr�singu?"
+
+#: ../../Xconfigurator.pm_.c:1154
+#, fuzzy
+msgid "Choose the default user:"
+msgstr "Veldu n�ja st�r�"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Veldu forriti� sem �� vilt nota"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 litir (8 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 ��sund litir (15 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 ��sund litir (16 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 milj�n litir (24 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 miljar�ar lita (32 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB e�a meira"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Sta�la� VGA, 640x480 @ 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 @ 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 Samh�ft, 1024x768 @ 87 Hz samtvinna� (ekkert 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 @ 87 Hz samtvinna�, 800x600 @ 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "�samtvinna� SVGA, 1024x768 @ 60 Hz, 800x600 @ 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "H�t��ni SVGA, 1024x768 @ 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Skj�r sem r��ur vi� 1280x1024 @ 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Skj�r sem r��ur vi� 1280x1024 @ 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Skj�r sem r��ur vi� 1280x1024 @ 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Skj�r sem r��ur vi� 1600x1200 @ 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Skj�r sem r��ur vi� 1600x1200 @ 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr ""
-
-#: ../../any.pm_.c:17
-#, fuzzy
-msgid "default"
-msgstr "Sj�lfgefi�"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-#, fuzzy
-msgid "tie"
-msgstr "Virk"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr ""
-
-#: ../../any.pm_.c:19
-#, fuzzy
-msgid "automagic"
-msgstr "Sj�lfvirkt IP"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "� fyrsta geira r�sidisksnei�ar"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "� r�sif�rsluna (MBR)"
 
-#: ../../any.pm_.c:65
+#: ../../any.pm_.c:95
 #, fuzzy
-msgid "LILO/grub Installation"
+msgid "SILO Installation"
 msgstr "Uppsetning LILO"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Hvert viltu setja r�sistj�rann?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+#, fuzzy
+msgid "LILO/grub Installation"
+msgstr "Uppsetning LILO"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 #, fuzzy
 msgid "None"
 msgstr "B�i�"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 #, fuzzy
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Hverju viltu b�ta vi�?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+#, fuzzy
+msgid "Bootloader installation"
+msgstr "Stillingar LILO"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "R�sit�ki"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr ""
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Sam�jappa�"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "sam�jappa�"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "T�f ��ur en sj�lfgefin r�sing byrjar"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Skj�hamur"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "T�f ��ur en sj�lfgefin r�sing byrjar"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Lykilor�"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Lykilor� (aftur)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Takmarka alla rofa � skipanl�nu"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "takmarka"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 #, fuzzy
 msgid "Bootloader main options"
 msgstr "Stillingar LILO"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Valkosturinn ``Takmarka alla rofa � skipanal�nu'' gerir ekkert �n lykilor�s"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Reyndu aftur"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Mismunandi lykilor�"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 #, fuzzy
 msgid ""
 "Here are the different entries.\n"
@@ -534,168 +564,356 @@ msgstr ""
 "H�rna eru n�verandi stillingar LILO .\n"
 "�� getur b�tt vi� fleirum e�a breytt �essum."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "B�ta vi�"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "B�i�"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Hverju viltu b�ta vi�?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
-msgid "Other OS (windows...)"
+#: ../../any.pm_.c:175
+#, fuzzy
+msgid "Other OS (SunOS...)"
 msgstr "��ru st�rikerfi (Window$...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Hverju viltu b�ta vi�?"
+#: ../../any.pm_.c:175
+msgid "Other OS (windows...)"
+msgstr "��ru st�rikerfi (Window$...)"
 
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "R�sikjarna"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "R�t"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "B�ta aftan vi�"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Les-skrif"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Tafla"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "��ruggt"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Nafn"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Sj�lfgefi�"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "� lagi"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Fjarl�gja"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Autt er ekki leyft"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 #, fuzzy
 msgid "This label is already used"
 msgstr "�etta nafn er n� �egar � notkun."
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Fann %s %s tengi"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Er kannski eitt enn � v�linni?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Eru einhver %s tengi � t�lvunni?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Nei"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "J�"
+
+#: ../../any.pm_.c:505
+msgid "See hardware info"
+msgstr "Sko�a�u v�lb�na�aruppl�singar"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Set inn rekil fyrir %s korti� %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(eining %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Hva�a %s rekil viltu pr�fa?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"� sumum tilfellum �arf rekillinn %s auka vi�f�ng svo hann virki r�tt,\n"
+" �� hann virki vel � flestum tilfellum �n �eirra.  Viltu setja inn auka\n"
+" vi�f�ng e�a leyfa reklinum sj�lfum a� leita a� �eim uppl�singum sem\n"
+" hann �arf?  Stundum frystir sj�lfvirk stilling v�lina en �a� �tti ekki\n"
+"a� skemma neitt."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Stilla sj�lfvirkt"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Stilla handvirkt"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "�� getur n�na gefi� upp vi�f�ng fyrir %s eininguna."
+
+# ## skrytid
+#: ../../any.pm_.c:557
+#, 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 ""
+"�� getur n�na gefi� upp vi�f�ng fyrir eininguna %s.\n"
+"Vi�f�ng eru gefin upp sem ``vi�fang=gildi vi�fang2=gildi2 ...''.\n"
+"Til d�mis: ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Stillingar kjarnaeininga:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Innsetning � einingu %s mist�kst.\n"
+"Viltu pr�fa aftur me� �l�k vi�f�ng?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Velkomin(n) i %s styrikerfisraesistjorann!\n"
+"\n"
+"Sladu a <TAB> til ad fa lista yfir moegulega valkosti.\n"
+"\n"
+"Til raesa einn af theim, sl�du inn nafnid og sidan a <ENTER>\n"
+"eda biddu i %d sekundur thar til sjalfgefin raesing hefst.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr ""
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr ""
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr ""
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr ""
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr ""
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr ""
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr ""
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr ""
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "H�tti eftir %d sek�ndur"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "B�a til"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Aftengja"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Ey�a"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Forsn��a"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Endurst�kka"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Tegund"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Tengipunktur"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Skrifa /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "F�ra � snillingsham"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Fara � venjulegan ham"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Endurheimta fr� skr�"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Vista � skr�"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Endurheimta fr� diskling"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Vista � diskling"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Hreinsa allt"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Forsn��"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "R��stafa skj�lfkrafa"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "�ll a�al skr�arsni� eru � notkun"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Get ekki b�tt vi� disksnei�um"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -703,59 +921,63 @@ msgstr ""
 "Til a� f� fleiri disksnei�ar, vinsamlega eyddu einni til a� b�a til "
 "vi�b�tarsnei�"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Bjarga snei�at�flunni"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Endurheimta"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Skrifa snei�at�flu"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Endurhla�a"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "T�m"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Anna�"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Diskminni"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "T�m"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Anna�"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Tegundir skr�akerfa:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "�tarleg atri�i"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 #, fuzzy
 msgid ""
 "You have one big FAT partition\n"
@@ -768,94 +990,94 @@ msgstr ""
 "�g legg til a� �� endursn��ir hana\n"
 "(smelltu � hana, s��an � \"Endursn��a\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Vinsamlega taktu fyrst afrit af �llum g�gnum"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Lestu vandlega!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 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:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Villa"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Tengipunktur: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "T�ki: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS drifstafur: %s (bara �giskun)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Tegund: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Byrja: geiri %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, fuzzy, c-format
 msgid "Size: %d MB"
 msgstr "St�r�: %d MB\n"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s geirar"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "S�valningur %d til %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Forsni�inn\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Ekki forsni�inn\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Tengdur\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -863,79 +1085,79 @@ msgstr ""
 "Sj�lfgefin disksnei� r�st\n"
 "    (fyrir MS-DOS r�singu, ekki fyrir LILO)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Stig %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Hlunkast�r� %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-diskar %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Smelltu � disksnei�"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "St�r�: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Skilgreining: %s s�valningar, %s hausar, %s geirar\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, fuzzy, c-format
 msgid "Partition table type: %s\n"
 msgstr "R�tardisksnei�"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "� gagnabraut %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Tengipunktur"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Virk"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "B�ta vi� RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Taka �r RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Breyta RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Veldu a�ger�"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -947,7 +1169,7 @@ msgstr ""
 "Anna�hvort notar �� LILO og �a� mun ekki virka, e�a �� notar ekki LILO og "
 "sleppir �v� a� hafa /boot"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -958,202 +1180,208 @@ msgstr ""
 "1024. s�valnings � har�a disknum og �� hefur enga /boot snei�.\n"
 "Ef �� �tlar a� nota LILO r�sistj�rann skaltu muna a� b�ta vi� /boot snei�"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Nota ``%s'' � sta�inn"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Nota ``Aftengja'' fyrst"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, fuzzy, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "�ll g�gn � �essari disksnei� tapast"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Halda samt �fram?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "H�tta �n �ess a� vista"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "H�tta �n �ess a� skrifa snei�at�fluna?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Breyta tegund snei�ar"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
 msgstr "Hva�a snei�tegund viltu?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, fuzzy, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Hvar viltu tengja t�ki %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Hvar viltu tengja t�ki %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, fuzzy, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "�ll g�gn � �essari disksnei� tapast"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Forsn��ing"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, fuzzy, c-format
 msgid "Formatting loopback file %s"
 msgstr "Forsn�� disksnei� %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Forsn�� disksnei� %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Eftir forsn��ingu allra snei�a"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "munu �ll g�gn � �essum disksnei�um tapast"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "F�ra"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Hva�a disk viltu f�ra til?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Geiri"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Hva�a geira viltu f�ra g�gn til?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "F�ri"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "F�ri disksnei�..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Disksnei�atafla drifs %s mun ver�a skrifu� � disk!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "�� �arft a� endurr�sa ��ur en breytingar taka gildi"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Reikna takmarkanir FAT skr�arkerfis..."
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Endursn��"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Hva�a snei�tegund viltu?"
+
+#: ../../diskdrake.pm_.c:597
 #, fuzzy
 msgid "All data on this partition should be backed-up"
 msgstr "�ll g�gn � �essari disksnei� tapast"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, fuzzy, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "�ll g�gn � �essari disksnei� tapast"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Veldu n�ja st�r�"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "B�a til n�ja disksnei�"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Byrjunar geiri"
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "St�r� � MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Tegund skr�akerfis:"
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Valkostur:"
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 #, fuzzy
 msgid "File already exists. Use it?"
 msgstr "Nafni� %s er �egar � notkun"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Velji� skr�"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1161,11 +1389,11 @@ msgstr ""
 "Disksnei�in sem var tekin sem afrit er ekki af s�mu st�r�\n"
 "Halda �fram?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "A�v�run"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1173,77 +1401,77 @@ msgstr ""
 "Settu diskling � drifi�\n"
 "�ll g�gn � �essum diskling tapast"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Reyni a� endurheimta disksnei�at�fluna"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "t�ki"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "stig"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "st�r� hlutar"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Veldu RAID sem til er fyrir til a� b�ta vi�"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "n�"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, fuzzy, c-format
 msgid "%s formatting of %s failed"
 msgstr "gat ekki forsni�i� %s"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "kann ekki a� forsn��a %s af tegundinni %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "t�kst ekki a� tengja nfs"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "t�kst ekki a� tengja: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "villa vi� a� aftengja %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Heiti tengipunkta ver�a a� byrja � /."
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, fuzzy, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "�a� er �egar disksnei� me� tengipunktinn %s"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Villa vi� a� opna %s til skriftar: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1251,75 +1479,82 @@ msgstr ""
 "�a� kom upp villa. Engin t�ki fundust sem unnt er a� b�a til n� skr�akerfi "
 "�. Vinsamlegast athuga�u v�lb�na�inn � leit a� ors�k vandam�lsins."
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "�� hefur ekki neinar disksnei�ar"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "Veldu tungum�l til a� nota vi� innsetningu og kerfisnotkun."
 
-#: ../../help.pm_.c:10
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Veldu sni� sem passar vi� lyklabor�i� �itt fr� listanum a� ofan"
-
-#: ../../help.pm_.c:13
-#, fuzzy
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "Veldu sni� sem passar vi� lyklabor�i� �itt fr� listanum a� ofan"
+
+#: ../../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
+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"
-"  - 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"
-msgstr ""
-"Veldu \"Innsetning\" ef �a� eru engar fyrri �tg�fur af Linux � t�lvunni\n"
-"e�a ef �� vilt nota fleiri en eina dreifingu af Linux.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Veldu \"Uppf�rsla\" ef �� vilt uppf�ra fyrri innsetningu af Linux Mandrake:\n"
-"5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios),\n"
-"Gold 2000 e�a 7.0 (Air).\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"
-"Select:\n"
+"\t* Recommanded: 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"
-"  - R��lagt: Ef �� hefur aldrei sett Linux inn ��ur.\n"
 "\n"
-"  - Eftir �skum: Ef �� hefur �� nokkra reynslu me�iar 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"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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\".\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
+#, fuzzy
 msgid ""
 "Select:\n"
 "\n"
@@ -1327,12 +1562,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Select:\n"
 "\n"
@@ -1349,250 +1585,516 @@ msgstr ""
 "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\".\n"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 
-# ## skrytid
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:108
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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 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"
-"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"
+"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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
 "\n"
-"- Ctrl-d  to delete a partition\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"
-"- Ctrl-m  to set the mount point\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 ""
 
-# ## skrytid
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:160
 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."
+"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"
+"\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"
 msgstr ""
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:218
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"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"
-"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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"\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 ""
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:252
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
 
-# ## skrytid
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:257
 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."
+"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 ""
 
-# ## skrytid
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:267
 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"
+"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"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\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"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
 
-#: ../../help.pm_.c:176
-msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
-"Veldu tengi� sem �� vilt nota.  Tengi� COM1 � MS Windows er kalla�\n"
-"ttyS0 � Linux, COM2 er ttyS1, o.s.frv."
 
-#          ***********************************************
-#          ***   H�r fyrir ne�an er ���ingin m�n, en   ***
-#  ***********   �g f�r l�ka a�eins yfir �a� sem var   ************
-#          ***   ��tt fyrir ofan.  :-)  - ��rarinn     ***
-#          *** (�g kl�ra �etta seinnipartinn � morgun) ***
-#          ***********************************************
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:303
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"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"
-"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"
+"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"
-"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"
+"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"
-"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"
 "\n"
+"Click on \"OK\" when you are ready to format partitions.\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."
+"\n"
+"Click on \"Cancel\" if you want to choose other partitions to install your "
+"new\n"
+"Linux-Mandrake operating system."
 msgstr ""
-"�essi hluti hefur a� geyma uppsetningu � sta�arnetstengingu\n"
-"(LAN) e�a m�taldstengingu.\n"
+
+#: ../../help.pm_.c:329
+msgid ""
+"You may now select the group of packages you wish to\n"
+"install or upgrade.\n"
 "\n"
-"Ef �� velur \"Sta�arnetstenging\" �� mun DrakX\n"
-"reyna a� finna Ethernet netkorti� � v�linni.  � flestum tilvikum\n"
-"finnast PCI netkort og er �� korti� strax tilb�i� fyrir netuppsetningu.\n"
-"Ef netkorti� �itt er hinsvegar ISA kort �� er sj�lfvirk uppsetning � �v�\n"
-"ekki m�guleg og �� �arft �v� a� velja rekil af listanum sem birtist.\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:341
+msgid ""
+"You can now choose individually all the packages you\n"
+"wish to install.\n"
 "\n"
-"Ef �� ert me� SCSI kort �� getur �� l�ti� leita a� �v� fyrst en s��an\n"
-"gefi� upp vi�f�ng ef �a� finnst ekki.  Vi�f�ngin sem �� �arft a� nota\n"
-"�ttir �� a� finna � lei�beiningunum sem komu me� kortinu.\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"
-"Ef �� ert a� setja Linux Mandrake � t�lvu sem er hluti af sta�arneti\n"
-"�� �ttir �� a� f� nau�synlegar uppl�singar fyrir tengingu hj� kerfisstj�ra.\n"
-"Uppl�singarnar sem �� �arft til a� tengjast sta�arneti me� TCP/IP eru:\n"
-"IP vistfang, undirnetss�a (nets�a) og t�lvunafn. Ef �� ert a�\n"
-"setja upp einkanet �� getur �� sj�lf(ur) �kve�i� hva�a vistfang,\n"
-"nets�u og nafn �� notar � t�lvuna.\n"
+"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
+"\"Toggle flat and group sorted\".\n"
 "\n"
 "\n"
-"Ef �� velur \"M�taldstenging\" �� ver�ur m�taldstengingin ger� kl�r.\n"
-"DrakX mun reyna a� finna m�taldi� �itt en ef s� leit ber ekki �rangur\n"
-"�� ver�ur �� sj�lf(ur) a� velja ra�tengi� (COM port) sem m�taldi� er\n"
-"tengt vi�."
+"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:210
+#: ../../help.pm_.c:358
 msgid ""
-"Enter:\n"
+"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:363
+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"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"Please be patient."
+msgstr ""
+
+#: ../../help.pm_.c:371
+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:376
+#, fuzzy
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
+msgstr ""
+"Veldu tengi� sem �� vilt nota.  Tengi� COM1 � MS Windows er kalla�\n"
+"ttyS0 � Linux, COM2 er ttyS1, o.s.frv."
+
+#: ../../help.pm_.c:380
+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 ""
+
+#: ../../help.pm_.c:393
+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 ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"H�rna getur�u stillt innhringitengingu. Ef �� ert ekki viss um hva� �� "
+"�arft,\n"
+"haf�u �� samband vi� �j�nustuveituna til a� f� ��r uppl�singar."
+
+#: ../../help.pm_.c:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
 "Sl��u inn:\n"
 "\n"
@@ -1611,7 +2113,23 @@ msgstr ""
 "og me� a�rar stillingar, �� v�ri ekki sl�m hugmynd a� hafa samband vi� "
 "kerfisstj�ra.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"Ef NIS er nota� � netinu sem �� ert �, veldu �� \"Nota NIS\". Ef �� ert "
+"ekki\n"
+"viss hvort �a� s� nota�, spur�u �� kerfisstj�ra netsins."
+
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1620,7 +2138,7 @@ msgstr ""
 "�arft,\n"
 "haf�u �� samband vi� �j�nustuveituna til a� f� ��r uppl�singar."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1630,13 +2148,15 @@ msgstr ""
 "hvort �� �arft a� still �au, haf�u �� samband vi� kerfisstj�ra e�a "
 "�j�nustuveitu."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1648,13 +2168,19 @@ msgstr ""
 "leyfa\n"
 "� �slandi e�a hvar sem �� ert n�na a� nota t�lvuna."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "H�rna velur �� t�masv��i� sem gildir �ar sem �� b�r�.\n"
 "\n"
@@ -1662,86 +2188,176 @@ msgstr ""
 "Linux notar GMT e�a \"Greenwich Mean Time\" og breytir �eim t�ma\n"
 "s��an � sta�art�ma samkv�mt �v� t�masv��i sem �� velur."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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:257
-#, fuzzy
+#: ../../help.pm_.c:486
 msgid ""
-"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"
+"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:490
+msgid ""
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"Linux getur nota� margar ger�ir prentara.  Prentararnir krefjast\n"
-"mismunandi uppsetninga.\n"
+
+#: ../../help.pm_.c:505
+msgid ""
+"GNU/Linux can deal with many types of printer. Each of these types requires\n"
+"a different setup.\n"
 "\n"
 "\n"
-"Ef prentarinn �inn er tengdur beint vi� t�lvuna veldu �� \n"
-"\"Sta�bundinn prentari\". �� �arft s��an a� tilgreina vi�\n"
-"hva�a tengi prentarinn er tengdur og velja vi�eigandi s�u.\n"
+"If your printer is physically connected to your computer, select \"Local\n"
+"printer\".\n"
 "\n"
 "\n"
-"Ef �� vilt hafa a�gang a� prentara sem tengdur er vi� fjarl�ga UNIX v�l\n"
-"(e�a Windows NT me� LPD) �� ver�ur �� a� velja \"Fjartengdur prentari\".\n"
-"�� �arft ekki a� gefa upp notandanafn e�a lykilor� en �arft a� vita \n"
-"nafni� � prentr��inni � �eim �j�n.\n"
+"If you want to access a printer located on a remote Unix machine, select\n"
+"\"Remote printer\".\n"
 "\n"
 "\n"
-"Ef �� vilt hafa a�gang a� SMB prentara (prentara sem er tengdur vi�\n"
-"fjarl�ga Windows 9x/NT v�l), �� �arftu a� gefa upp SMB nafn �j�nsins\n"
-"sem oftast er sama og TCP/IP nafn (en �arf ekki a� vera).  Einnig �arftu\n"
-"IP vistfang, notandanafn, lykilor�, nafn vinnuh�ps og au�vita� sj�lft\n"
-"nafn prentarans.  Sama gildir um NetWare prentara, nema �� �arft\n"
-"ekkert vinnuh�psnafn."
+"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:286
+#: ../../help.pm_.c:521
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"   * 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 ""
+
+#: ../../help.pm_.c:542
+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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
+"\n"
+"Do not make the password too long or complicated, though: you must be able "
+"to\n"
+"remember it without too much effort."
 msgstr ""
 "H�rna b�r�u til r�tarlykilor� fyrir Linux Mandrake kerfi� (lykilor�\n"
 "ofurpaursins :-). �� ver�ur a� sl� lykilor�i� inn tvisvar til a� \n"
@@ -1758,7 +2374,7 @@ msgstr ""
 "� �v� a� �� gleymir �v�.  �� �arft a� geta muna� hva�a lykilor�\n"
 "gefur r�tara�gang til a� geta breytt uppsetningu og stillingum."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1766,7 +2382,7 @@ msgstr ""
 "Ef �� vilt gera kerfi� �ruggara �� �ttir �� a� velja \"Nota skuggaskr�\" og\n"
 "\"Nota MD5 lykilor�\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1776,7 +2392,7 @@ msgstr ""
 "viss hvort �a� s� nota�, spur�u �� kerfisstj�ra netsins."
 
 # ## skrytid
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1820,22 +2436,18 @@ msgstr ""
 "you will have created here, and login as root only for administration\n"
 "and maintenance purposes."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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� er stranglega m�lt me� �v� a� �� svarir \"J�\" h�rna. Ef �� setur\n"
-"Microsoft Windows inn s��ar �� skrifar �a� yfir r�sihluta disksins og\n"
-"gerir ��r �ar me� �kleyft a� r�sa Linux nema �� hafir veri� b�in(n)\n"
-"a� �tb�a r�sidiskling."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
+#, fuzzy
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
@@ -1848,7 +2460,7 @@ msgstr ""
 "Veldu \"� r�sif�rsluna (MBR)\" nema �� vitir n�kv�mlega\n"
 "hva� �� ert a� gera."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 #, fuzzy
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
@@ -1857,10 +2469,10 @@ msgstr ""
 "Ef um algengar a�st��ur er a� r��a �� er r�tt svar \"/dev/hda\"\n"
 "(a�al diskurinn � a�al IDE r�sinni)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1872,7 +2484,7 @@ msgid ""
 msgstr ""
 
 # ## skrytid
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 #, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
@@ -1890,8 +2502,74 @@ msgid ""
 "\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."
+msgstr ""
+"LILO 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"
+"  - Linear: Generate linear sector addresses instead of\n"
+"sector/head/cylinder addresses. Linear addresses are translated at run\n"
+"time and do not depend on disk geometry. Note that boot disks may not be\n"
+"portable if \"linear\" is used, because the BIOS service to determine the\n"
+"disk geometry does not work reliably for floppy  disks. When using\n"
+"\"linear\" with large disks, /sbin/lilo may generate references to\n"
+"inaccessible disk areas, because 3D sector addresses are not known\n"
+"before boot time.\n"
+"\n"
+"\n"
+"  - Compact: Tries to merge read requests for adjacent sectors into a\n"
+"single read request. This drastically reduces load time and keeps the\n"
+"map smaller. Using \"compact\" is especially recommended when booting from\n"
+"a floppy disk.\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"
 "    * normal: select normal 80x25 text mode.\n"
 "    * <number>:  use the corresponding text mode."
+
+#: ../../help.pm_.c:680
+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 ""
+
+# ## skrytid
+#: ../../help.pm_.c:692
+#, 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 ""
 "LILO main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1927,10 +2605,11 @@ msgstr ""
 "    * normal: select normal 80x25 text mode.\n"
 "    * <number>:  use the corresponding text mode."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:705
+#, fuzzy
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -1953,7 +2632,7 @@ msgstr ""
 "stillingarnar s�u vi�unnandi. Ef �� ert ekki s�tt(ur) vi� ��r X\n"
 "stillingar sem eru valdar, �� getur �� breytt �eim a� eigin vild."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -1961,7 +2640,7 @@ msgstr ""
 "Ef eitthva� kemur upp � � X, nota�u �� �essar stillingar til a� stilla\n"
 "�a� aftur."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -1970,43 +2649,47 @@ msgstr ""
 "�� \"Nei\"."
 
 # ## skrytid
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 #, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\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"
+"\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"
+"\n"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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."
 msgstr ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
@@ -2035,7 +2718,7 @@ msgstr ""
 "booting, select this option (Note: Num Lock will still not work under\n"
 "X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2049,189 +2732,133 @@ msgstr ""
 "keyra upp eitthva� anna� st�rikerfi, lestu �� lei�beiningarnar\n"
 "sem fylgja."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Veldu tungum�l"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Veldu innsetningarflokk"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 #, fuzzy
 msgid "Hard drive detection"
 msgstr "Nota f�nstillingar � h�r�um disk(um)"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Tilgreindu m�s"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Veldu lyklabor�"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "�mislegt"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Setja upp skr�arkerfi"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Forsn��a disksnei�ar"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Veldu pakka til a� setja inn"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Setja kerfi� inn"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Stilla nettengingu"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Dulk��un"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Tilgreina t�masv��i"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 #, fuzzy
 msgid "Configure services"
 msgstr "Setja upp prentara"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Setja upp prentara"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "�kve�a r�tarlykilor�"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "B�ta vi� notanda"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "B�a til r�sidiskling"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Setja inn r�sihla�ara"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Stilla X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr ""
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "H�tta innsetningu"
 
-#: ../../install2.pm_.c:337
-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 ""
-"�� ver�ur a� hafa r�tarsnei� fyrir Linux.  B��u �v� anna�hvort\n"
-"til r�tarsnei� e�a veldu snei� sem n� �egar er til � disknum.\n"
-"Veldu s��an ``Tengipunktur'' og sl��u inn `/'"
-
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"�g get ekki lesi� disksnei�at�flu ��na, h�n er of skemmd fyrir mig :-(\n"
-"�g mun reyna a� halda �fram me� �v� a� hreinsa skemmdar disksnei�ar"
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Villa vi� lestur skr�arinnar $f"
 
-#: ../../install_any.pm_.c:351
-msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
-msgstr ""
-"DiskDrake gat ekki lesi� snei�at�fluna.\n"
-"Haltu �fram � eigin �byrg�!"
+#: ../../install_gtk.pm_.c:426
+#, fuzzy
+msgid "Please test the mouse"
+msgstr "Hvernig m�s ertu me�?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Leita a� r�tardisksnei�"
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Hvernig m�s ertu me�?"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Uppl�singar"
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
+#: ../../install_interactive.pm_.c:23
 #, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: �etta er ekki r�tardisksnei�.  Veldu a�ra."
-
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Engin r�tarsnei� fannst"
-
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Get ekki nota� �tsendingu �n NIS l�ns"
-
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Villa vi� lestur skr�arinnar $f"
-
-#: ../../install_steps.pm_.c:75
 msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
+"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
+"You can find some information about them at: %s"
 msgstr ""
-"��ekkt villa kom upp sem ekki er h�gt a� me�h�ndla.\n"
-"Haltu �fram � eigin �byrg�."
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "%s tengipunktur er n� �egar til"
-
-#: ../../install_steps.pm_.c:323
+#: ../../install_interactive.pm_.c:41
 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"
+"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 ""
+"�� ver�ur a� hafa r�tarsnei� fyrir Linux.  B��u �v� anna�hvort\n"
+"til r�tarsnei� e�a veldu snei� sem n� �egar er til � disknum.\n"
+"Veldu s��an ``Tengipunktur'' og sl��u inn `/'"
 
-#: ../../install_steps.pm_.c:390
-#, fuzzy, c-format
-msgid "Welcome to %s"
-msgstr "Velkomin(n) � t�lvu�rj�tinn"
-
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Ekkert disklingadrif a�gengilegt"
-
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
-#, c-format
-msgid "Entering step `%s'\n"
-msgstr "Hef skref `%s'\n"
-
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
+#: ../../install_interactive.pm_.c:46
 msgid "You must have a swap partition"
 msgstr "�� ver�ur a� hafa diskminni"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:47
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -2241,101 +2868,80 @@ msgstr ""
 "\n"
 "Halda samt �fram?"
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Veldu �� st�r� sem �� vilt setja inn"
+#: ../../install_interactive.pm_.c:68
+#, fuzzy
+msgid "Use free space"
+msgstr "Notandanafn:"
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Heildarst�r�: "
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "�tg�fa: %s\n"
+#: ../../install_interactive.pm_.c:78
+#, fuzzy
+msgid "Use existing partition"
+msgstr "Forsn�� disksnei� %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "St�r�: %d KB\n"
+#: ../../install_interactive.pm_.c:80
+#, fuzzy
+msgid "There is no existing partition to use"
+msgstr "Reyni a� endurheimta disksnei�at�fluna"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Veldu pakkana sem �� vilt setja inn"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Uppl�singar"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Hva�a disksnei� vilt �� nota sem r�tardisksnei�"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Innsetning"
+#: ../../install_interactive.pm_.c:92
+#, fuzzy
+msgid "Choose the sizes"
+msgstr "Veldu n�ja st�r�"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Set inn"
+#: ../../install_interactive.pm_.c:93
+#, fuzzy
+msgid "Root partition size in MB: "
+msgstr "R�tardisksnei�"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Vinsamlegast hinkri�, "
+#: ../../install_interactive.pm_.c:94
+#, fuzzy
+msgid "Swap partition size in MB: "
+msgstr "St�r� � MB: "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "T�mi eftir "
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Heildar t�mi "
+#: ../../install_interactive.pm_.c:105
+#, fuzzy
+msgid "Which partition do you want to resize?"
+msgstr "Hva�a snei�tegund viltu?"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Undirb� innsetningu"
+#: ../../install_interactive.pm_.c:107
+#, fuzzy
+msgid "Computing Windows filesystem bounds"
+msgstr "Reikna takmarkanir FAT skr�arkerfis..."
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Installing package %s"
-msgstr "Set inn pakka %s"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Viltu samt halda �fram?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "�a� kom upp villa vi� a� ra�a p�kkum:"
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Nota �� X uppsetningu sem er til?"
-
-#: ../../install_steps_gtk.pm_.c:158
-#, fuzzy
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Vinsamlega tilgreindu eftirfarandi"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:199
-#, fuzzy
-msgid "You don't have any windows partitions!"
-msgstr "�� hefur ekki neinar disksnei�ar"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:201
+#: ../../install_interactive.pm_.c:113
 #, fuzzy
-msgid "You don't have any enough room for Lnx4win"
-msgstr "�� hefur ekki neinar disksnei�ar"
-
-#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
 "dangerous. If you have not already done so, you should first exit the\n"
 "installation, run scandisk under Windows (and optionally run defrag), then\n"
 "restart the installation. You should also backup your data.\n"
@@ -2352,42 +2958,153 @@ msgstr ""
 "g�gnunum ��num.\n"
 "Sl��u � '� lagi' til a� halda �fram."
 
+#: ../../install_interactive.pm_.c:122
+#, fuzzy
+msgid "Which size do you want to keep for windows on"
+msgstr "Hva�a geira viltu f�ra g�gn til?"
+
+#: ../../install_interactive.pm_.c:123
+#, fuzzy, c-format
+msgid "partition %s"
+msgstr "R�tardisksnei�"
+
 #      ******************************************
 #      *****   Byrja�i h�rna 4. jan 2000  *******
 #      ***  ATH: �a� er sumt eftir fyrir ofan ***
 #      ******************************************
 #
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
+#: ../../install_interactive.pm_.c:129
+#, fuzzy, c-format
+msgid "FAT resizing failed: %s"
 msgstr "Sj�lfvirk endurst�kkun br�st"
 
-#: ../../install_steps_gtk.pm_.c:265
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:156
+#, fuzzy, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "�ll g�gn � �essari disksnei� tapast"
+
+#: ../../install_interactive.pm_.c:164
 #, fuzzy
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Hva�a disksnei� vilt �� nota sem r�tardisksnei�"
+msgid "Expert mode"
+msgstr "F. snillinga"
+
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:284
+#: ../../install_interactive.pm_.c:171
+#, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:195
 #, fuzzy
-msgid "Choose the sizes"
-msgstr "Veldu n�ja st�r�"
+msgid "You don't have enough free space on your Windows partition"
+msgstr "�� hefur ekki neinar disksnei�ar"
 
-#: ../../install_steps_gtk.pm_.c:286
+#: ../../install_interactive.pm_.c:210
 #, fuzzy
-msgid "Root partition size in MB: "
+msgid "I can't find any room for installing"
+msgstr "Get ekki b�tt vi� disksnei�um"
+
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:218
+#, fuzzy, c-format
+msgid "Partitioning failed: %s"
 msgstr "R�tardisksnei�"
 
-#: ../../install_steps_gtk.pm_.c:288
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Keyri upp neti�"
+
+#: ../../install_interactive.pm_.c:238
 #, fuzzy
-msgid "Swap partition size in MB: "
-msgstr "St�r� � MB: "
+msgid "Bringing down the network"
+msgstr "Keyri upp neti�"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps.pm_.c:74
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
+"��ekkt villa kom upp sem ekki er h�gt a� me�h�ndla.\n"
+"Haltu �fram � eigin �byrg�."
+
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "%s tengipunktur er n� �egar til"
+
+#: ../../install_steps.pm_.c:375
+msgid ""
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
+msgstr ""
+
+#: ../../install_steps.pm_.c:450
+#, fuzzy, c-format
+msgid "Welcome to %s"
+msgstr "Velkomin(n) � t�lvu�rj�tinn"
+
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Ekkert disklingadrif a�gengilegt"
+
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Hef skref `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:150
+#, fuzzy
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Vinsamlega tilgreindu eftirfarandi"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2396,7 +3113,7 @@ msgid ""
 "a percentage of 100%% will install all selected packages."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2406,105 +3123,191 @@ msgid ""
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 #, fuzzy
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "�� munt geta vali� af meiri n�kv�mni � n�sta skrefi"
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 #, fuzzy
 msgid "Percentage of packages to install"
 msgstr "Veldu pakka til a� setja inn"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Veldu pakkana sem �� vilt setja inn"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Uppl�singar"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Innsetning"
+
+#: ../../install_steps_gtk.pm_.c:272
 #, fuzzy
 msgid "Automatic dependencies"
 msgstr "Athuga tengsli milli pakka"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Opna tr�"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Loka tr�"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Skemmdur pakki"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "�tg�fa: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "St�r�: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, fuzzy, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Heildarst�r�: "
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "Eftirfarandi pakkar ver�a fjarl�g�ir"
+
+#: ../../install_steps_gtk.pm_.c:387
+#, fuzzy
+msgid "The following packages are going to be removed"
+msgstr "Eftirfarandi pakkar ver�a fjarl�g�ir"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:496
-#, fuzzy
-msgid "The following packages are going to be installed/removed"
-msgstr "Eftirfarandi pakkar ver�a fjarl�g�ir"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr ""
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Set inn"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "��tla"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Vinsamlegast hinkri�, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "T�mi eftir "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Heildar t�mi "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "H�tta vi�"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Undirb� innsetningu"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pakkar"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Set inn pakka %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Accept"
+msgstr "Sam�ykkja notanda"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2514,202 +3317,403 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Endurst�kka"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Viltu samt halda �fram?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "�a� kom upp villa vi� a� ra�a p�kkum:"
+
+#: ../../install_steps_gtk.pm_.c:573
 #, fuzzy
 msgid "There was an error installing packages:"
 msgstr "�a� kom upp villa vi� a� ra�a p�kkum:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Villa kom upp"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
+#, fuzzy
 msgid "Please, choose a language to use."
-msgstr ""
+msgstr "Hvernig m�s ertu me�?"
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Lyklabor�"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 #, fuzzy
 msgid "Please, choose your keyboard layout."
 msgstr "Hva�a lyklabor�suppsetningu viltu?"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "R�tardisksnei�"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Hver er r�tardisksnei� (/) kerfisins?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Innsetningara�fer�"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 #, fuzzy
 msgid "Which installation class do you want?"
 msgstr "Hverskonar innsetningara�fer� viltu?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Innsetning/Uppf�rsla"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "Er �etta innsetning e�a uppf�rsla?"
 
-#: ../../install_steps_interactive.pm_.c:110
-#, fuzzy
-msgid "Automated"
-msgstr "Sj�lfvirkt IP"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Au�velda"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "S�rlaga�a"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "F. snillinga"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Uppf�rsla"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Venjulega"
+#: ../../install_steps_interactive.pm_.c:222
+#, fuzzy
+msgid "Workstation"
+msgstr "Uppl�singar"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Forritun"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Sem �j�n"
 
-#: ../../install_steps_interactive.pm_.c:141
+#: ../../install_steps_interactive.pm_.c:228
 #, fuzzy
-msgid "Which usage is your system used for ?"
+msgid "What is your system used for?"
 msgstr "� hva�a t�masv��i ertu?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 #, fuzzy
 msgid "Please, choose the type of your mouse."
 msgstr "Hvernig m�s ertu me�?"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "M�sartengi"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 #, fuzzy
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Vi� hva�a ra�tengi er m�sin ��n tengd?"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Stilli PCMCIA kort..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 #, fuzzy
 msgid "Configuring IDE"
 msgstr "Uppsetning"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "engar rei�ub�nar disksnei�ar"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-#, fuzzy
-msgid "Please choose a partition to use as your root partition."
-msgstr "Hva�a disksnei� vilt �� nota sem r�tardisksnei�"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Veldu tengipunktana"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, fuzzy, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"�g get ekki lesi� disksnei�at�flu ��na, h�n er of skemmd fyrir mig :-(\n"
+"�g mun reyna a� halda �fram me� �v� a� hreinsa skemmdar disksnei�ar"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake gat ekki lesi� snei�at�fluna.\n"
+"Haltu �fram � eigin �byrg�!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "R�tardisksnei�"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Hver er r�tardisksnei� (/) kerfisins?"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "�� ver�ur a� r�sa t�lvuna aftur svo breytingar � snei�at�flunni taki gildi"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Veldu ��r disksnei�ar sem � a� forsn��a"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Athuga skemmdar blokkir?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 #, fuzzy
 msgid "Formatting partitions"
 msgstr "Forsn�� disksnei� %s"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Ekki n�gjanlegt diskminni fyrir innsetningu.  B�ttu vi� �a�"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Leita a� f�anlegum p�kkum"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Leita a� p�kkum til a� uppf�ra"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Complete (%dMB)"
+msgstr "Venjulega"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Minimum (%dMB)"
+msgstr "(%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Recommended (%dMB)"
+msgstr "Au�velda"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "S�rlaga�a"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Veldu �� st�r� sem �� vilt setja inn"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Val � pakkah�p"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2717,178 +3721,11 @@ msgstr ""
 "Set inn pakka %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Lokauppsetning"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Halda n�verandi IP stillingum"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Endurstilla netstillingar n�na"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Ekki setja upp netstillingar"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Netstillingar"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "LAN netuppsetning er �egar til sta�ar. Hva� viltu gera?"
-
-#: ../../install_steps_interactive.pm_.c:421
-#, fuzzy
-msgid "Do you want to configure a local network for your system?"
-msgstr "Viltu setja upp sta�arnet (ekki innhringingu)?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "ekkert netkort fannst"
-
-#: ../../install_steps_interactive.pm_.c:449
-#, fuzzy
-msgid "Modem Configuration"
-msgstr "Uppsetning"
-
-#: ../../install_steps_interactive.pm_.c:450
-#, fuzzy
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "Viltu setja upp sta�arnet (ekki innhringingu)?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Stilli nett�ki %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Sl��u inn IP uppsetningu �essarar v�lar. Hver f�rsla\n"
-"� a� vera IP tala ritu� me� punkt � milli.\n"
-"(d�mi 192.168.1.13)"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Sj�lfvirkt IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP vistfang:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Nets�a:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP vistfang � a� vera � sni�inu 192.168.1.10"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Stilli sta�arnetstenginu"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Sl��u inn heiti v�larinnar.  V�larheiti� �arf a� vera fullt \n"
-"heiti, t.d. odinn.grimsey.is  �� m�tt l�ka sl� inn IP \n"
-"vistfang g�ttarinnar ef �� veist hva� �a� vistfang er.\n"
-"G�ttin gefur ��r a�gang �t �r sta�arnetinu (t.d. � Interneti�)."
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "Nafnami�lari:"
-
-# ## skrytid
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "G�tt (t�ki�):"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "G�tt:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "V�larheiti:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Reyna a� finna m�tald?"
-
-#: ../../install_steps_interactive.pm_.c:521
-#, fuzzy
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Hva�a ra�tengi er m�taldi� tengt vi�?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Innhringistillingar"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Nafn tengingar"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "S�man�mer"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Notendanafn"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Au�kenning"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Me� skriftu"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Me� skj�hermi"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Nafn l�ns"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "A�al nafnami�lari"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Vara nafnami�lari"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 #, fuzzy
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
@@ -2971,89 +3808,95 @@ msgstr ""
 "Altadena, California, 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Veldu spegilv�lina �a�an sem � a� s�kja pakkanna"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Hef samband vi� v�lina til a� s�kja lista yfir f�anlega pakka"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 #, fuzzy
 msgid "Please choose the packages you want to install."
 msgstr "Veldu pakkana sem �� vilt setja inn"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
+#, fuzzy
 msgid "Which is your timezone?"
 msgstr "� hva�a t�masv��i ertu?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Veltu stilla t�lvuklukkuna � GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "Hva�a snei�tegund viltu?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Ekkert lykilor�"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Nota skuggaskr�"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "skuggi"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Nota MD5 lykilor�"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Nota NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "Gular s��ur (yp)"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "�etta lykilor� er of einfalt (ver�ur a� vera minnst %d stafa langt)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Au�kenning NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS l�n"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS �j�nn"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Sam�ykkja notanda"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "B�ta vi� notanda"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s er n� �egar til)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3063,62 +3906,91 @@ msgstr ""
 "Sl��u inn notanda\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Nafn notanda"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Notandanafn:"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Skel"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "�etta lykilor� er of einfalt"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Vinsamlega sl��u inn notandanafn"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Notandanafni� m� bara innihalda litla stafi, t�lustafi, `-' og `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "�etta notandanafn er n� �egar til"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+#, fuzzy
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"S�rsm��a�ur r�sidisklingur gerir ��r kleyft a� r�sa Linux �n �ess a� nota "
+"r�sistj�ra\n"
+" eins og LILO. �etta kemur a� gagni ef �� vilt ekki setja upp LILO � v�linni "
+"e�a ef\n"
+" anna� st�rikerfi hefur fjarl�gt LILO e�a LILO virkar ekki me� ��num "
+"v�lb�na�arstillingum.\n"
+" R�sidiskling m� einnig nota me� Linux Mandrake 'rescue' disklingnum svo "
+"h�gt s� a� bjarja\n"
+" v�linni ef alvarleg vandam�l koma upp.\n"
+"Viltu b�a til r�sidiskling fyrir v�lina ��na?"
+
+#: ../../install_steps_interactive.pm_.c:869
 #, fuzzy
 msgid "First floppy drive"
 msgstr "Fyrsta drif"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 #, fuzzy
 msgid "Second floppy drive"
 msgstr "Anna� drif"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Sleppa"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 #, fuzzy
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
@@ -3143,188 +4015,149 @@ msgstr ""
 " v�linni ef alvarleg vandam�l koma upp.\n"
 "Viltu b�a til r�sidiskling fyrir v�lina ��na?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Ekkert disklingadrif til sta�ar"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Veldu disklingadrifi� sem �� vilt nota til a� gera r�sidisk"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Settu t�man diskling � drif %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "B� til r�sidiskling..."
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "Innsetning LILO br�st s�kum eftirfarandi villu:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Viltu nota SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "Stillingar SILO"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"H�rna eru n�verandi stillingar SILO .\n"
-"�� getur b�tt vi� fleirum e�a breytt �essum."
-
-#: ../../install_steps_interactive.pm_.c:858
-#, fuzzy
-msgid "Partition"
-msgstr "R�tardisksnei�"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "�etta nafn er n� �egar � notkun."
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "Innsetning SILO br�st s�kum eftirfarandi villu:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Set upp r�sistj�rann..."
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
+#, fuzzy
 msgid "Do you want to use aboot?"
-msgstr "Viltu nota aboot?"
+msgstr "Viltu nota SILO?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Sel stillingar"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP sel:"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP Sel:"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Sel � a� vera http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Sel � a� vera ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+#, fuzzy
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "Innsetning LILO br�st s�kum eftirfarandi villu:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Velkomin(n) � t�lvu�rj�tinn"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "L�legt"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "L�gt"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Mi�lungs"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "H�tt"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Taugaveikla�"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "�msar spurningar:"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(getur ska�a� vistu� g�gn)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Nota f�nstillingar � h�r�um disk(um)"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Veldu �ryggisstig"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "N�kv�m st�r� vinnsluminnis (fann %d MB)"
 
 # ## skrytid
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Sj�lfvirk tenging aukat�kja"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Kveikja � NUMLOCK vi� eftir r�singu"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Sl��u inn vinnsluminni � MB"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 #, fuzzy
 msgid "Can't use supermount in high security level"
 msgstr "Stilli �ryggis�rep"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Leita a� PCI kortum?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Nota �� X uppsetningu sem er til?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, fuzzy, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Settu t�man diskling � drif %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 #, fuzzy
 msgid "Creating auto install floppy"
 msgstr "Undirb� innsetningu"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3334,7 +4167,7 @@ msgstr ""
 "\n"
 "Viltu virkilega h�tta n�na?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3355,153 +4188,18 @@ msgstr ""
 "Frekari uppl�singar um hvernig � a� stilla v�lina eftir innsetninguna er a�\n"
 "finna � vi�eigandi kafla � Official Linux Mandrake User's Guide b�kinni."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Slekk � t�lvunni"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Set inn rekil fyrir %s korti� %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(eining %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Hva�a %s rekil viltu pr�fa?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"� sumum tilfellum �arf rekillinn %s auka vi�f�ng svo hann virki r�tt,\n"
-" �� hann virki vel � flestum tilfellum �n �eirra.  Viltu setja inn auka\n"
-" vi�f�ng e�a leyfa reklinum sj�lfum a� leita a� �eim uppl�singum sem\n"
-" hann �arf?  Stundum frystir sj�lfvirk stilling v�lina en �a� �tti ekki\n"
-"a� skemma neitt."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Stilla sj�lfvirkt"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Stilla handvirkt"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "�� getur n�na gefi� upp vi�f�ng fyrir %s eininguna."
-
-# ## skrytid
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"�� getur n�na gefi� upp vi�f�ng fyrir eininguna %s.\n"
-"Vi�f�ng eru gefin upp sem ``vi�fang=gildi vi�fang2=gildi2 ...''.\n"
-"Til d�mis: ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Stillingar kjarnaeininga:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Innsetning � einingu %s mist�kst.\n"
-"Viltu pr�fa aftur me� �l�k vi�f�ng?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Viltu leita a� PCMCIA kortun?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Stilli PCMCIA kort..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Leita a� %s kortum?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Fann %s %s tengi"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Er kannski eitt enn � v�linni?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Eru einhver %s tengi � t�lvunni?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Nei"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "J�"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Sko�a�u v�lb�na�aruppl�singar"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Keyri upp neti�"
-
-#: ../../install_steps_interactive.pm_.c:1207
-#, fuzzy
-msgid "Bringing down the network"
-msgstr "Keyri upp neti�"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux Mandrake innsetning %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> milli hluta   |   <Bilsl�> velur   |   <F12> n�sti skj�r "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Augnablik..."
 
@@ -3511,7 +4209,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "�lj�st (%s), vertu n�kv�mari\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Sl�m hugmynd, reyndu aftur\n"
 
@@ -3525,471 +4223,979 @@ msgstr " ? (sj�lfgefi� %s) "
 msgid "Your choice? (default %s) "
 msgstr "�itt val? (sj�lfgefi� %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "�itt val? (sj�lfgefi� %s  sl��u inn  `none' fyrir engan) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "T�kkneskt"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "��skt"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Sp�nskt"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Finnskt"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Franskt"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norkst"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "P�lskt"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "R�ssneskt"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Breskt lyklabor�"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "Bandar�skt lyklabor�"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 #, fuzzy
 msgid "Armenian (old)"
 msgstr "Armen�skt"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 #, fuzzy
 msgid "Armenian (typewriter)"
 msgstr "Armen�skt (hlj��fr��ilegt)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armen�skt (hlj��fr��ilegt)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belg�skt"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "B�lgarskt"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasil�skt"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 #, fuzzy
 msgid "Belarusian"
 msgstr "B�lgarskt"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Svissneskt (��sk uppsetn.)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Svissneskt (fr�nsk uppsetn.)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Danskt"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+#, fuzzy
+msgid "Dvorak (US)"
+msgstr "Dvorak"
+
+#: ../../keyboard.pm_.c:139
+#, fuzzy
+msgid "Dvorak (Norwegian)"
+msgstr "Norkst"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Eistlenskt"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georg�skt (\"R�ssneskt\")"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georg�skt (\"Lat�nu\")"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Gr�skt"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Ungverskt"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "�srael�skt"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "�srael�skt (hlj��fr.)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+#, fuzzy
+msgid "Iranian"
+msgstr "�kra�nkst"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "�slenskt"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "�talskt"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Su�ur amer�skt"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Hollenskt"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 #, fuzzy
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lith�en�skt AZERTY"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 #, fuzzy
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lith�en�skt AZERTY"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lith�en�skt \"t�lur��\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lith�en�skt \"hlj��fr��ilegt\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 #, fuzzy
 msgid "Polish (qwerty layout)"
 msgstr "Svissneskt (��sk uppsetn.)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 #, fuzzy
 msgid "Polish (qwertz layout)"
 msgstr "Svissneskt (��sk uppsetn.)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Port�g�skt"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanad�skt (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "R�ssneskt (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "S�nskt"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Sl�venskt"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Sl�vak�skt"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Th�lenskt lyklabor�"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Tyrkneskt (hef�bundi� \"F\" m�del)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Tyrkneskt (n�t�ma \"Q\" m�del)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "�kra�nkst"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "Bandar�skt (al�j��legt)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+#, fuzzy
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Lith�en�skt \"t�lur��\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "J�goslavneskt (Lat�nu upps.)"
 
-# 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.
-#
-# '\240' is '�' (aacute) in cp437 encoding
-# '\224' is '�' (odiaeresis) in cp437 encoding.
-# '\221' is '�' (ae) in cp437 encoding
-# '\241' is '�' (iacute) in cp437 encoding
-# '\242' is '�' (oacute) in cp437 encoding
-# '\230' is '�' (yacute) in cp437 encoding
-# '\243' is '�' (oacute) in cp437 encoding
-# there is no '�' nor '�' in cp437; changed respectively to 'th' and 'd'
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+#, fuzzy
+msgid "Sun - Mouse"
+msgstr "USB m�s"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr ""
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "stig"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "ra�tengd"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Almenn �riggja hnappa m�s"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech m�s (ra�tengd, g�mul C7 tegund)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Engin m�s"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+#, fuzzy
+msgid "none"
+msgstr "B�i�"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Engin m�s"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Er �etta r�tt?"
+
+#: ../../netconnect.pm_.c:93
+#, fuzzy
+msgid "Internet configuration"
+msgstr "Sel stillingar"
+
+#: ../../netconnect.pm_.c:94
+#, fuzzy
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Viltu pr�fa skilgreininguna"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Stilla nettengingu"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Hva�a disk viltu f�ra til?"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
 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"
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Nafn tengingar"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+#, fuzzy
+msgid "ISDN Configuration"
+msgstr "Uppsetning"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
 msgstr ""
-"Velkomin(n) � LILO st�rikerfisr�sistj�rann!\n"
-"\n"
-"Sl�du � <TAB> til ad f� lista yfir m�gulega valkosti.\n"
+
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "Sel stillingar"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr ""
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr ""
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr ""
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:169
+#, fuzzy
+msgid "Provider phone number"
+msgstr "S�man�mer"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr ""
+
+#: ../../netconnect.pm_.c:172
+#, fuzzy
+msgid "Dialing mode"
+msgstr "Hringja inn me� m�taldi"
+
+#: ../../netconnect.pm_.c:174
+#, fuzzy
+msgid "Account Login (user name)"
+msgstr "Tengipunktur"
+
+#: ../../netconnect.pm_.c:175
+#, fuzzy
+msgid "Account Password"
+msgstr "Lykilor�"
+
+#: ../../netconnect.pm_.c:176
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Lykilor�"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "Pr�funar skilgreining"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:214
+#, fuzzy
+msgid "Which protocol do you want to use ?"
+msgstr "Hva�a snei�tegund viltu?"
+
+#: ../../netconnect.pm_.c:224
+#, fuzzy
+msgid "ISA / PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+#, fuzzy
+msgid "PCI"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr ""
+
+#: ../../netconnect.pm_.c:233
+#, fuzzy
+msgid "What kind of card do you have?"
+msgstr "Hvernig prentara ertu me�?"
+
+#: ../../netconnect.pm_.c:239
+#, fuzzy
+msgid "Continue"
+msgstr "Halda samt �fram?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr ""
+
+#: ../../netconnect.pm_.c:245
+msgid ""
 "\n"
-"Til r�sa einn af theim, sl�du inn nafnid og s�dan � <ENTER>\n"
-"eda b�ddu � %d sek�ndur thar til sj�lfgefin r�sing hefst.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
 
-# 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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
+#: ../../netconnect.pm_.c:257
+#, fuzzy
+msgid "Which is your ISDN card ?"
+msgstr "� hva�a t�masv��i ertu?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
 msgstr ""
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
+#: ../../netconnect.pm_.c:287
+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 ""
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "Veldu n�ja st�r�"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Vi� hva�a ra�tengi er m�sin ��n tengd?"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
 msgstr ""
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:352
+msgid ""
+"\n"
+"Do you agree?"
 msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Viltu pr�fa skilgreininguna"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "Uppsetning"
+
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "Viltu nota aboot?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Reyna a� finna m�tald?"
+
+#: ../../netconnect.pm_.c:539
+#, fuzzy
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Hva�a ra�tengi er m�taldi� tengt vi�?"
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Innhringistillingar"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Nafn tengingar"
+
+#: ../../netconnect.pm_.c:546
+#, fuzzy
+msgid "Phone number"
+msgstr "S�man�mer"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Notendanafn"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Au�kenning"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Me� skriftu"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Me� skj�hermi"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Nafn l�ns"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "A�al nafnami�lari"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Vara nafnami�lari"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Nafn tengingar"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "Stilla nettengingu"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Hva�a disk viltu f�ra til?"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
 msgstr ""
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Hva�a disk viltu f�ra til?"
+
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Nafn tengingar"
+
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Nafn tengingar"
+
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Stilla nettengingu"
+
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "Veldu prenttengingu"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
 
-#: ../../mouse.pm_.c:21
+#: ../../netconnect.pm_.c:641
 #, fuzzy
-msgid "Sun - Mouse"
-msgstr "USB m�s"
+msgid "Configure a normal modem connection"
+msgstr "Stilla nettengingu"
 
-#: ../../mouse.pm_.c:23
+#: ../../netconnect.pm_.c:661
 #, fuzzy
-msgid "Apple ADB Mouse"
-msgstr "ATI brautarm�s"
+msgid "Configure an ISDN connection"
+msgstr "Stilla nettengingu"
 
-#: ../../mouse.pm_.c:24
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr ""
+
+#: ../../netconnect.pm_.c:668
 #, fuzzy
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "USB m�s (3 e�a fleiri takkar)"
+msgid "External ISDN modem"
+msgstr "F. snillinga"
 
-#: ../../mouse.pm_.c:25
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
 #, fuzzy
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "USB m�s (3 e�a fleiri takkar)"
+msgid "Connect to the Internet"
+msgstr "Nafn tengingar"
 
-#: ../../mouse.pm_.c:26
+#: ../../netconnect.pm_.c:672
 #, fuzzy
-msgid "Apple USB Mouse"
-msgstr "USB m�s"
+msgid "What kind is your ISDN connection?"
+msgstr "Vi� hva�a ra�tengi er m�sin ��n tengd?"
 
-#: ../../mouse.pm_.c:27
+#: ../../netconnect.pm_.c:691
 #, fuzzy
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "USB m�s (3 e�a fleiri takkar)"
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Stilla nettengingu"
 
-#: ../../mouse.pm_.c:28
+#: ../../netconnect.pm_.c:700
 #, fuzzy
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "USB m�s (3 e�a fleiri takkar)"
+msgid "France"
+msgstr "H�tta vi�"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Almenn m�s (PS/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr ""
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Almenn �riggja hnappa m�s (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr ""
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "F. snillinga"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Stilla nettengingu"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Hva�a snei�tegund viltu?"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Stilla nettengingu"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI brautarm�s"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "Stilla nettengingu"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft brautarm�s"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Netstillingar"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech brautarm�s"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Viltu pr�fa skilgreininguna"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB m�s"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "Stilla nettengingu"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB m�s (3 e�a fleiri takkar)"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Nafn tengingar"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Engin m�s"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "LAN netuppsetning er �egar til sta�ar. Hva� viltu gera?"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft �tg�fa 2.1A e�a n�rri (ra�tengd)"
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "Hva�a disk viltu f�ra til?"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (ra�tengd)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Netstillingar"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (ra�tengd)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (ra�tengd)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "ekkert netkort fannst"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (ra�tengd)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Stilli sta�arnetstenginu"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (ra�tengd)"
+#: ../../network.pm_.c:274
+#, fuzzy
+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 ""
+"Sl��u inn heiti v�larinnar.  V�larheiti� �arf a� vera fullt \n"
+"heiti, t.d. odinn.grimsey.is  �� m�tt l�ka sl� inn IP \n"
+"vistfang g�ttarinnar ef �� veist hva� �a� vistfang er.\n"
+"G�ttin gefur ��r a�gang �t �r sta�arnetinu (t.d. � Interneti�)."
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (ra�tengd)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+#, fuzzy
+msgid "Host name"
+msgstr "V�larheiti:"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (ra�tengd)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech m�s (ra�tengd, g�mul C7 tegund)"
+#: ../../network.pm_.c:302
+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 ""
+"Sl��u inn IP uppsetningu �essarar v�lar. Hver f�rsla\n"
+"� a� vera IP tala ritu� me� punkt � milli.\n"
+"(d�mi 192.168.1.13)"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (ra�tengd)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Stilli nett�ki %s"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Almenn m�s (ra�tengd)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Sj�lfvirkt IP"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft samh�f� (ra�tengd)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "IP address"
+msgstr "IP vistfang:"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Almenn �riggja hnappa m�s (ra�tengd)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Netmask"
+msgstr "Nets�a:"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (ra�tengd)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Er �etta r�tt?"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP vistfang � a� vera � sni�inu 192.168.1.10"
+
+#: ../../network.pm_.c:341
+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 ""
+"Sl��u inn heiti v�larinnar.  V�larheiti� �arf a� vera fullt \n"
+"heiti, t.d. odinn.grimsey.is  �� m�tt l�ka sl� inn IP \n"
+"vistfang g�ttarinnar ef �� veist hva� �a� vistfang er.\n"
+"G�ttin gefur ��r a�gang �t �r sta�arnetinu (t.d. � Interneti�)."
+
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "Nafnami�lari:"
+
+#: ../../network.pm_.c:347
+#, fuzzy
+msgid "Gateway"
+msgstr "G�tt:"
+
+# ## skrytid
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "G�tt (t�ki�):"
+
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Lokauppsetning"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP sel:"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP Sel:"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Sel � a� vera http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Sel � a� vera ftp://..."
 
-#: ../../partition_table.pm_.c:528
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -3999,21 +5205,21 @@ msgstr ""
 "Eina lausnins er a� f�ra a�alsnei�ar svo a� gati� ver�i vi� hli�ina � "
 "vi�b�tasnei�"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "villa vi� lestur �r skr�nni %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Villa vi� lestur �r skr�nni %s: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Skemmd afritsskr�"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Villa vi� a� skrifa � skr�na %s"
@@ -4050,42 +5256,56 @@ msgstr "Endursn��..."
 msgid "maybe"
 msgstr "R�sikjarna"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr ""
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr ""
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr ""
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "S�na f�rri"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "S�na fleiri"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Sta�bundinn prentari"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+#, fuzzy
+msgid "Remote printer"
+msgstr "Vi�f�ng fyrir fjartengda lpd prentara"
+
+#: ../../printer.pm_.c:21
+#, fuzzy
+msgid "Remote CUPS server"
+msgstr "Fjartengd prentr��"
+
+#: ../../printer.pm_.c:22
+#, fuzzy
+msgid "Remote lpd server"
 msgstr "Fjartengdur"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "Vi�f�ng NetWare prentara"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Prentt�ki:"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Leita a� t�kjum..."
@@ -4099,11 +5319,11 @@ msgstr "Pr�fa tengi"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Prentari af ger�inni \"%s\" fannst � "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Sta�bundi� prentt�ki"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 #, fuzzy
 msgid ""
 "What device is your printer connected to \n"
@@ -4112,16 +5332,16 @@ msgstr ""
 "Vi� hva�a t�ki er prentarinn �inn tengdur\n"
 " (Athuga�u a� /dev/lp0 er �a� sama og LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 #, fuzzy
 msgid "Printer Device"
 msgstr "Prentt�ki:"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Vi�f�ng fyrir fjartengda lpd prentara"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4131,20 +5351,20 @@ msgstr ""
 "upp v�larheiti prent�j�nsins og prentr��ina � �eim sem\n"
 "�� vilt senda prentverkin �."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 #, fuzzy
 msgid "Remote hostname"
 msgstr "Prent�j�nn:"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Fjartengd prentr��"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB/Windows 9x/NT prentvi�f�ng"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4158,27 +5378,27 @@ msgstr ""
 "�samt samn�tingarheiti prentarans, notandaheiti, lykilor�i og\n"
 "vinnuh�psuppl�singum fyrir prentarann."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "Heiti SMB �j�ns"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "Vistfang SMB �j�ns"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Samn�tingarheiti"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Vinnuh�pur"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "Vi�f�ng NetWare prentara"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4190,122 +5410,147 @@ msgstr ""
 "�samt heiti prentara�ar, notandaheiti og lykilor�i fyrir\n"
 "prentarann."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Prent�j�nn"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Heiti prentra�ar"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "Vi�f�ng sta�bundinna prentara"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "Stillingar � prentara"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "L�legt"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Hvernig prentara ertu me�?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Viltu prenta �t prufubla�s��u?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Prenta �t prufubla�s��u(r)..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "J�, prenta ASCII prufus��u"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "J�, prenta PostScript prufus��u"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "J�, prenta b��ar prufus��ur"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Stilla prentara"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Hvernig prentara ertu me�?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Stillingar � prentara"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Papp�rsst�r�"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Koma bla�s��u �t eftir�?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Uniprint rekilvalkostir"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Stillingar � litad�pt"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Afstalla texta (tr�ppurnar)?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 #, fuzzy
 msgid "Extra Text options"
 msgstr "Stillingar � litad�pt"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Viltu prenta �t prufubla�s��u?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Prenta �t prufubla�s��u(r)..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Prentari"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Viltu setja upp prentara?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 #, fuzzy
 msgid ""
 "Here are the following print queues.\n"
@@ -4314,20 +5559,69 @@ msgstr ""
 "H�rna eru n�verandi stillingar LILO .\n"
 "�� getur b�tt vi� fleirum e�a breytt �essum."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "��tla"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Veldu prenttengingu"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Hvernig er �essi prentari tengdur?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+#, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "Veldu prenttengingu"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 #, fuzzy
 msgid "Remove queue"
 msgstr "Fjartengd prentr��"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+#, fuzzy
+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 ""
+"Allar prentra�ir (sem taka vi� prentverkum) �urfa heiti\n"
+"(oft bara lp) og m�ppu. Hva�a heiti og m�ppu viltu nota fyrir\n"
+"�essa prentr��?"
+
+#: ../../printerdrake.pm_.c:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "Sta�bundinn prentari"
+
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "Stilla handvirkt"
+
+#: ../../printerdrake.pm_.c:406
+#, fuzzy
+msgid "Location"
+msgstr "Uppl�singar"
+
+#: ../../printerdrake.pm_.c:419
 #, fuzzy
 msgid ""
 "Every print queue (which print jobs are directed to) needs a\n"
@@ -4339,60 +5633,60 @@ msgstr ""
 "(oft bara lp) og m�ppu. Hva�a heiti og m�ppu viltu nota fyrir\n"
 "�essa prentr��?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 #, fuzzy
 msgid "Name of queue"
 msgstr "Heiti prentra�ar:"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 #, fuzzy
 msgid "Spool directory"
 msgstr "Mappa prentra�ar:"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 #, fuzzy
 msgid "Printer Connection"
 msgstr "Veldu prenttengingu"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr ""
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr ""
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr ""
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr ""
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ekki n�gu margar disksnei�ar fyrir RAID %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr ""
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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 ""
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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:19
+#: ../../services.pm_.c:20
 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 "
@@ -4400,7 +5694,7 @@ msgid ""
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4408,13 +5702,13 @@ msgid ""
 "and includes support for pop-up menus on the console."
 msgstr ""
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
 msgstr ""
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4424,51 +5718,51 @@ msgid ""
 "all of the services it is responsible for."
 msgstr ""
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
 "You should leave this enabled for most machines."
 msgstr ""
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP networks.\n"
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4476,7 +5770,7 @@ msgid ""
 "it installed on machines that don't need it."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4484,115 +5778,247 @@ msgid ""
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr ""
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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:66
+#: ../../services.pm_.c:67
 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:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr ""
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Veldu ��r �j�nustur sem skal sj�lfkrafa keyra vi� r�singu"
 
-# 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.
-#
-# '\240' is '�' (aacute) in cp437 encoding
-# '\224' is '�' (odiaeresis) in cp437 encoding.
-# '\221' is '�' (ae) in cp437 encoding
-# '\241' is '�' (iacute) in cp437 encoding
-# '\242' is '�' (oacute) in cp437 encoding
-# '\230' is '�' (yacute) in cp437 encoding
-# '\243' is '�' (oacute) in cp437 encoding
-# there is no '�' nor '�' in cp437; changed respectively to 'th' and 'd'
-#
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Velkomin(n) � SILO st�rikerfisr�sistj�rann!\n"
-"\n"
-"Sl�du � <TAB> til ad f� lista yfir m�gulega valkosti.\n"
-"\n"
-"Til r�sa einn af theim, sl�du inn nafnid og s�dan � <ENTER>\n"
-"eda b�ddu � %d sek�ndur thar til sj�lfgefin r�sing hefst.\n"
-"\n"
+"�g get ekki lesi� disksnei�at�flu ��na, h�n er of skemmd fyrir mig :-(\n"
+"�g mun reyna a� halda �fram me� �v� a� hreinsa skemmdar disksnei�ar"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 #, fuzzy
 msgid "Configure LILO/GRUB"
 msgstr "Stilla X"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 #, fuzzy
 msgid "Create a boot floppy"
 msgstr "B�a til r�sidiskling"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 #, fuzzy
 msgid "Format floppy"
 msgstr "Forsn��"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 #, fuzzy
 msgid "Choice"
 msgstr "t�ki"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "Innsetning LILO br�st s�kum eftirfarandi villu:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Tafla"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Stilla X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Tafla"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+#, fuzzy
+msgid "Internet Connection Sharing"
+msgstr "Veldu prenttengingu"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Hringja inn me� m�taldi"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "Les uppsetningarskr�"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Uppsetning"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Til hamingju!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4649,23 +6075,30 @@ msgstr "Stilli �ryggis�rep"
 msgid "Choose the tool you want to use"
 msgstr "Veldu forriti� sem �� vilt nota"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Hva�a lyklabor�suppsetningu viltu?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Breyta upplausn"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Hvernig m�s ertu me�?"
+#: ../../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 ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
+
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "ekkert serial_usb fannst\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Herma eftir �ri�ja hnapp?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Vi� hva�a ra�tengi er m�sin ��n tengd?"
 
@@ -4878,8 +6311,620 @@ msgstr "Leita a� \"laufbl��um\"."
 msgid "Finding leaves takes some time"
 msgstr "�essi leit mun taka d�l�tinn t�ma"
 
-#~ msgid "Recommended"
-#~ msgstr "Au�velda"
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Sel stillingar"
+
+#, fuzzy
+msgid "Internet"
+msgstr "Endursn��..."
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+#, fuzzy
+msgid "Office"
+msgstr "t�ki"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Margmi�lun"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Margmi�lun"
+
+# ../../share/compssUsers
+msgid "KDE"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Margmi�lun"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Margmi�lun"
+
+#, fuzzy
+msgid "Gnome"
+msgstr "B�i�"
+
+msgid "Documentation"
+msgstr "Lei�beiningar"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Margmi�lun"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Veldu �� st�r� sem �� vilt setja inn"
+
+#~ msgid "Total size: "
+#~ msgstr "Heildarst�r�: "
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "Endurstilla netstillingar n�na"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Nafn tengingar"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Nafn tengingar"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Nafn tengingar"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Nafn tengingar"
+
+#, fuzzy
+#~ msgid "Germany"
+#~ msgstr "��skt"
+
+#, fuzzy
+#~ msgid "Germany (1TR6)"
+#~ msgstr "��skt"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "Hva� viltu gera?"
+
+#, fuzzy
+#~ msgid "Install/Rescue"
+#~ msgstr "Innsetning"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "Endurst�kka"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Hva�a snei�tegund viltu?"
+
+#, 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Veldu \"Innsetning\" ef �a� eru engar fyrri �tg�fur af Linux � t�lvunni\n"
+#~ "e�a ef �� vilt nota fleiri en eina dreifingu af Linux.\n"
+#~ "\n"
+#~ "Veldu \"Uppf�rsla\" ef �� vilt uppf�ra fyrri innsetningu af Linux Mandrake:\n"
+#~ "%s e�a %s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - R��lagt: Ef �� hefur aldrei sett Linux inn ��ur.\n"
+#~ "\n"
+#~ "  - Eftir �skum: Ef �� hefur �� nokkra reynslu me�iar 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"
+#~ "  - 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\".\n"
+
+#          ***********************************************
+#          ***   H�r fyrir ne�an er ���ingin m�n, en   ***
+#  ***********   �g f�r l�ka a�eins yfir �a� sem var   ************
+#          ***   ��tt fyrir ofan.  :-)  - ��rarinn     ***
+#          *** (�g kl�ra �etta seinnipartinn � morgun) ***
+#          ***********************************************
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "�essi hluti hefur a� geyma uppsetningu � sta�arnetstengingu\n"
+#~ "(LAN) e�a m�taldstengingu.\n"
+#~ "\n"
+#~ "Ef �� velur \"Sta�arnetstenging\" �� mun DrakX\n"
+#~ "reyna a� finna Ethernet netkorti� � v�linni.  � flestum tilvikum\n"
+#~ "finnast PCI netkort og er �� korti� strax tilb�i� fyrir netuppsetningu.\n"
+#~ "Ef netkorti� �itt er hinsvegar ISA kort �� er sj�lfvirk uppsetning � �v�\n"
+#~ "ekki m�guleg og �� �arft �v� a� velja rekil af listanum sem birtist.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ef �� ert me� SCSI kort �� getur �� l�ti� leita a� �v� fyrst en s��an\n"
+#~ "gefi� upp vi�f�ng ef �a� finnst ekki.  Vi�f�ngin sem �� �arft a� nota\n"
+#~ "�ttir �� a� finna � lei�beiningunum sem komu me� kortinu.\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "Ef �� ert a� setja Linux Mandrake � t�lvu sem er hluti af sta�arneti\n"
+#~ "�� �ttir �� a� f� nau�synlegar uppl�singar fyrir tengingu hj� kerfisstj�ra.\n"
+#~ "Uppl�singarnar sem �� �arft til a� tengjast sta�arneti me� TCP/IP eru:\n"
+#~ "IP vistfang, undirnetss�a (nets�a) og t�lvunafn. Ef �� ert a�\n"
+#~ "setja upp einkanet �� getur �� sj�lf(ur) �kve�i� hva�a vistfang,\n"
+#~ "nets�u og nafn �� notar � t�lvuna.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ef �� velur \"M�taldstenging\" �� ver�ur m�taldstengingin ger� kl�r.\n"
+#~ "DrakX mun reyna a� finna m�taldi� �itt en ef s� leit ber ekki �rangur\n"
+#~ "�� ver�ur �� sj�lf(ur) a� velja ra�tengi� (COM port) sem m�taldi� er\n"
+#~ "tengt vi�."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "Linux getur nota� margar ger�ir prentara.  Prentararnir krefjast\n"
+#~ "mismunandi uppsetninga.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ef prentarinn �inn er tengdur beint vi� t�lvuna veldu �� \n"
+#~ "\"Sta�bundinn prentari\". �� �arft s��an a� tilgreina vi�\n"
+#~ "hva�a tengi prentarinn er tengdur og velja vi�eigandi s�u.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ef �� vilt hafa a�gang a� prentara sem tengdur er vi� fjarl�ga UNIX v�l\n"
+#~ "(e�a Windows NT me� LPD) �� ver�ur �� a� velja \"Fjartengdur prentari\".\n"
+#~ "�� �arft ekki a� gefa upp notandanafn e�a lykilor� en �arft a� vita \n"
+#~ "nafni� � prentr��inni � �eim �j�n.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ef �� vilt hafa a�gang a� SMB prentara (prentara sem er tengdur vi�\n"
+#~ "fjarl�ga Windows 9x/NT v�l), �� �arftu a� gefa upp SMB nafn �j�nsins\n"
+#~ "sem oftast er sama og TCP/IP nafn (en �arf ekki a� vera).  Einnig �arftu\n"
+#~ "IP vistfang, notandanafn, lykilor�, nafn vinnuh�ps og au�vita� sj�lft\n"
+#~ "nafn prentarans.  Sama gildir um NetWare prentara, nema �� �arft\n"
+#~ "ekkert vinnuh�psnafn."
+
+#, fuzzy
+#~ 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."
+#~ msgstr ""
+#~ "�a� er stranglega m�lt me� �v� a� �� svarir \"J�\" h�rna. Ef �� setur\n"
+#~ "Microsoft Windows inn s��ar �� skrifar �a� yfir r�sihluta disksins og\n"
+#~ "gerir ��r �ar me� �kleyft a� r�sa Linux nema �� hafir veri� b�in(n)\n"
+#~ "a� �tb�a r�sidiskling."
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Ey�a breytingum?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "Veldu prenttengingu"
+
+#~ msgid "Host name:"
+#~ msgstr "V�larheiti:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Hvernig m�s ertu me�?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Sj�lfvirk upplausn"
+
+#~ 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"
+#~ msgstr ""
+#~ "Til a� finna m�gulegar upplausnir munu nokkrar ver�a pr�fa�ar.\n"
+#~ "Skj�rinn �inn mun blikka...\n"
+#~ "�� getur sl�kkt � honum ef �� vilt, t�lvan flautar �egar �v� er loki�"
+
+#~ 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?"
+#~ msgstr ""
+#~ "�g get reynt a� finna m�gulegar upplausnir (t.d: 800x600).\n"
+#~ "Stundum getur t�lvan frosi� vi� �a�.\n"
+#~ "Viltu pr�fa?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Engar leyfilegar upplausnir fundust\n"
+#~ "Pr�fa�u a� velja anna� skj�kort e�a skj�"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Sj�lfvirk leit upplausna"
+
+#, fuzzy
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "ATI brautarm�s"
+
+#, fuzzy
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "USB m�s (3 e�a fleiri takkar)"
+
+#, fuzzy
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "USB m�s (3 e�a fleiri takkar)"
+
+#, fuzzy
+#~ msgid "Apple USB Mouse"
+#~ msgstr "USB m�s"
+
+#, fuzzy
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "USB m�s (3 e�a fleiri takkar)"
+
+#, fuzzy
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "USB m�s (3 e�a fleiri takkar)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Almenn m�s"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI brautarm�s"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft brautarm�s"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech brautarm�s"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB m�s"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB m�s (3 e�a fleiri takkar)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft �tg�fa 2.1A e�a n�rri (ra�tengd)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (ra�tengd)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (ra�tengd)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (ra�tengd)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Almenn m�s (ra�tengd)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsoft samh�f� (ra�tengd)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Almenn �riggja hnappa m�s (ra�tengd)"
+
+#, fuzzy
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "t�kst ekki a� tengja nfs"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Dulk��un"
+
+#~ msgid "Show less"
+#~ msgstr "S�na f�rri"
+
+#~ msgid "Show more"
+#~ msgstr "S�na fleiri"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Hva�a lyklabor�suppsetningu viltu?"
+
+#~ msgid "Normal"
+#~ msgstr "Venjulega"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Viltu leita a� PCMCIA kortun?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "Leita a� %s kortum?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "Leita a� PCI kortum?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "Leita a� r�tardisksnei�"
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: �etta er ekki r�tardisksnei�.  Veldu a�ra."
+
+#~ msgid "No root partition found"
+#~ msgstr "Engin r�tarsnei� fannst"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "Get ekki nota� �tsendingu �n NIS l�ns"
+
+#~ 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.
+#
+# '\240' is '�' (aacute) in cp437 encoding
+# '\224' is '�' (odiaeresis) in cp437 encoding.
+# '\221' is '�' (ae) in cp437 encoding
+# '\241' is '�' (iacute) in cp437 encoding
+# '\242' is '�' (oacute) in cp437 encoding
+# '\230' is '�' (yacute) in cp437 encoding
+# '\243' is '�' (oacute) in cp437 encoding
+# there is no '�' nor '�' in cp437; changed respectively to 'th' and 'd'
+#
+#~ 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 ""
+#~ "Velkomin(n) � LILO st�rikerfisr�sistj�rann!\n"
+#~ "\n"
+#~ "Sl�du � <TAB> til ad f� lista yfir m�gulega valkosti.\n"
+#~ "\n"
+#~ "Til r�sa einn af theim, sl�du inn nafnid og s�dan � <ENTER>\n"
+#~ "eda b�ddu � %d sek�ndur thar til sj�lfgefin r�sing hefst.\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
+#
+#~ 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 ""
+#~ "Velkomin(n) i SILO styrikerfisraesistjorann!\n"
+#~ "\n"
+#~ "Sladu a <TAB> til ad fa lista yfir moegulega valkosti.\n"
+#~ "\n"
+#~ "Til raesa einn af theim, sl�du inn nafnid og sidan a <ENTER>\n"
+#~ "eda biddu i %d sekundur thar til sjalfgefin raesing hefst.\n"
+#~ "\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "Stillingar SILO"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "H�rna eru n�verandi stillingar SILO .\n"
+#~ "�� getur b�tt vi� fleirum e�a breytt �essum."
+
+#~ msgid "This label is already in use"
+#~ msgstr "�etta nafn er n� �egar � notkun."
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "Innsetning SILO br�st s�kum eftirfarandi villu:"
+
+#~ msgid "Shutting down"
+#~ msgstr "Slekk � t�lvunni"
 
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of Linux\n"
@@ -4930,10 +6975,6 @@ msgstr "�essi leit mun taka d�l�tinn t�ma"
 #~ "�� vilt sitja inn.  �� getur tilgreint litla e�a fulla \n"
 #~ "innsetningu af p�kkum �r �eim flokkum sem �� valdir."
 
-#, fuzzy
-#~ msgid "Choose other CD to install"
-#~ msgstr "Veldu pakka til a� setja inn"
-
 #~ msgid ""
 #~ "Select:\n"
 #~ "\n"
@@ -4985,9 +7026,6 @@ msgstr "�essi leit mun taka d�l�tinn t�ma"
 #~ msgid "Local LAN"
 #~ msgstr "Sta�arnet(LAN)"
 
-#~ msgid "Dialup with modem"
-#~ msgstr "Hringja inn me� m�taldi"
-
 #~ msgid "Size: %s MB"
 #~ msgstr "St�r�: %s MB"
 
@@ -5012,9 +7050,6 @@ msgstr "�essi leit mun taka d�l�tinn t�ma"
 #~ msgid "Password:"
 #~ msgstr "Lykilor�:"
 
-#~ msgid "Local Printer Options"
-#~ msgstr "Vi�f�ng sta�bundinna prentara"
-
 #~ msgid "server"
 #~ msgstr "net�j�nn"
 
diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index f1aefff8b..494ca8c89 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# DrakX Japanese Translation.
 # Copyright (c) 1999 MandrakeSoft
 # Junichi Kimura <jun@kde.gr.jp>, 1999-2000
 # YAMAGATA Hiroo <hiyori13@alum.mit.edu>, 1999-2000
@@ -6,51 +6,104 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 1999-12-10 16:27+0100\n"
-"Last-Translator: Junichi Kimura <jun@kde.gr.jp>\n"
+"Last-Translator: YAMAGATA Hiroo <hiyori13@alum.mit.edu>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "����"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "����ե��å�������"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "����ե��å������ɤ����򤷤Ʋ�����"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "X �����Ф�����ǲ�����"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X ������"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "�ɤι�����XFree �ˤ��ޤ���"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"���Υ����ɤ�XFree %s �ǤΤ�3D��������졼������ǽ�Ǥ���\n"
+"XFree %s �ǤΤ��Υ����ɤΥ��ݡ��Ȥϡ�2D �Τۤ���������Ƥ��ޤ���"
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr "���Υ����ɤ�XFree %s ��3D��������졼������ǽ�Ǥ���"
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "�ϡ��ɥ�����3D��������졼�����Ĥ���XFree %s"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"���Υ����ɤϥϡ���3D��������졼����󤬲�ǽ�Ǥ�����XFree %s��ɬ�פǤ���\n"
+"�����������ޤǡ��¸�Ū�ʥ��ݡ��Ȥǡ��ޥ���ե꡼���β�ǽ��������ޤ���\n"
+"XFree %s �ǤΤ��Υ����ɤΥ��ݡ��Ȥϡ�2D �Τۤ���������Ƥ��ޤ���"
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"���Υ����ɤ�XFree %s ��3D��������졼������ǽ�Ǥ���\n"
+"�����������ޤǡ��¸�Ū�ʥ��ݡ��Ȥǡ��ޥ���ե꡼���β�ǽ��������ޤ���"
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "�¸��ʳ��Υϡ��ɥ�����3D��������졼�����Ĥ���XFree %s"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "XFree������"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "����ե��å������ɤΥ��ꥵ���������򤷤Ʋ�����"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "�����ФΥ��ץ���������ǲ�����"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "��˥�������ǲ�����"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "��˥�"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -71,39 +124,40 @@ msgstr ""
 "��˥������᡼��������뤫���Τ�ޤ���\n"
 "ʬ����ʤ�����, ��������ˤ��Ʋ�������"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "��ʿ��ե�å���졼��"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "��ľ��ե�å���졼��"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "��˥������ꤵ��Ƥޤ���"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "����ե��å������ɤ����ꤵ��Ƥޤ���"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "�����٤����򤵤�Ƥޤ���"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "��������ǻ�Ƥߤޤ�����"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr "�ٹ𡧤��Υ���ե��å������ɤǥƥ��Ȥϴ����Ǥ�"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr ""
+"�ٹ𡧤��Υ���ե��å������ɤ�ƥ��Ȥ���ȥޥ��󤬥ե꡼�����뤫�⤷��ޤ���"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "������ޤ�"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -111,185 +165,172 @@ msgstr ""
 "\n"
 "�����Ĥ��ѥ�᡼�����Ѥ��ƤߤƤ�������"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "���顼ȯ��"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "���� %d �ä����ޤ�"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "����Ϥ���Ǥ����Ǥ�����"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "���顼ȯ���������Ĥ��Υѥ�᡼�����Ѥ��ƤߤƤ�������"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "�����٤μ�ư����"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"ͭ���ʲ����٤����뤿����̤���ˡ���Ƥߤޤ���\n"
-"�����꡼�����Ǥ��ޤ�...\n"
-"����ʤ��˥��Υ����å����ڤäƤ�������礦�֡�����ä��� beep ��\n"
-"���Τ餻�ޤ���"
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "������"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "�����٤ȿ�����"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "����ե��å�������: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 ������: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "���Ƥ�ɽ��"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "������"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"ͭ���ʲ�����(��: 800x600)��ưŪ��õ���ޤ���\n"
-"��������ǥޥ��󤬻ߤޤäƤ��ޤ����⤷��ޤ���\n"
-"õ���Ƥߤޤ��礦����"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"ͭ���ʥ⡼�ɤ����դ���ޤ���\n"
-"¾�Υӥǥ�������/��˥��ǻ�Ʋ�������"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "�����ܡ��ɥ쥤������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "�ޥ����μ���: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "�ޥ����ǥХ���: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "��˥�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "��˥���ʿƱ��: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "��˥���ľ��ե�å���: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "����ե��å�������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "����ե��å�����: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "������: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "������: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 ������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 �ɥ饤��: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "X Window System ������ν���"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "��˥����ѹ�"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "����ե��å������ɤ��ѹ�"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "�����Х��ץ������ѹ�"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "�����٤��ѹ�"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "�����٤μ�ư����"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "�����ɽ��"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "�⤦���ƥ���"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "��λ"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "�ɤ����ޤ�����"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "�ѹ��������˴����ޤ�����"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"�ѹ�����¸���ޤ���?\n"
+"���ߤ�����ϰʲ����̤�Ǥ�:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "�ѹ���ͭ���ˤ���ˤ� %s �˥������󤷤ʤ����Ʋ�����"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "���������Ȥ������ Ctrl-Alt-BackSpace �򲡤��Ʋ�����"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X �ε�ư"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -297,228 +338,223 @@ msgstr ""
 "����ԥ塼����֡��Ȥ���������ưŪ�� X ��Ω���夬������ˤǤ��ޤ���\n"
 "��֡��Ȥ����� X ��Ω���夲�ޤ�����"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "��ư��������"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"��ưŪ�˥桼�����������󤹤�褦�˥���ԥ塼��������Ǥ��ޤ���\n"
+"���ε�ǽ��˾�ޤʤ���硢����󥻥�ܥ���򲡤��Ƥ���������"
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "�ǥե���ȥ桼��������:"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "�Ȥ�������ɥ��ޥ͡����������ǲ�������"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 ��(8 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "3��2�鿧 (15 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "6��5�鿧 (16 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "1600���� (24 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "40���� (32 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 KB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 KB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB �ʾ�"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "����������� VGA, 640x480 at 60Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "�����ѡ� VGA, 800x600 at 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 �ߴ�, 1024x768 at 87 Hz interlaced (no 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "1280x1024 at 70 Hz��High Frequency SVGA"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "1280x1024 at 60 Hz����ǽ�ʥޥ����������˥�"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "1280x1024 at 74 Hz����ǽ�ʥޥ����������˥�"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "1280x1024 at 76 Hz����ǽ�ʥޥ����������˥�"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "1600x1200 at 70 Hz ����ǽ�ʥ�˥�"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "1600x1200 at 76 Hz ����ǽ�ʥ�˥�"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "������"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "�ǥե����"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "�ͥ�����"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "�֥�ͥå�"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "���λ�"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "�֥���ɽ���"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "�����ȥޥ��å�"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "�֡��ȥѡ��ƥ������κǽ�Υ�����"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "�ɥ饤�֤κǽ�Υ����� (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "LILO/grub �Υ��󥹥ȡ���"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "SILO �Υ��󥹥ȡ���"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "�֡��ȥ�������ɤ��˥��󥹥ȡ��뤷�ޤ�����"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub �Υ��󥹥ȡ���"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "�ʤ�"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "�ɤΥ֡��ȥ�������Ȥ��ޤ���"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "�֡��ȥ������Υ��󥹥ȡ���"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "�֡��ȥǥХ���"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (�Ť� BIOS �Ǥ�ư���ʤ�)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "����ѥ���"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "����ѥ���"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "�ǥե���ȥ��᡼����ư���Ԥ�����"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "�ӥǥ��⡼��"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "�ǥե���ȥ��᡼����ư���Ԥ�����"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "�ѥ����"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "�ѥ���� (�⤦����)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "���ޥ�ɥ饤�󥪥ץ���������"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "����"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "�֡��ȥ������Υᥤ�󥪥ץ����"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "``���ޥ�ɥ饤�󥪥ץ���������''���ץ����ϥѥ���ɤ��ʤ���\n"
 "��ˤ����ޤ���"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "�⤦���ٻ�Ʋ�����"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "�ѥ���ɤ����פ��ޤ���"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -526,167 +562,349 @@ msgstr ""
 "����ȥ�ϰʲ��ΤȤ���Ǥ���\n"
 "�ɲá��ѹ��Ǥ��ޤ���"
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "�ä���"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "��λ"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "�ɤΥ����פ��ɲä��ޤ���"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "¾�� OS (SunOS�ʤ�...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "¾�� OS (������ɥ����ʤ�...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "�ɤΥ����פ��ɲä��ޤ���"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "���᡼��"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "�롼��"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "�ɲ�"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "�ɤ߽�"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "�ơ��֥�"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "����"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "��٥�"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "�ǥե����"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "OK"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "����ȥ��ä�"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "����Υ�٥�ϵ�����Ƥ��ޤ���"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "���Υ�٥�Ϥ��Ǥ˻Ȥ��Ƥ��ޤ�"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "%s %s ���󥿡��ե����������Ĥ���ޤ���"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "�̤Τ�ΤϤ���ޤ�����"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "%s ���󥿡��ե������Ϥ���ޤ�����"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "������"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "�Ϥ�"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "%s ������ %s �Υɥ饤�Х��󥹥ȡ�����"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(�⥸�塼�� %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "�ɤ� %s �ɥ饤�Ф��ޤ��礦����"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"%s �ɥ饤�Фϡ�������ư���Τ����̤ʾ����פ��礬����ޤ���������\n"
+"�դĤ��ϡ��ʤˤ�ʤ��������ư����礬�ۤȤ�ɤǤ������̤ʥ��ץ�����\n"
+"���ꤷ�ޤ�����������Ȥ�ɥ饤�Ф˥ޥ����ץ����֤�����ɬ�׾�������\n"
+"�����Ƥߤޤ��������ץ�������˥���ԥ塼������ߤ��뤫���Τ�ޤ��󤬡�\n"
+"�ޥ��󤬤���줿�ꤹ�뤳�ȤϤ���ޤ���"
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "�����ȥץ�����"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "���ץ�������"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "�⥸�塼�� %s �Υ��ץ�������ꤷ�Ƥ���������"
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"�⥸�塼�� %s �ؤΥ��ץ����λ��ꡣ\n"
+"���ץ����Υե����ޥåȤ� ``̾��=�� ̾��2=��2 ...'' �Ǥ���\n"
+"��: ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "�⥸�塼��Υ��ץ����"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"�⥸�塼�� %s �Υ����ɤ��Ǥ��ޤ���Ǥ�����\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
+#
+#: ../../bootloader.pm_.c:234
+#, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"%s operating system chooser-he youkosou!\n"
+"\n"
+"Ichiran kara erande <ENTER> wo oshimasu. %d byou de Default ni narimasu.\n"
+"\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "GRUB operating system chooser-he youkosou!"
+
+#: ../../bootloader.pm_.c:597
+#, 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."
+
+#: ../../bootloader.pm_.c:598
+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"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "no henshuu niha 'e', command line nara 'c' wo oshi masu."
+
+#: ../../bootloader.pm_.c:600
+#, 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:604
+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:696
+msgid "Desktop"
+msgstr "�ǥ����ȥå�"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "�������ȥ�˥塼"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "���� %d ʬ"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "���� 1 ʬ"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "���� %d ��"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "����"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "����ޥ����"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "���"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "�ե����ޥå�"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "�ꥵ����"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "�ޥ���ȥݥ����"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "/etc/fstab �򹹿�"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "�������ѡ��ȥ⡼�ɤ˰ܤ�"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "�Ρ��ޥ�⡼�ɤ˰ܤ�"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "�ե����뤫��ꥹ�ȥ�����"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "�ե�����˥����֤���"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "����������"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "�ե��åԡ�����ꥹ�ȥ�����"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "�ե��åԡ��˥����֤���"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "���Ƥ򥯥ꥢ"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "���Ƥ�ե����ޥå�"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "��ư�������"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "���ƤΥץ饤�ޥ�ѡ��ƥ�����󤬻Ȥ��Ƥ��ޤ�"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "����ʾ�Υѡ��ƥ��������ɲäǤ��ޤ���"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -694,59 +912,63 @@ msgstr ""
 "�ѡ��ƥ����������䤷�����ʤ顤��ĥ�ѡ��ƥ������\n"
 "����褦�ˤɤ����Υѡ��ƥ�������ä��Ʋ�������"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "�ѡ��ƥ������ơ��֥��Ĥ�"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "��Ȥ��᤹"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "�ѡ��ƥ������ơ��֥�򹹿�"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "�������"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "�롼�ץХå�"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "��"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "����¾"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "����å�"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "��"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "����¾"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "�ե����륷���ƥ� ������:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "�ܺ�"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -756,19 +978,19 @@ msgstr ""
 "�ϡ��ɥǥ��������Τ��礭�� FAT �ѡ��ƥ�������Ĥ����Ǥ���\n"
 "�ʤ��֤�MS Dos/������ɥ����Τ�ΤǤ��ˡ�\n"
 "�ޤ��Ϥ����Ĥ�ꥵ��������Τ������Ǥ��礦\n"
-"�ʤ��Υѡ��ƥ������򥯥�å����ơ����� \"�ꥵ����\" �򥯥�å����Ʋ�����)"
+"�ʤ��Υѡ��ƥ������򥯥�å����ơ����ˡ֥ꥵ�����פ򥯥�å����Ʋ�����)"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "�ǡ����ΥХå����åפ��äƲ�����"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "�褯�ɤ�ǲ�������"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -777,77 +999,77 @@ msgstr ""
 "�⤷ aboot ��Ȥ��Ĥ��ʤ顢�ǥ���������Ƭ�˶����ΰ� (2048���������餤)\n"
 "��Ĥ��褦�����դ��Ʋ�������"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "����: �������ϴ����Ǥ���"
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "���顼"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "�ޥ���ȥݥ����: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "�ǥХ���: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS �ǥХ����쥿��: %s (����)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "������: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "����: ������ %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "������: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s ������"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "������ %d ���饷���� %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "�ե����ޥåȺѤ�\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "̤�ե����ޥå�\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "�ޥ���ȺѤ�\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "�롼�ץХå��ե�����: %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -855,79 +1077,79 @@ msgstr ""
 "�ǥե���Ȥǥѡ��ƥ������֡���\n"
 "    (MS-DOS �Υ֡���, lilo �ǤϤʤ�)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "��٥� %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "����󥯥����� %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID�ǥ����� %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "�롼�ץХå��ե�����̾: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "�ѹ�����ѡ��ƥ������򥯥�å����Ƥ�������"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "������: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "������ȥ�: %s ������, %s �إå�, %s ������\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "�ѡ��ƥ������ơ��֥륿����: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "�Х� %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "�ޥ����"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "�����ƥ���"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "RAID �˲ä���"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "RAID �������"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "RAID���ѹ�"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "�롼�ץХå��λ���"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "ư�������"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -938,7 +1160,7 @@ msgstr ""
 "������ /boot �Ϻ��ޤ���/boot���������ȡ�LILO �����ޤ�Ư���ʤ�����\n"
 "LILO ��Ȥ�ʤ��ʤ� /boot ���פ�ޤ��󤫤�"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -950,26 +1172,26 @@ msgstr ""
 "���äƤ��ޤ���͡�LILO ��֡��ȥޥ͡�����˻Ȥ��ʤ顤/boot �ѡ��ƥ�\n"
 "�������ɲä�˺��ʤ���"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "���ʤ��ϥ롼��(/)�ȤȤ��ƥ��եȥ�����RAID�ѡ��ƥ����������Ӥޤ����͡�\n"
 "/boot �ѡ��ƥ������̵���Ǥ�����������֡��ȥ������Ϥ���ޤ���\n"
-"�ʤΤ� lilo �ޤ��� grub ��Ȥ��ʤ� /boot �ѡ��ƥ��������ɲä�˺��ʤ���"
+"�Ǥ����� /boot �ѡ��ƥ��������ɲä�˺��ʤ���"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "����� ``%s'' ��ȤäƲ�����"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "�ǽ�� ``Unmount`` ��ȤäƲ�����"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -977,41 +1199,41 @@ msgstr ""
 "�ѡ��ƥ������η��� %s "
 "���ѹ������塢���Υѡ��ƥ�������Υǡ����ϼ����ޤ�"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
-msgstr "³���ޤ�����"
+msgstr "����Ǥ�³���ޤ�����"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "�����֤�����λ"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "�ѡ��ƥ������ơ��֥�򹹿������˽�λ��"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "�ѡ��ƥ�����󥿥��פ��ѹ�"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "�ɤΥѡ��ƥ�����󥿥��פˤ��ޤ�����"
+#: ../../diskdrake.pm_.c:471
+msgid "Which filesystem do you want?"
+msgstr "�ɤΥե����륷���ƥ�ˤ��ޤ�����"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr "32MB�ʲ��Υѡ��ƥ������� ReiserFS �ϻȤ��ޤ���"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "�롼�ץХå��ե����� %s ��ɤ��˥ޥ���Ȥ��ޤ�����"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "�ǥХ��� %s ��ɤ��˥ޥ���Ȥ��ޤ�����"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1020,138 +1242,142 @@ msgstr ""
 "�ޥ���ȥݥ���Ȥ����꽢�����Ȥ�����ޤ���\n"
 "�ޤ��롼�ץХå��������Ƥ���������"
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "�ե����ޥåȤ����顢�ѡ��ƥ������ %s ��Υǡ����ϼ����ޤ���"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "�ե����ޥå���"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "�롼�ץХå��ե����� %s ��ե����ޥå���"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "�ѡ��ƥ������ %s ��ե����ޥå���"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "���ƤΥѡ��ƥ�������ե����ޥåȤ�����,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "�����Υѡ��ƥ��������Υǡ����ϼ����ޤ�"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "��ư"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "�ɤΥǥ������˰�ư���ޤ���?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "�ɤΥ��������ư���ޤ�����"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "��ư��"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "�ѡ��ƥ��������ư��..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "�ɥ饤�� %s �Υѡ��ƥ������ơ��֥��ǥ������˽񤭹��ߤޤ���"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "��֡��Ȥ��ƥѡ��ƥ������ơ��֥���ѹ���ȿ�Ǥ�����ɬ�פ�����ޤ�"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "fat �ե����륷���ƥ�ζ�����׻�"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "�ꥵ������"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+msgid "This partition is not resizeable"
+msgstr "���Υѡ��ƥ������ϥꥵ�����Ǥ��ޤ���"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "���Υѡ��ƥ�������Υǡ����ϥХå����åפ���٤��Ǥ�"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "�ꥵ������ˤϡ��ѡ��ƥ������ %s ��Υǡ����ϼ����ޤ�"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "������������������"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "�������ѡ��ƥ����������"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "���ϥ�����: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "MB �ǤΥ�����: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "�ե����륷���ƥॿ����: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "�ץ�ե����: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "���Υѡ��ƥ������ϥ롼�ץХå��ˤϻȤ��ޤ���"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "�롼�ץХå�"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "�롼�ץХå��ե�����̾: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "�ե�����Ϥ��Ǥ��̤Υ롼�ץХå��ǻ����档¾�Τ����Ӥޤ��礦"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "�ե�����Ϥ��Ǥ�¸�ߤ��ޤ������ޤ���Τ�Ȥ��ޤ�����"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "�ե����������"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1159,11 +1385,11 @@ msgstr ""
 "�Хå����åפ���ѡ��ƥ������ơ��֥�Υ��������㤤�ޤ�\n"
 "³���ޤ�����"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "�ٹ�"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1171,79 +1397,79 @@ msgstr ""
 "�ե��åԡ���ɥ饤�֤��������Ƥ�������\n"
 "�ե��åԡ�������ƤΥǡ����ϼ����ޤ�"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "�ѡ��ƥ������ơ��֥��߽Ф��Ƥߤ�"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "�ǥХ���"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "��٥�"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "����󥯥�����"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "�ɲä����¸�� RAID ������ǲ�����"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "����"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s �ե����ޥå�, %s ����"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "%s �� ������ %s �ǥե����ޥåȤ�����ˡ���Τ�ޤ���"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "nfs �ޥ���Ȥ˼���"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "�ޥ���Ȥ˼���: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "%s �򥢥�ޥ������˥��顼: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "�ޥ���ȥݥ���Ȥ� / �ǻϤޤ�ɬ�פ�����ޤ�"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "�ѡ��ƥ������ϥޥ���ȥݥ���� %s �˥ޥ���ȺѤ�\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "���ޥ���� %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr "���Υǥ��쥯�ȥ�� root �ե����륷���ƥ���˻Ĥ��Ƥ�������"
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "���Υޥ���ȥݥ���Ȥˤϡ��ºߤ���ե����륷���ƥ� (ext2, reiserfs) \n"
 "��ɬ�פǤ���\n"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "�񤭹��ߤΤ��� %s �򳫤��Ȥ����顼��ȯ��: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1251,72 +1477,118 @@ msgstr ""
 "���顼ȯ�� - �������ե����륷���ƥ���ۤǤ���褦�ʥǥХ�����\n"
 "���դ���ޤ��󡣤ʤˤ����������ϡ��ɥ�����������å����Ƥ�������"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "�ѡ��ƥ�����󤬤���ޤ���"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "���󥹥ȡ���λ��ȥ����ƥ����ѻ��˻Ȥ��������������Ǥ���������"
 
-#: ../../help.pm_.c:10
+#: ../../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 ""
+"���󥹥ȡ����³����ˤϡ���Υ饤���󥹤ξ���Ʊ�դ��Ƥ���������\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:13
+#: ../../help.pm_.c:25
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"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"
+"���٤Ф������礦�֤Ǥ���"
+
+#: ../../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"
-"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).\n"
 "\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
-"  - 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"
+"\t* Recommanded: 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"
-"  - 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"
+"\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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�Υ��󥹥ȡ��뤬���Ƥ����ۤ���Linux�ǥ����ȥ�ӥ塼������\n"
-"�С������ȶ�¸���������Ȥ��ˤϡ� \"���󥹥ȡ���\" �����Ӥޤ��礦��\n"
+"�Ť��С�������Linux-Mandrake�����󥹥ȡ��뤵��Ƥ��ʤ�����ʣ���� OS\n"
+"���¹Ԥ��ƻȤ����ˤϡ��֥��󥹥ȡ���פ����Ӥޤ��礦��\n"
 "\n"
-"Mandrake Linux: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000, 7.0 (Air)�ʤɡ��Ť�Mandrake Linux��\n"
-"���åץ��졼�ɤ���ʤ�\"���åץ��졼��\"�����Ӥޤ��礦��\n"
 "\n"
+"�Ť�Linux-Mandrake�򹹿��������Τʤ�ֹ����פ����Ӥޤ���\n"
 "\n"
-"����:\n"
 "\n"
-"  - ����ư(�侩): Linux�Υ��󥹥ȡ��뤬���Ƥʤ顢��������Ӥޤ��礦����:\n"
-"    �ͥåȥ����ǽ�ϥ��󥹥ȡ�����ˤ����ꤵ��ʤ��Τǡ�\n"
-"    ���󥹥ȡ����� \"LinuxConf\"�����ꤷ�Ƥ���������\n"
+"GNU/Linux �ؤν����٤˱����ơ��ʲ��Υ��󥹥ȡ��롦������٥뤬\n"
+"���٤ޤ�:\n"
 "\n"
-"  - �������ޥ���: GNU/Linux �˾ܤ�����С���ʬ�Υޥ���μ�ʻȤ�����\n"
-"    ���碌�����Ӥޤ��礦���ܤ����ϰʲ��򻲾Ȥ��Ƥ���������\n"
+"\t* �侩: GNU/Linux \t  "
+"�Υ��󥹥ȡ���Ͻ��ơ��Ȥ����ͤϤ��������Ǥ���������\n"
+"\t  ���뤵������⤢�ޤꤢ�뤯���ȤƤ��ñ�˥��󥹥ȡ���Ǥ��ޤ���\n"
 "\n"
-"  - �������ѡ���: �����������GNU/Linux�˾ܤ����ͤ��������ü��\n"
-"    ���󥹥ȡ���򤷤����������Ӥޤ���\"�������ޥ���\"\n"
-"    �Υ��󥹥ȡ����Ʊ��������ʬ�Υ����ƥ�λȤ��������٤ޤ���\n"
-"    �Ǥ⡢�����˼������ʤ��ʤ顢���Фˤ���ϻȤ�ʤ��Ǥ���������\n"
+"\n"
+"\t* �������ޥ���: GNU/Linux �Τ��Ȥ�褯�ΤäƤ���ͤϡ������ƥ��\n"
+"\t  ��ʻȤ���������Ǥ��������ʥ�����ơ�����󡢥����С���ȯ�ˡ�\n"
+"\t  �ֿ侩�פ��Ϥ����������������뤳�Ȥˤʤ�Τǡ����Υ��饹��\n"
+"\t  ���֤ˤ� GNU/Linux �λ��ȤߤˤĤ����μ�������ޤ���\n"
+"\n"
+"\n"
+"\t* �������ѡ���: GNU/Linux �˾ܤ����ͤϡ����Υ��󥹥ȡ��륯�饹��\n"
+"\t  ���٤ޤ����֥������ޥ����פ�Ʊ�������礢ʻȤ�ʡʥ�����ơ������\n"
+"\t  �����С���ȯ�ˤ����٤ޤ������Υ��󥹥ȡ��륯�饹����������\n"
+"\t  �褯�ͤ��Ƥ��������������ƥ������ಽ�������󥹥ȡ��뤬�Ǥ��ޤ���\n"
+"\t  GNU/Linux�ˤĤ��Ƥ�ۤɾܤ����ʤ��ȡ��ʤ��ʤ��������ʤ����䤬\n"
+"\t  ����ޤ����狼�ä��Ͱʳ��ϡ����Υ��饹�����Фʤ����ȡ�"
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1324,371 +1596,884 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "����:\n"
 "\n"
 "  - �������ޥ���: GNU/Linux �˾ܤ�����С���ʬ�Υޥ���μ�ʻȤ�����\n"
 "    ���碌�����Ӥޤ��礦���ܤ����ϰʲ��򻲾Ȥ��Ƥ���������\n"
 "\n"
+"\n"
 "  - �������ѡ���: �����������GNU/Linux�˾ܤ����ͤ��������ü��\n"
-"    ���󥹥ȡ���򤷤����������Ӥޤ���\"�������ޥ���\"\n"
+"    ���󥹥ȡ���򤷤����������Ӥޤ����֥������ޥ�����\n"
 "    �Υ��󥹥ȡ����Ʊ��������ʬ�Υ����ƥ�λȤ��������٤ޤ���\n"
-"    �Ǥ⡢�����˼������ʤ��ʤ顢���Фˤ���ϻȤ�ʤ��Ǥ���������\n"
+"    �Ǥ⡢�����˼������ʤ��ʤ顢���Фˤ���ϻȤ�ʤ��Ǥ���������"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "�ޥ���λȤ����������ʤ���ϤĤޤꡢ���ʤ������󥹥ȡ���������\n"
-"\"��������\" �� \"�������ѡ���\" ���������Ȥ��ޤ��ˤϰʲ����̤�:\n"
+"�֥�������פ��֥������ѡ��ȡפ��������Ȥ��ޤ��ˤϰʲ����̤�:\n"
+"\n"
+"\n"
+"  - ������ơ������: �ޥ�����˥ǥ����ȥåפΰ������ѤǻȤ���\n"
+"    �顢���������Ǥ������������ե�����̳���������Խ��ʤɤǥޥ���\n"
+"    ��Ȥ����ˤϤ���Ǥ�������ѥ���䳫ȯ�ѤΥ桼�ƥ���ƥ�����\n"
+"    ��ޤ���\n"
 "\n"
-"  - �Ρ��ޥ�: �ޥ�����˥ǥ����ȥåפΰ������ѤǻȤ��ʤ顢�����\n"
-"    ����Ǥ������������ե�����̳���������Խ��ʤɤǥޥ����Ȥ����\n"
-"    �ˤϤ���Ǥ�������ѥ���䳫ȯ�ѤΥ桼�ƥ���ƥ�������ޤ���\n"
 "\n"
 "  - ��ȯ��: ̾���ΤȤ��ꡣ���Υޥ�����˥��եȳ�ȯ�ǻȤ��Τʤ顢\n"
 "    ���������Ǥ��������������������ɤ򥳥�ѥ��롢�ǥХå�������\n"
 "    �����ꡢ���եȥѥå��������ä��ꤹ��Τ˻Ȥ����եȽ������٤�\n"
 "    ���󥹥ȡ��뤵��ޤ���\n"
 "\n"
+"\n"
 "  - ��������: Linux-Mandrake�򥤥󥹥ȡ��뤷�褦�Ȥ��Ƥ���ޥ����\n"
 "    ���������ѤǻȤ��Ĥ��ʤ餳��Ǥ����ե����륵���� (NFS��SMB)��\n"
 "    �ץ�󥿥����С�Unix��lp (�饤��ץ��) �ץ��ȥ��뤫������ɥ���\n"
 "    ����SMB��ͳ�ΰ���)��ǧ�ڥ����� (NIS)���ǡ����١��������ФʤɤǤ���\n"
-"    ���ξ��ˤϡ�KDE��GNOME�ʤɤΤ������ϥ��󥹥ȡ��뤷�ޤ���\n"
+"    ���ξ��ˤϡ�KDE��GNOME�ʤɤΤ�����������ʪ�ϥ��󥹥ȡ��뤷�ޤ���"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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"
-"���äơ��Ȥ��ɥ饤�Ф��狼��С������ưŪ���Ȥ߹��ߤޤ��������ץ�\n"
-"���������󤢤äƤ�����פǤ���\n"
+"DrakX��PCI SCSI�����ץ��򸡽Ф��褦�Ȥ��ޤ���\n"
+"�⤷DrakX��SCSI�����ץ���ߤĤ����ɤΥɥ饤�Ф�Ȥ��Ф��������ΤäƤ���С�\n"
+"��ưŪ�˥ɥ饤�Ф򥤥󥹥ȡ��뤷�ޤ���\n"
 "\n"
 "\n"
-"�⤷ISA�Х���SCSI�����ץ���ȤäƤ����ꡢPCI�Х���SCSI�����ץ��Ǥ�\n"
-"DrakX�˥ɥ饤�Ф��狼��ʤ��ä��ꤹ��Ȥ����ޤ���SCSI�����ץ����ʤ�\n"
-"�Ȥ��ˤϡ��ץ���ץȤ��ФƤ��ơ�SCSI�����ץ������뤫�ɤ��������ޤ���\n"
-"�ʤ����\"������\"�������Ƥ��������������\"�Ϥ�\" �������ޤ��礦��\n"
-"����ȥɥ饤�Фΰ���ɽ���ФƤ���Τǡ�Ŭ�ڤʤ�Τ�����Ǥ���������\n"
+"�⤷SCSI�����ץ����ʤ�����ISA SCSI�����ץ������ޤ���\n"
+"DrakX��ǧ�����ʤ�PCI SCSI�����ץ����ä���硢 SCSI�����ץ��������ƥ�\n"
+"�ˤ��뤫��Ҥͤ��ޤ��������ƥ�˥����ץ����ʤ����\n"
+"'No'�򥯥�å����Ƥ��������� 'Yes'�򥯥�å�����ȡ�\n"
+"�����ץ��Υɥ饤�а�����ɽ������Τǡ������������Ӥޤ��礦��\n"
 "\n"
 "\n"
-"�ɥ饤�Ф�������顢���Υɥ饤�Фǥ��ץ�������ꤷ�������ɤ�����\n"
-"DrakX�������Ƥ��ޤ����ǽ�ϡ��ɥ饤�Ф˥ϡ��ɥ�������ץ����֤�����\n"
-"�ߤޤ��礦�����������Ϥ���Ǥ��ޤ������ޤ���\n"
+"�⤷��ư�ǥ����ץ�����ꤷ�����ˤϡ�DrakX�ϥ��ץ�������򤷤������ɤ���\n"
+"���䤷�Ƥ��ޤ���DrakX�˥ϡ��ɥ�������ץ����֤����ơ����ץ������ᤵ��\n"
+"�ޤ��礦�������Ƥ�����Ǥ��ޤ�Ư���ޤ���\n"
 "\n"
-"\n"
-"���줬����ʤ顢���Υ����ץ��ˤĤ��ƥɥ�����ơ������˽񤤤Ƥ��ä�\n"
-"���Ȥ䡢������ɥ����Υץ��ѥƥ��ξ���ʤɤ�פ������Ƥߤޤ��礦������\n"
-"���ȡ��륬���ɤǤ⡢����򹵤��Ƥ����褦�ˤ����ᤷ�ޤ�����͡����ξ���\n"
-"��ɥ饤�Фˤ錄���Ƥ�뤳�Ȥˤʤ�ޤ���"
+"�⤷����ʤ顢�ɥ饤�Ф˼�ʬ�ǥ��ץ�����Ϳ����ɬ�פ�����ޤ���\n"
+"�桼�������� (3��, \"�ϡ��ɥ������ˤĤ��Ƥξ������) ���顢����˴ؤ��\n"
+"�����ϡ��ɤΥޥ˥奢���᡼���� Web �����ȡʥͥåȤ˥��������Ǥ���С�\n"
+"���뤤�ϡʥ����ƥ��ˤ���С�MS Windows ����ɤ���ä�ɬ�׾�������뤫\n"
+"��Ĵ�٤Ƥ���������"
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:108
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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 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"
-"You can reach any option using the keyboard: navigate through the "
+"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."
+msgstr ""
+"���Ƥ���ɤϡ��ϡ��ɥǥ��������Linux-Mandrake OS ��ɤ��˥��󥹥ȡ���\n"
+"���뤫���֤��Ȥˤʤ�ޤ����⤷�ϡ��ɥǥ����������������Ǥ��̤� OS ��\n"
+"���ڡ����������ȤäƤ��ޤäƤ����顢�ѡ��ƥ��������ڤäƤ��ɬ�פ�\n"
+"����ޤ�������ǡ��ѡ��ƥ��������ڤ�Ȥ����Τϡ��ϡ��ɥǥ�����������\n"
+"Ū�˶��ڤäƤ�뤳�ȤǤ���������äơ������� Linux-Mandrake �����ƥ��\n"
+"���󥹥ȡ��뤹����ڤ�򤳤��館�Ƥ��櫓�Ǥ���\n"
+"\n"
+"\n"
+"�ѡ��ƥ��������ڤ�Τϡ����ʤ��������꤬�����ޤ��󡣤�����\n"
+"�鿴�ԤˤϤ��ä��ʤ���������줹���ȤǤϤ���ޤ���\n"
+"���Υ��������ɤϥץ��������ñ�ˤ��뤿��Τ�ΤǤ����Ϥ�����ˡ�\n"
+"�ޥ˥奢��򤸤ä����ɤ�Ǥ���������\n"
+"\n"
+"\n"
+"����Ǥ���ĤΥѡ��ƥ�������פ�ޤ�����Ĥϥ����ƥऽ�Τ���Ѥ�\n"
+"�⤦��Ĥϲ��ۥ���ʤޤ��ϥ���åס��ѤǤ���\n"
+"\n"
+"\n"
+"�⤷���Ǥ˥ѡ��ƥ�������������Ƥ���ʤ�ʤ��Ȥ��а����˥��󥹥ȡ���\n"
+"�����Ȥ��̤Υġ����Ȥä��Ȥ��ˡ�Mandrake-Linux�Ǥ����Ȥ��褦����\n"
+"����Ф��ߤޤ���\n"
+"\n"
+"\n"
+"�ѡ��ƥ�����󤬤ޤ��������Ƥ��ʤ���С����������ޤ��礦��\n"
+"����ˤϡ�����Ѱդ������������ɤ�ȤäƤ����������ϡ��ɥǥ�����������\n"
+"�˱����ơ������Ĥ������������ޤ�:\n"
+"\n"
+"\t* ��¸�ѡ��ƥ�������Ȥ�: ���������ɤ���¸��Linux \t  "
+"�ѡ��ƥ�������ǥ�������Ǹ��Ĥ��ޤ�����\n"
+"\t  �⤷�����Ȥ��ʤ顢���Υ��ץ��������Ӥޤ���\n"
+"\n"
+"\n"
+"\t* �ǥ��������Τ�õ�: �ϡ��ɥɥ饤�־�����ǡ�����ѡ��ƥ�������\n"
+"\t  �õ�ơ������� Linux-Mandrake �Ǿ�񤭤�������С����Υ��ץ�����\n"
+"\t  ���Ӥޤ��礦�����ξ�硢���Ťˤ��Ƥ������������ä����ǧ�ܥ����\n"
+"\t  �������顢�⤦���ʤ����Ϥ����ޤ���\n"
+"\n"
+"\n"
+"\t* ������ɥ����ζ�����ʬ��Ȥ�: �ϡ��ɥǥ������˥�����ɥ�����\n"
+"\t  ���󥹥ȡ��뤵��Ƥ��ơ��ǥ��������Τ�ȤäƤ���ʤ顢\n"
+"\t  Linux �Υǡ����Ѥ˶�����Ĥ���ɬ�פ�����ޤ�������ˤϡ�\n"
+"\t  ������ɥ�����ä��Ƥ��ޤäƤ⤤���Ǥ����ʾ�Ρ����ǥ������õ��\n"
+"\t  ���֥������ѡ��ȥ⡼�ɡפ򸫤Ƥ��������ˡ�������ɥ�����\n"
+"\t  �ѡ��ƥ�������ꥵ����������ˡ�⤢��ޤ����ꥵ�����ξ�硢\n"
+"\t  �ǡ����Ϥ��٤ƻĤ�ޤ��� Linux-Mandrake �ȥ�����ɥ�����Ʊ��\n"
+"\t  �ޥ���ǻȤ�������Ф��줬������Ǥ���\n"
+"\n"
+"\n"
+"\t  ������ˡ���������ˡ��������ȥ�����ɥ����Υѡ��ƥ�������\n"
+"\t  ����꾮�����ʤ�ΤϾ��Τ��Ƥ����Ƥ���������\n"
+"\t  �Ĥޤꡢ������ɥ����Τۤ��Ǥϡ��ǡ�������¸�����꿷�������եȤ�\n"
+"\t  ���󥹥ȡ��뤹��Ȥ��ˡ��Ȥ�����������ʤ��ʤ�櫓�Ǥ���\n"
+"\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"
-"using Tab and Up/Down arrows. When a partition is selected, you can use:\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"
+"\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"
+msgstr ""
+"���Ƥ����ǡ������� Linux-Mandrake �����ƥ��\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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+"   * �������: "
+"�ѹ����������ä��ơ��ǽ�Υѡ��ƥ������ơ��֥���ɤ߹��ߤޤ���\n"
 "\n"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\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"
+"\n"
+"     * Ctrl-d���ѡ��ƥ��������\n"
+"\n"
+"     * Ctrl-m���ޥ���ȥݥ���Ȥ򥻥å�"
+
+#: ../../help.pm_.c:218
+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"
-"Linux-Mandrake�����ƥ�򥤥󥹥ȡ��뤹�뤫�����Ӥޤ��礦��\n"
-"�⤷�ѡ��ƥ��������äƤ��ʤ���С��ϡ��ɥǥ������Υѡ��ƥ�������\n"
-"�����Ǻ��ޤ����ѡ��ƥ������Ȥ����Τϡ�����ԥ塼���Υϡ��ɥǥ�����\n"
-"����Ū�ˤ��碌������Ū�˶��ڤ뤳�ȤǤ���\n"
+"�ϡ��ɥǥ�������˸��Ф��줿����¸�� Linux �ѡ��ƥ���������\n"
+"�����ޤ������������ɤ�����򤽤Τޤޤˤ��Ƥ����Ƥ⤤���Ǥ��礦��\n"
+"�̾�����Ѥˤ����ꤢ��ޤ���������Ѥ����顢����Ǥ� root\n"
+"�ѡ��ƥ������ (\"/\")����ꤷ�Ƥ������������ޤ꾮�����ѡ��ƥ������\n"
+"�򤳤������֤ȡ����եȤ������ڤ�ʤ��ʤ�ޤ��衣�ޤ����ǡ������̤�\n"
+"�ѡ��ƥ������˵���������С�\"/home\" ����ꤷ�ޤ��礦�ʤ���ϡ�\n"
+"Linux �ѡ��ƥ������ʣ���ʤ����Բ�ǽ�Ǥ���)��\n"
+"\n"
+"\n"
+"���ʤߤ˳ƥѡ��ƥ������ϰʲ��ν񼰤ǵ󤬤äƤ��ޤ�: ��̾���ס����̡�\n"
+"\n"
 "\n"
+"��̾���פϼ��ν񼰤Ǥ�: �֥ϡ��ɥǥ���������ס֥ɥ饤���ֹ��\n"
+"�֥ѡ��ƥ�������ֹ�סʤ��Ȥ��С�hda1��)\n"
 "\n"
-"�������ѡ��ƥ�������Ĥ���ʤ顢\"��ư�������\"�����٤С���ưŪ��\n"
-"Linux�ѤΥѡ��ƥ�����󤬤Ǥ�������ޤ����ѡ��ƥ�������Ĥ���ϡ���\n"
-"�ǥ����������֤Ȥ��ϡ��ǽ��IDE�ɥ饤�֤�\"hda\"��2���ܤ�\"hdb\"���ǽ�\n"
-"��SCSI�ɥ饤�֤�\"sda\"���Ȥ������ˤʤ�ޤ���\n"
 "\n"
+"�֥ϡ��ɥǥ���������פϡ�IDE �ǥ������ʤ��hd�פǡ�SCSI �ʤ��sd��\n"
+"�Ǥ���\n"
 "\n"
-"�褯����ѡ��ƥ��������ڤ����Ȥ��Ƥϡ�root�ѡ��ƥ������(/) ��\n"
-"boot�ѡ��ƥ������(/boot) ����ޤ���root�ϥե����륷���ƥ��\n"
-"�ǥ��쥯�ȥ�ΤƤäڤ�ǡ�/boot�ˤϥ���ԥ塼���Υ����å������줿\n"
-"�Ȥ��˵�ư��ɬ�פʥե����뤬�֤��Ƥ���Ȥ����Ǥ���\n"
 "\n"
+"�֥ɥ饤���ֹ�פϡ���hd�פ��sd�פθ�ˤĤ�ʸ���Ǥ���IDE�ʤ�:\n"
 "\n"
-"�ѡ��ƥ��������ڤ�ȡ��դĤ��Ϥ����Υǡ����������ä��ơ���Ȥ�\n"
-"���ޤ��󡣤�����ѡ��ƥ��������ڤ�Τϡ��鿴�ԤˤϤ��ä��ʤ�\n"
-"�Ǥ������ȤäƤⵤ��줹���ΤǤ��������ʤ�ʤ��褦�ˡ�DiskDrake\n"
-"�Ϥ��Υץ�������ʤ�٤���ñ�ˤ��ޤ����ޤ��ϥɥ�����ơ�������\n"
-"�ɤ�ǡ���˿ʤ����ˤ��ä��굤������失�ޤ��礦��\n"
+"   * ��a�פϥץ饤�ޥꥳ��ȥ������Υޥ����ǥ�����\n"
 "\n"
+"   * ��b�פϥץ饤�ޥꥳ��ȥ������Υ��졼�֥ǥ�����\n"
 "\n"
-"�ɤΥ��ץ����⡢�����ܡ��ɤ����٤ޤ����ѡ��ƥ����������֤ˤϡ�\n"
-"���֤Ⱦ岼�Υ������륭����Ȥ��ޤ��礦���ѡ��ƥ�������������顢\n"
-"���Υ������Ȥ��ޤ���\n"
+"   * ��c�פϥ��������IDE����ȥ������Υޥ����ǥ�����\n"
 "\n"
-"- Ctrl-c  �������ѡ��ƥ���������ʶ��Υѡ��ƥ����������������\n"
+"   * ��d�פϥ��������IDE����ȥ������Υ��졼�֥ǥ�����\n"
 "\n"
-"- Ctrl-d  ���Υѡ��ƥ���������\n"
 "\n"
-"- Ctrl-m  �ޥ���ȥݥ���Ȥ�����\n"
+"SCSI "
+"�ϡ��ɥǥ������ξ�硢��a�פϥץ饤�ޥꡢ��b�פϥ�������ꡢ�Ȥ������Ǥ�"
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:252
 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."
+"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"
-"�ʥե����ޥåȤȤ����Τϥե����륷���ƥ��Ĥ��뤳�ȤǤ��ˡ������\n"
-"��¸�Υѡ��ƥ�������ե����ޥåȤ��ơ������Υǡ�����õ��Ǥ��ޤ���\n"
-"���ա���¸�Υѡ��ƥ������ϡ��ե����ޥåȤ��ʤ���ɬ�פϤ���ޤ���\n"
-"�ä���¸�������ǡ�����/home �� /usr/local�ʤɡˤ�����С��ե����ޥå�\n"
-"���ƤϤ����ޤ���"
+"������ Linux-Mandrake �ѡ��ƥ������Υ��󥹥ȡ����Ѥ˾õ����\n"
+"�ϡ��ɥǥ�����������Ǥ������������Υϡ��ɥǥ�������Υǡ���������\n"
+"�ä��Ʋ����Ǥ��ޤ������դ��Ƥ���������"
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:257
+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:267
+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"
+"\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�פϥ�������ꡢ�Ȥ������Ǥ�\n"
+"\n"
+"�֥�����ɥ���̾�פϡ�������ɥ����ǤΥɥ饤��ʸ���Ǥ��ʺǽ�Υǥ�����\n"
+"��ѡ��ƥ������ϡ�C:�ץɥ饤�֤Ǥ�)��"
+
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr "���Ф餯���Ԥ��򡣤������Ϥ��Ф餯������ޤ��Τǡ�"
+
+#: ../../help.pm_.c:303
+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 ""
+"�������Ĥ��ä��ѡ��ƥ������ϡ����٤ƥե����ޥåȤ��ʤ��ȻȤ��ޤ���\n"
+"�ʥե����ޥåȤȤϥե����륷���ƥ��Ĥ���Ȥ������ȤǤ��ˡ�\n"
+"\n"
+"\n"
+"�����ǡ���¸�Υѡ��ƥ�������ե����ޥåȤ��ơ���ȤΥǡ�����õ�\n"
+"���Ƥ������Ȥ�Ǥ��ޤ������ξ��ˤϡ��ե����ޥåȤ������ѡ��ƥ������\n"
+"������Ǥ����Ƥ���������\n"
+"\n"
+"\n"
+"�̤˴�¸�Υѡ��ƥ�������̵���˥ե����ޥåȤ���ɬ�פϤ���ޤ���\n"
+"�Ǥ⡢OS �����ä��ѡ��ƥ������ϥե����ޥåȤ�ɬ�פǤ��ʤ��Ȥ���\n"
+"��/�ס�/usr�ס�/var�פʤɡˤ����ȤäƤ��������ǡ��������ä�\n"
+"�ѡ��ƥ��������̾�ϡ�/home�סˤϤ��ΤޤޤǤ������礦�֤Ǥ���\n"
+"\n"
+"\n"
+"�ѡ��ƥ���������Ӥˤ����դ��ޤ��礦���ե����ޥåȤ����顢�ǡ�����\n"
+"�����õ��ơ����٤Ȳ����Ǥ��ޤ���\n"
+"\n"
+"\n"
+"�ѡ��ƥ������Υե����ޥåȤ򳫻Ϥ���ˤϡ�OK�פ򥯥�å����ޤ���\n"
+"\n"
+"\n"
+"¾�Υѡ��ƥ�����������Ǥ������Linux-Mandrake OS �������ʤ顢\n"
+"�֥���󥻥�פ򥯥�å����Ƥ���������"
+
+#: ../../help.pm_.c:329
 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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"
+"�����κǸ�ˡָ��̤Υѥå�����������פȤ����Τ�����ޤ��������\n"
 "���֤ȡ�1000�İʾ�Υѥå������򤺤äȸ��Ƥ������Ȥˤʤ�ޤ���..."
 
-#: ../../help.pm_.c:150
-msgid ""
-"If you have all the CDs in the list above, 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 ""
-"�嵭�ΰ�����CD�����٤Ƥ����äƤ���С�Ok�򥯥�å����ޤ��礦��\n"
-"CD����Ĥ�ʤ���С�����󥻥�򥯥�å����Ƥ���������\n"
-"�긵�ˤʤ�CD������С���������򤫤�Ϥ����Ƥ���Ok�򥯥�å����ޤ���"
-
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:341
 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."
-msgstr ""
-"������ѥå������򥤥󥹥ȡ��뤷�Ƥ��ޤ�������ˤϿ�ʬ������ޤ��衣\n"
-"��¸�����ƥ�Υ��åץ��졼�ɤ���������ϡ�������Ĵ�٤뤳�Ȥ�¿����\n"
-"�ǡ���äȤ�����ޤ���"
-
-#: ../../help.pm_.c:161
-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 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"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
 "\n"
+"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
+"\"Toggle flat and group sorted\".\n"
 "\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"\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 ""
-"�⤷ DrakX ���ޥ����򸫤Ĥ����ʤ��ä��ꡢ�������Ф줿�������å�\n"
-"�������ä��ꤹ��Ȥ��ϡ���˥ޥ����ΰ������ФƤ���Ϥ��Ǥ���\n"
+"�����Ǥϥ��󥹥ȡ��뤷�����ѥå���������̤����٤ޤ���\n"
+"\n"
 "\n"
+"�ѥå�����������ɥ��κ����ߤˤ��륪�ץ����򥯥�å�����ȡ��ĥ꡼��\n"
+"�ΤФ�����̤᤿��Ǥ��ޤ���\n"
 "\n"
-"DrakX �Τ�ä�����Ǥ褱��С���¦�Υ�˥塼�򥯥�å����ơ�����\n"
-"���������˰ܤ�ޤ��礦�����꤬�����äƤ����顢��ʬ�Υޥ����ˤ����Ф�\n"
-"�ᤤ����Υޥ������˥塼��������Ǥ���������\n"
 "\n"
+"�ѥå������� abc ����¤��ؤ�������С���abc��ȥ��롼�׽��ڤ��ؤ���\n"
+"��������򥯥�å����Ƥ���������\n"
 "\n"
-"���ꥢ��ޥ�����ȤäƤ���Ȥ��ˤϡ����줬�Ĥʤ��äƤ��륷�ꥢ��ݡ���\n"
-"����ꤷ�Ƥ���������"
+"\n"
+"��¸�ط��ˤĤ��Ƥηٹ𤬤���ʤ���С��ְ�¸�ط���ư�����פ�\n"
+"����å����Ƥ�����������������֤ȡ�����ѥå�������������\n"
+"�����顢����˰�¸����ѥå���������ޤäƲ������ޤ���"
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:358
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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 ""
-"�������ݡ��Ȥ�����Ǥ������������Ȥ��С�MS ������ɥ����Ǥ�COM1�ݡ��Ȥϡ�\n"
-"Linux�Ǥ� ttyS0 �Ȥ���̾���ˤʤ�ޤ���"
+"�嵭�ΰ�����CD�����٤Ƥ����äƤ���С�Ok�򥯥�å����ޤ��礦��\n"
+"CD����Ĥ�ʤ���С�����󥻥�򥯥�å����Ƥ���������\n"
+"�긵�ˤʤ�CD������С���������򤫤�Ϥ����Ƥ���Ok�򥯥�å����ޤ���"
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:363
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"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"
-"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"
+"Please be patient."
+msgstr ""
+"������ Linux-Mandrake os �򥤥󥹥ȡ�����Ǥ������Ф餯���֤�\n"
+"������ޤ��ʥ��󥹥ȡ��뤹�륵�����ȥ���ԥ塼����®�٤ˤ���ޤ��ˡ�\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"
+"���Ф餯���Ԥ���"
+
+#: ../../help.pm_.c:371
+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:376
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
+msgstr ""
+"�������ݡ��Ȥ�����Ǥ������������Ȥ��С�MS ������ɥ����Ǥ�\n"
+"COM1�ݡ��Ȥϡ�GNU/Linux�Ǥ� ttyS0 �Ȥ���̾���ˤʤ�ޤ���"
+
+#: ../../help.pm_.c:380
+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"
-"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"
 "\n"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"\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"
+"�ޥ���򥤥󥿡��ͥåȤ� LAN �ˤĤʤ������ʤ顢�б�����\n"
+"���ץ���������Ǥ������������������ץ������������ˡ����ΥǥХ���\n"
+"���Ÿ��򤤤�ơ�DrakX �˼�ư���Ф����Ƥ���������\n"
 "\n"
-"\"�������� LAN\" �����֤ȡ�DrakX �ϥޥ���Υ������ͥåȥ����ץ���õ��\n"
-"�ޤ���PCI�Υ����ץ��ϼ�ưŪ�˸��Ĥ��ä����ꤵ���Ϥ��Ǥ���\n"
-"�⤷���Ȥ��Υ����ץ���ISA �ʤ顢��ư�Ǥϸ��ФǤ��ޤ��󡣤��ξ�硢\n"
-"���Ȥ������ɽ���ФƤ���Τǡ�������������Ǥ���������\n"
 "\n"
+"���󥿡��ͥåȤ� LAN ����³���ʤ��ʤ顢�֥ͥåȥ����Ȥ�ʤ��פ�\n"
+"���Ӥޤ��礦��\n"
 "\n"
-"SCSI�����ץ��ξ�硢�Ȥꤢ�����ɥ饤�Ф˥����ץ���õ�����Ƥߤޤ��礦��\n"
-"����ʤ顢��ʬ�ǥɥ饤�ФΥ��ץ�������ꤷ�ޤ������ꥪ�ץ����ϡ�\n"
-"��ʬ�Υϡ��ɥ���������°ʸ���Ĵ�٤Ƥ���������\n"
 "\n"
+"�ͥåȥ������򤢤Ȥޤ路�ˤ��뤫�����뤤�Ϥ⤦���ꤷ����äƤ���\n"
+"�ʤ�ִ�λ�פ����Ӥޤ���"
+
+#: ../../help.pm_.c:393
+msgid ""
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"���Υޥ��󤬤��Ǥ˴�¸�Υͥåȥ���ˤĤʤ��äƤ���ʤ顢�ͥåȥ��\n"
-"�����Ԥ�ɬ�פʾ���򶵤�äƤ���Ϥ��Ǥ�(IP ���ɥ쥹���ͥåȥ����\n"
-"���֥ޥ������̾Υͥåȥޥ����ˡ��ۥ���̾)������ʤɤǼ�ʬ�����Υͥå�\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"
-"\"��ǥ�ˤ��������륢�å�\" �����֤ȡ���ǥ�ˤ�륤�󥿡��ͥå���³\n"
-"�����ꤵ��ޤ���DrakX �ϥ�ǥ��õ���ޤ��������줬���Ԥ����顢��ǥ��\n"
-"�Ĥʤ��äƤ��륷�ꥢ��ݡ��Ȥ�ʬ�ǻ��ꤷ�Ƥ���������"
+"���ͤޤǤˡ��ǽ�Υ��ꥢ��ݡ��ȡʥ�����ɥ����Ǥϡ�COM1�סˤϡ�\n"
+"Linux �Ǥϡ�ttyS0�פȸƤФ�ޤ���"
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:400
 msgid ""
-"Enter:\n"
-"\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
-"\n"
+"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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+"��ǥब���դ��ʤ顢�����Ÿ�������ơ�DrakX�˼�ưŪ�˸��Ф����Ƥ���������"
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr "��ǥ���Ÿ�������ơ���������Τ�����Ǥ���������"
+
+#: ../../help.pm_.c:413
+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:420
+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:425
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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"
-"  - IP ���ɥ쥹: �狼��ʤ���С��ͥåȥ�������Ԥ�ISP�ˤ����Ƥ���������\n"
+"  - IP ���ɥ쥹: �狼��ʤ���С��ͥåȥ�������Ԥˤ����Ƥ���������\n"
+"    ���ǡּ�ư IP�� ���ץ��������֤ʤ顢���Ϥ��ʤ��Ǥ�������\n"
 "\n"
+"  - �ͥåȥޥ���: ��255.255.255.0�פˤ��Ƥ����Τ�̵��Ǥ����������ʤ����\n"
+"�ͥåȥ�������Ԥˤ����Ƥ���������\n"
 "\n"
-"  - �ͥåȥޥ���: \"255.255.255.0\" �ˤ��Ƥ����Τ�̵��Ǥ����������ʤ����\n"
-"�ͥåȥ�������Ԥ�ISP�ˤ����Ƥ���������\n"
 "\n"
-"\n"
-"  - ��ư IP: �ͥåȥ���� bootp �� dhcp �ץ��ȥ����ȤäƤ�����\n"
-"���Υ��ץ���������Ǥ�����������������֤ȡ�\"IP ���ɥ쥹\"�����\n"
-"����ɬ�פϤ���ޤ��󡣼������ʤ���С��ͥåȥ�������Ԥ�ISP�ˤ�����\n"
-"����������\n"
+"  - ��ư IP: �ͥåȥ���� BOOTP �� DHCP �ץ��ȥ����ȤäƤ�����\n"
+"���Υ��ץ���������Ǥ�����������������֤ȡ���IP ���ɥ쥹�פ����\n"
+"����ɬ�פϤ���ޤ��󡣼������ʤ���С��ͥåȥ�������Ԥˤ�����\n"
+"����������"
+
+#: ../../help.pm_.c:437
+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:225
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1696,21 +2481,22 @@ msgstr ""
 "�Ǥϥ�����륢�åפ�����򤷤ޤ����������Ϥ��Ƥ������狼��ʤ���С�\n"
 "ISP������������򶵤�äƤ���������"
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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�ˤ����Ƥ���������"
+"�ץ�������Ȥ��ʤ顢���������ꤷ�ޤ��礦���ץ�������Ȥ����ɤ���\n"
+"�狼��ʤ���С��ͥåȥ�������Ԥ�ISP�ˤ����Ƥ���������"
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
 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 ""
@@ -1721,109 +2507,296 @@ msgstr ""
 "�ʤ��������Ȥ�����ȰŹ�ѥå�����������ϡ���ʬ�ΤȤ�����ˡ�����ˤ��ä�\n"
 "��Τˤ��Ƥ���������"
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr "���ơ���ʬ�ε���ˤ��碌�������ॾ��������Ӥޤ��礦��"
+
+#: ../../help.pm_.c:465
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "��ʬ�ν���Ǥ�������Ӥ����Ӥޤ���\n"
 "\n"
 "\n"
-"Linux �ϻ��֤�GMT���Ĥޤ� \"����˥å�ɸ���\" �Ǵ������Ƥ��ơ������\n"
-"����������Ӥˤ��碌���Ѵ����ޤ���"
+"Linux �ϻ��֤�GMT���Ĥޤ�֥���˥å�ɸ����פǴ������Ƥ��ơ������\n"
+"���ʤ�������������Ӥˤ��碌���Ѵ����ޤ���\n"
+"\n"
+"\n"
+"���Υޥ���ǥ�����ɥ�����ȤäƤ���Ȥ��ˤϡ�No�פ�����Ǥ�������"
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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"
+"���̤ˡ�������ɬ�פʥ����ӥ���������Ǥ���������"
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
 msgid ""
-"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"
+"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:490
+msgid ""
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"Linux �ǤϤ�����ʥץ�󥿤��Ȥ��ޤ����������줾�����꤬�������ޤ���\n"
-"���������������ס���ϥǥե���ȤΥץ��̾�Ȥ��ơ�lp�פ�Ȥ��ޤ���\n"
-"�����顢lp�Ȥ���̾���Υץ�󥿤���Ĥ�ɬ�פǤ����Ǥ⡢��ĤΥץ��\n"
-"��ʣ����̾����Ĥ��뤳�Ȥ�Ǥ��ޤ������ΤȤ��ϡ�|�פǶ��ڤ�ޤ���\n"
-"�����顢�ץ�󥿤ˤ狼��䤹��̾����Ĥ�������С��������˽񤤤�\n"
-"�����Ф��ߤޤ������Ȥ���\"My Printer|lp\"�Ȥ������ˡ�\n"
-"̾������� \"lp\" ���ޤޤ��ץ�󥿤��ǥե���Ȥˤʤ�ޤ���\n"
+"�����Ǥ���褦�ˤ������ʤ�С�CUPS �� LPR�Τɤ��餫�ΰ��������ƥ��\n"
+"����Ǥ���������\n"
 "\n"
 "\n"
-"�ץ�󥿤�ľ�ܥ���ԥ塼���ˤĤʤ��äƤ���С�\"��������ץ��\"��\n"
-"���Ӥޤ������ξ�硢�ץ�󥿤ΤĤʤ��äƤ���ݡ��Ȥ���ꤷ�ơ�Ŭ�ڤ�\n"
-"�ե��륿�����Ӥޤ���\n"
+"CUPS �Ͽ����������Ϥǽ���� Unix �Ѱ��������ƥ�Ǥ� (CUPS�Ȥ����Τ�\n"
+"��Common Unix Printing System�פ�ά)��Linux-Mandrake�ǤϤ��줬�ǥե����\n"
+"�Ǥ���\n"
 "\n"
 "\n"
-"�ͥåȥ����Τۤ���Unix�ޥ���ˤĤʤ��ä��ץ�󥿤�Ȥ��ʤ顢\n"
-"\"��⡼�� lpd\" �����Ӥޤ��礦�������Ȥ��ˤϡ��桼��̾��ѥ���ɤ�\n"
-"����ޤ��󤬡����Υ����о�ΰ������塼��̾�����פ�ޤ���\n"
+"LPR �ϸŤ����������ƥ�ǡ��Τ� Linux-Mandrake �ǻȤäƤ��ޤ�����\n"
 "\n"
 "\n"
-"SMB�ץ�󥿤�Ȥ��ʤ�ʤĤޤ�ͥåȥ����Υ�����ɥ���9x/NT�ޥ���\n"
-"�ˤĤʤ��ä��ץ�󥿤�Ȥ��Ȥ�����̣�Ǥ��ˡ����Υޥ����SMB ̾�ʤ���\n"
-"��TCP/IP̾�Ȥ���ʪ�Ǥ��ˤȡ����ˤ�äƤ�IP���ɥ쥹��ɬ�פˤʤ�ޤ���\n"
-"����˥桼��̾��������롼��̾�ȥѥ���ɡ�����ˤϥץ��̾��\n"
-"�ʤ��ȥץ�󥿤˥��������Ǥ��ޤ���NetWare �ץ�󥿤⡢������롼�פ�\n"
-"���פʤ����ǡ��ۤȤ��Ʊ���Ǥ���"
+"�ץ�󥿤���äƤ��ʤ���С��֤ʤ��פ򥯥�å����ޤ��礦��"
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:505
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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�פǤ���"
+
+#: ../../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"
+"\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"
+"     �����ޤ����äƤ��ޤ��礦�����y printer|lp�פȤ�����硣\n"
+"     ̾���ˡ�lp�פΤĤ����ץ�󥿤��ǥե���ȤΥץ�󥿤ˤʤ�ޤ���\n"
+"\n"
+"\n"
+"   * ����: ����Ϥʤ��Ƥ⤤���Ǥ�����ʣ���Υץ�󥿤���äƤ����ꡢ�ۤ���\n"
+"     �ޥ��󤬤��Υץ�󥿤˥�����������Ȥ��������Ǥ���\n"
+"\n"
+"\n"
+"   * ���: �⤷�ץ�󥿤ξ��ˤĤ��ƾ�������줿����С�������\n"
+"     ���Ϥ��ޤ��礦�ʡ��󳬡פȤ������ʵ��ҤǤ��ޤ��ޤ���ˡ�\n"
+
+#: ../../help.pm_.c:542
+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:567
+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�פˤʤ�ޤ���"
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr "������ΰ������鼫ʬ�Υץ�󥿤�����Ǥ���������"
+
+#: ../../help.pm_.c:578
+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"
+"�������Ѥ����ޤ���"
+
+#: ../../help.pm_.c:585
+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 ""
 "�Ǥ�Linux-Mandrake�����ƥ��root�ѥ���ɤ����ꤷ�ޤ��礦��\n"
 "�ѥ���ɤ� 2 �����Ϥ��ơ������ץߥ����ʤ����ɤ������ǧ���ޤ���\n"
@@ -1833,28 +2806,32 @@ msgstr ""
 "��ʪ�Ǥ����Ǥ����顢���Υѥ���ɤ����Ϥ���Ȥ������դ��Ƥ���������\n"
 "root���¤������˻Ȥ��ȡ����Υ����ƥ�䡢�ͥåȥ���ǤĤʤ��ä�¾��\n"
 "�����ƥ�䤽�Υǡ����˽���ʴ�����ڤܤ����Ȥˤʤ꤫�ͤޤ���\n"
+"\n"
+"\n"
 "�ѥ���ɤϡ�����ե��٥åȤ�����򺮤�����Τˤ��ơ�����Ǥ� 8 ʸ��\n"
-"ɬ�פǤ���*���Ф�*���äƤ������ꤷ�ƤϤ����ޤ��󡣤Ǥ�Ĺ��������\n"
-"��䤳���������ꤹ��ѥ���ɤ����Ǥ��衣��ʬ�Ǥϳڤ˻פ�������\n"
-"ɬ�פ�����ޤ���"
+"ɬ�פǤ���*���Ф�*���äƤ������ꤷ�ƤϤ����ޤ���\n"
+"\n"
+"\n"
+"�Ǥ�Ĺ���������䤳���������ꤹ��ѥ���ɤ����Ǥ��衣��ʬ�Ǥ�\n"
+"�ڤ˻פ�������ɬ�פ�����ޤ���"
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
 msgstr ""
-"�⥻�����ƥ������ƥ�ˤ�������С�\"����ɥ��ե������Ȥ�\"��\n"
-"\"MD5 �ѥ���ɤ�Ȥ�\"������Ǥ���������"
+"�⥻�����ƥ������ƥ�ˤ�������С��֥���ɥ��ե������Ȥ��פ�\n"
+"��MD5 �ѥ���ɤ�Ȥ��פ�����Ǥ���������"
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
 msgstr ""
-"�⤷�ͥåȥ���� NIS ��ȤäƤ���ʤ� \"NIS ��Ȥ�\" ������Ǥ���������\n"
+"�⤷�ͥåȥ���� NIS ��ȤäƤ���ʤ��NIS ��Ȥ��פ�����Ǥ���������\n"
 "�狼��ʤ���Хͥåȥ�������Ԥˤ����Ƥ���������"
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1877,11 +2854,11 @@ msgid ""
 "you will have created here, and login as root only for administration\n"
 "and maintenance purposes."
 msgstr ""
-"�ǤϤ����ǡ�\"�̾��\" �桼����������Ȥ�Ĥ���ޤ���\n"
-"�����\"�ø�\" �桼����������Ȥ�root �ȤϤ������ޤ������Υ����ƥ��\n"
+"�ǤϤ����ǡ����̾�Ρץ桼����������Ȥ�Ĥ���ޤ���\n"
+"����ϡ��ø��ץ桼����������Ȥ�root �ȤϤ������ޤ������Υ����ƥ��\n"
 "�Ȥ��ͤ����ˡ����줾���̡��Υ�������Ȥ�Ĥ���褦�ˤ��ޤ����ƥ�����\n"
 "��Ȥ��ȼ��δĶ�����ʥ���ե��å��Ķ����ץ����������ʤɡˤ������\n"
-"���줾�켫����\"�ۡ���ǥ��쥯�ȥ�\" ����äƤ����ˤ��������������¸\n"
+"���줾�켫���Ρ֥ۡ���ǥ��쥯�ȥ�פ���äƤ����ˤ��������������¸\n"
 "���Ƥ����ޤ���\n"
 "\n"
 "\n"
@@ -1894,45 +2871,43 @@ msgstr ""
 "�������äơ��դĤ��Ϥ����ǤĤ���桼����������Ȥǥ����ƥ��Ȥ��ޤ���\n"
 "����root�ǥ������󤹤�Τϡ������ƥ�����ȥ��ƥʥ󥹤ΤȤ������Ǥ���"
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"�����ǤϤǤ���¤�\"�Ϥ�\" �������Ƥ����������夫��MS������ɥ�����\n"
-"���󥹥ȡ��뤷���顢�֡��ȥ������Ͼ�񤭤���ޤ��������ʤä��顢\n"
-"�֡��ȥǥ��������äƤ����ʤ��ȡ�Linux��Ω���夲���ʤ��ʤ�ޤ��衣"
+"��ư�ǥ�����������Ȥ�Ĥ��äƤ����Ƥ����������ޥ����ư�Ǥ��ʤ�\n"
+"�ʤä��顢���줬�ƥ��󥹥ȡ��뤻���˥ǥ�������ߤ�ͣ��μ��ʤǤ���"
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
-"Linux�򤿤�������Τ�ɬ�פʾ���򡢤ɤ��˵������������ꤷ�ޤ���\n"
+"GNU/Linux�򤿤�������Τ�ɬ�פʾ���򡢤ɤ��˵������������ꤷ�ޤ���\n"
 "\n"
 "\n"
-"\"�ɥ饤�֤κǽ�Υ�����(MBR)\"������Ǥ����Τ�̵��Ǥ���¾�������ϡ�\n"
-"�狼��ͤ����ȤäƤ���������"
+"���򤹤�Τ������Τ�ʬ����ʤ���С��֥ɥ饤�֤κǽ�Υ�����(MBR)��\n"
+"������Ǥ���������"
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 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"
+"�դĤ��ϡ�/dev/hda�סʥץ饤�ޥ����ͥ�Υޥ������ɥ饤�֡ˤ���\n"
+"��/dev/sda�� (�ǽ�� SCSI �ǥ�����) �����Ӥޤ���\n"
 "������������ˤ���¾���ͤ�����Ƥ���������"
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1942,7 +2917,7 @@ msgid ""
 "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) �� Grub �ϥ֡��ȥ������Ǥ�������ԥ塼�����Linux\n"
+"LILO (LInux LOader) �� Grub �ϥ֡��ȥ������Ǥ�������ԥ塼�����GNU/Linux\n"
 "�ʤɳƼ�OS��ư�Ǥ��ޤ���\n"
 "���̤ϡ�������OS�ϼ�ưŪ�ˤ�����ȸ��Ф���ƥ��󥹥ȡ��뤵��ޤ���\n"
 "���줬����ʤ顢�����Ǽ�ư�ǥ���ȥ���ɲä��ޤ��礦���ѥ�᡼����\n"
@@ -1953,7 +2928,7 @@ msgstr ""
 "���ˤϤ���OS�Υ���ȥ�������Ƥ����ޤ��礦�����������ξ��ϡ�\n"
 "����OS��Ȥ��Ȥ��ˤϵ�ư�ǥ��������פ�ޤ��衪"
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1970,29 +2945,82 @@ msgid ""
 "\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."
 msgstr ""
 "LILO �� grub �μ��ץ��ץ����ϰʲ��ΤȤ���Ǥ�:\n"
 "  - �֡��ȥǥХ���: �֡��ȥ���������ĥǥХ���̾������ʤ��Ȥ��Хϡ���\n"
-"�ǥ������Υѡ��ƥ������ˡ��������ʤ��¤ꡢ\"/dev/hda\"�����Ӥޤ��礦��\n"
+"�ǥ������Υѡ��ƥ������ˡ��������ʤ��¤ꡢ��/dev/hda�פ����Ӥޤ��礦��\n"
 "\n"
 "\n"
 "  - �ǥե���ȥ��᡼����ư���Ԥ�����: �֡��ȥ��������ǽ�Υ��᡼����ư\n"
 "����ޤǤ��Ԥ����֤�1/10��ñ�̤ǻ��ꤷ�ޤ�������ϡ������ܡ��ɤ�ͭ����\n"
 "�ʤäƤ����˥ϡ��ɥǥ��������鵯ư���륷���ƥ�ʤɤ������Ǥ�������\n"
-"\"�Ԥ�����\"��̵�������ä��ꥼ�����ä��ꤷ���顢�֡��ȥ��������Ԥ��ޤ���\n"
+"���Ԥ����֡פ�̵�������ä��ꥼ�����ä��ꤷ���顢�֡��ȥ��������Ԥ��ޤ���\n"
 "\n"
 "\n"
 "  - �ӥǥ��⡼�ɡ���ư���˻Ȥ� VGA �ƥ����ȥ⡼�ɤ���ꤷ�ޤ����Ȥ���Τ�\n"
 "�ʲ����ͤǤ���\n"
+"\n"
 "    * �Ρ��ޥ�: �̾�� 80x25 �Υƥ����ȥ⡼��\n"
+"\n"
 "    * <����>:  �������б������ƥ����ȥ⡼��"
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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��Ȥ��Ȥ��ˤϵ�ư�ǥ��������פ�ޤ��衪"
+
+#: ../../help.pm_.c:692
+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"
+"���Ԥ����֡פ�̵�������ä��ꥼ�����ä��ꤷ���顢�֡��ȥ��������Ԥ��ޤ���"
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2003,7 +3031,8 @@ msgid ""
 "settings suit you. If they don't, you can come back and\n"
 "change them, as many times as necessary."
 msgstr ""
-"�Ǥ�X������ɥ������ƥ������򤷤ޤ��礦�������Linux GUI (����ե�����\n"
+"�Ǥ�X������ɥ������ƥ������򤷤ޤ��礦�������GNU/Linux GUI "
+"(����ե�����\n"
 "�桼�����󥿡��ե������ˤγ˿���ʬ�Ǥ������Τ���ˤϤޤ����ӥǥ������ɤ�\n"
 "��˥�������򤷤ޤ����������桢�ۤȤ�ɤϼ�ư������Ƥ���Τǡ��̾�ʤ�\n"
 "ñ�ˡ���̤򸫤Ƥ��������ǧ��������Ǥ��ߤޤ���\n"
@@ -2013,7 +3042,7 @@ msgstr ""
 "�¤�ˡ���������꤬�����������ǧ�Ǥ��ޤ����������ʤ���С���äƤ���\n"
 "���ʤ����ޤ�������ϲ��٤Ǥ⹥���ʤ����Ǥ��ޤ���"
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2021,50 +3050,54 @@ msgstr ""
 "X �����꤬����������С����Υ��ץ�����Ȥäơ�X������ɥ������ƥ��\n"
 "���������ꤷľ���Ƥ���������"
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
 msgstr ""
-"����ե����롦�������󤬹����ʤ顢\"�Ϥ�\"�����Ӥޤ��������Ǥʤ����\n"
-"\"������\"�����Ӥޤ���"
+"����ե����롦�������󤬹����ʤ顢�֤Ϥ��פ����Ӥޤ��������Ǥʤ����\n"
+"�֤������פ����Ӥޤ���"
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\n"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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"
+"\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"
+"\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."
 msgstr ""
 "�ǤϤ���¾�Υ��ץ����򤤤��Ĥ����ꤷ�ޤ��礦��\n"
 "\n"
@@ -2074,14 +3107,11 @@ msgstr ""
 "    �ɥ饤�֤Υ֥�å��ꥹ�Ȥϻ��äƤ��ޤ������ˤ��ܤˤ��������ʤ����\n"
 "    ���Фʤ��ۤ���̵��Ǥ���\n"
 "\n"
+"\n"
 "  - �������ƥ���٥������: �����ƥ�Υ������ƥ���٥�����٤ޤ���\n"
 "    �ܤ����ϥޥ˥奢��򻲾Ȥ��Ƥ�������������Ū�ˤϡ��褯�狼��ʤ���\n"
-"    �� \"ɸ��\"������Ǥ����ޤ��礦�������˥��������Υ������ƥ����ۤ�\n"
-"    �����\"���м�\"������Ǥ������������������ա�����������֤ȡ�����\n"
-"    �����root�ϥ�������Ǥ��ʤ��ʤ�ޤ�����root�ˤʤ�Ȥ��ϡ����̥桼��\n"
-"    �ǥ������󤷤Ƥ���\"su\"���ޥ�ɤ�Ȥ����Ȥˤʤ�ޤ�����äȸ����С�\n"
-"    ������������ޥ���򥵡����Ѱʳ��ǻȤ��ΤϤۤ�̵���Ǥ�������Ĥ���\n"
-"    ���������͡�\n"
+"    �Хǥե���ȤΤޤޤǤ����ޤ��礦��\n"
+"\n"
 "\n"
 "  - ɬ�פʤ����Τ�RAM������: ��ǰ�ʤ��餤�ޤΥѥ�����������Ǥϡ�BIOS��\n"
 "    �����ƥ���RAM���̤ˤĤ��ƤޤȤ��ʹ����ˡ������ޤ��󡣤��η�̡�\n"
@@ -2089,15 +3119,22 @@ msgstr ""
 "    �ˤϡ��������̤���ꤷ�ޤ���\n"
 "    ���ա� 2 or 4 MB ���餤�Τ���ϵ��ˤ��ʤ�������פǤ���\n"
 "\n"
+"\n"
 "  - ��ࡼ�Х֥��ǥ����μ�ư�ޥ����: ��ࡼ�Х֥�ɥ饤�֡�CD-ROM��\n"
-"    �ե��åԡ���ZIP�ʤɡˤ� \"mount\" ��\"umount\" ���ޥ�ɤǼ�ư�ޥ����\n"
+"    �ե��åԡ���ZIP�ʤɡˤ��mount�פ��umount�ץ��ޥ�ɤǼ�ư�ޥ����\n"
 "    ����Τ����ݤʤ顢���Υ��ץ��������Ӥޤ���\n"
 "\n"
+"\n"
+"* ��ư�Τ��Ӥˡ�/tmp�פ����: �⤷�����ƥ��ư���뤿�Ӥˡ�/tmp�פ�\n"
+"�ե������ǥ��쥯�ȥ��õ��ˤϡ����Υ��ץ���������Ǥ���������\n"
+"\n"
+"\n"
 "  - ��ư����Num Lock�򥪥�ˤ���: ��ư����Number Lock�򥪥�ˤ��������\n"
-"    ���Υ��ץ��������Ӥޤ������ա�X������ɥ��Ǥ�Num Lock�ϻȤ��ʤ���\n"
+"    ���Υ��ץ��������Ӥޤ������ա���åץȥåפǤϡ����Υ��ץ�����\n"
+"    ����ˤ��ƤϤ����ޤ��󡣤ޤ���X������ɥ��Ǥ�Num Lock�ϻȤ��ʤ���\n"
 "    �Ȥ�����ޤ��ˡ�"
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2110,96 +3147,117 @@ msgstr ""
 "�Ƶ�ư�����顢������ Linux Mandrake �����ƥब��ưŪ�ˤ���������ޤ���\n"
 "�̤�OS�򤿤����������Ȥ��ˤϡ��ɲä��������ɤ�Ǥ���������"
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "���������"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Ƴ�����饹������"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "�ǥ������θ���"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "�ޥ���������"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "�����ܡ��ɤ�����"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "����¾������"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "�ե����륷���ƥ�"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "�ե����ޥå�"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "�ѥå�����������"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "�����ƥ��Ƴ��"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "�ͥåȥ������"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "�Ź沽"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "�����ॾ��������"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "�����ӥ�������"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "�ץ�󥿤�����"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "�롼�ȥѥ����"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "�桼������Ͽ"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "��ư�ǥ���������"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "�֡��ȥ���������"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "X ������"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Ƴ������ե��å�"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Ƴ����Ȥ�λ"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "�ե����� $f �ɤ߹��ߥ��顼"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "�ޥ�����ƥ��Ȥ��ƤߤƤ���������"
+
+#: ../../install_gtk.pm_.c:427
+msgid "To activate the mouse,"
+msgstr "�ޥ�����ͭ���ˤ���ˤϡ�"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr "�ۥ������ư�����Ƥ���������"
+
+#: ../../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 ""
+"���ʤ��Υޥ����Υϡ��ɤ���ˤϡ���������Ρץɥ饤�Ф�ɬ�פʤ�Τ�\n"
+"����ޤ����ʲ��ξ���򸫤Ƥ�������: %s"
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2209,234 +3267,251 @@ msgstr ""
 "�������ѡ��ƥ�������Ĥ��뤫����¸�Τ�Τ򥯥�å��������Ӥޤ���\n"
 "������ ``�ޥ���ȥݥ����'' �������������ӡ� `/'�˥��åȤ��ޤ�"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"�ѡ��ƥ������ơ��֥뤬�ɤ�ޤ��󡤲���Ƥ���褦�Ǥ�:(\n"
-"�����ʥѡ��ƥ��������������褦�Ȥ��ޤ�"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "����åץѡ��ƥ������ɬ�פǤ�"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake �ϥѡ��ƥ������ơ��֥���������ɤ�ޤ���Ǥ�����\n"
-"����������ϲ��������Ƥ⤷��ޤ���衪"
+"����åץѡ��ƥ�����󤬤���ޤ���\n"
+"\n"
+"���鷺��³���ޤ�����"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "�롼�ȥѡ��ƥ������򸡺�"
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "�ե꡼���ڡ����λ���"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "����ե��᡼�����"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "�������ѡ��ƥ������˳�����Ƥ뽽ʬ�ʥե꡼���ڡ���������ޤ���"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: ����ϥ롼�ȥѡ��ƥ������ǤϤ���ޤ��󡤤ۤ�������ǲ�������"
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "��¸�Υѡ��ƥ����������"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "�롼�ȥѡ��ƥ�����󤬸��Ĥ���ޤ���"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "¸�ߤ��ʤ��ѡ��ƥ������"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "NIS �ɥᥤ�󤬤ʤ��Τǥ֥����ɥ��㥹�Ȥ��Ȥ��ޤ���"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Windows �ѡ��ƥ�������롼�ץХå��˻���"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "�ե����� $f �ɤ߹��ߥ��顼"
+#: ../../install_interactive.pm_.c:90
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "�ɤΥѡ��ƥ�������Linux4Win������ޤ���"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"���顼ȯ�������ޤ�����������ˡ���Τ�ޤ���\n"
-"��ʬ����Ǥ��³���Ʋ�������"
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "������������"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "�ޥ���ȥݥ���� %s ���ŤʤäƤ��ޤ�"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "�롼�ȥѡ��ƥ������Υ����� (MB)"
 
-#: ../../install_steps.pm_.c:323
-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 ""
-"�������ʥѥå������������Ĥ�������ȥ��󥹥ȡ��뤵��ޤ���Ǥ�����\n"
-"CD-ROM����CD-ROM�Υɥ饤�֤����������褦�Ǥ���\n"
-"���󥹥ȡ���ѤߤΥ���ԥ塼���ǡ��ʲ��Υ��ޥ�ɤ�CD-ROM������å�\n"
-"���ƤߤƤ���������\n"
-"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "����åץѡ��ƥ������Υ����� (MB): "
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "%s �ؤ褦����"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "������ɥ����ѡ��ƥ�������Υե꡼���ڡ��������"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "ͭ���ʥե��åԡ��ɥ饤�֤�����ޤ���"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "�ɤΥѡ��ƥ�������ꥵ�������ޤ�����"
+
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "������ɥ����ե����륷���ƥ�ζ�����׻�"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "���ƥå� `%s' ��Ϥ�ޤ�\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"FAT �ꥵ�������ϥѡ��ƥ���������Ǥ��ޤ���\n"
+"�ʲ��Υ��顼��ȯ��: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "����åץѡ��ƥ������ɬ�פǤ�"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr "������ɥ����ѡ��ƥ���������Ҳ��������Ǥ���``�ǥե饰''���Ƥ�������"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"����åץѡ��ƥ�����󤬤���ޤ���\n"
+"���ա�\n"
 "\n"
-"���鷺��³���ޤ�����"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "���󥹥ȡ��뤹�륵����������ǲ�����"
+"DrakX �Ϥ��줫�饦����ɥ����Υѡ��ƥ�����󥵥������ѹ����ޤ���\n"
+"����:�������ϴ����Ǥ����ޤ��ꥵ�������Ƥ��ʤ��Τʤ顢�����ɥ��󥹥ȡ����\n"
+"���Ǥ���scandisk�򤫤��ޤ��礦�ʤ����defrag�⤫�����ۤ��������Ǥ�)��\n"
+"�ǡ�����Хå����åפ��Ƥ���ޤ����������ޤΤ����ˤ���\n"
+"�����Ƥ���������\n"
+"����פʤ� Ok �򲡤��Ʋ�������"
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "��ץ�����: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "������ɥ����ѤˤɤΤ��餤�Υ�������Ĥ��Ƥ����ޤ���"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "�С������: %s\n"
+msgid "partition %s"
+msgstr "�ѡ��ƥ������ %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "������: %d KB\n"
+msgid "FAT resizing failed: %s"
+msgstr "FAT �Υꥵ�����˼���: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "���󥹥ȡ��뤷�����ѥå�����������ǲ�����"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+"�ꥵ������롼�ץХå��Ѥ�FAT�ѡ��ƥ�����󤬤���ޤ��� "
+"(�ޤ��Ͻ�ʬ�ʥ��ڡ�����̵��)"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "����"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "���ǥ������õ�"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "���󥹥ȡ���"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Windows(TM) ����"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "���󥹥ȡ�����"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr ""
+"ʣ���Υϡ��ɥɥ饤�֤���äƤ��ޤ��͡��ɤ�� linux �򥤥󥹥ȡ��뤷�ޤ�����"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "���Ф餯���Ԥ���������"
+#: ../../install_interactive.pm_.c:156
+#, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "�ɥ饤�� %s ��Υѡ��ƥ�����󤪤�ӥǡ��������������ޤ�"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "�Ĥ���� "
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "�������ѡ��ȥ⡼��"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "��׻��� "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "diskdrake��Ȥ�"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "���󥹥ȡ���ν���"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "fdisk��Ȥ�"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "�ѥå����� %s �Υ��󥹥ȡ���"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"%s ��ѡ��ƥ������Ǥ��ޤ���\n"
+"����ä��顢ɬ�� `w' ��Ȥä���¸���ޤ��礦��"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "��˿ʤߤޤ�����"
+#: ../../install_interactive.pm_.c:195
+msgid "You don't have enough free space on your Windows partition"
+msgstr "������ɥ����ѡ��ƥ�������Υե꡼���ڡ�������ޤ���"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "�ѥå�����������ǥ��顼��ȯ��:"
+#: ../../install_interactive.pm_.c:210
+msgid "I can't find any room for installing"
+msgstr "���󥹥ȡ����Ѥζ��������Ĥ���ޤ���"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "���Ǥˤ��� X11 �������Ȥ��ޤ�����"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "DrakX �ѡ��ƥ�����󥦥������ɤϰʲ��β�ˡ���դ��ޤ���:"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "�ʲ��Υ��󥹥ȡ��륯�饹��ɤ줫����Ǥ�������"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "�ѡ��ƥ�����˥󥰤˼���: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "������ɥ����Υѡ��ƥ�����󤬤���ޤ���"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "�ͥåȥ���򤿤�������"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Linux4Win����������ζ���������ޤ���"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "�ͥåȥ������ߤ���"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"���ա�\n"
-"\n"
-"DrakX �Ϥ��줫�饦����ɥ����Υѡ��ƥ�����󥵥������ѹ����ޤ�������:\n"
-"�������ϴ����Ǥ���������scandisk�򤫤��ޤ��礦�ʤ����defrag�⤫����\n"
-"�ۤ��������Ǥ�)���ǡ�����Хå����åפ��Ƥ���ޤ����������ޤΤ����ˤ���\n"
-"�����Ƥ���������\n"
-"����פʤ� Ok �򲡤��Ʋ�������"
+"���顼ȯ�������ޤ�����������ˡ���Τ�ޤ���\n"
+"��ʬ����Ǥ��³���Ʋ�������"
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "��ư�ꥵ�����˼���"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "�ޥ���ȥݥ���� %s ���ŤʤäƤ��ޤ�"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "�ɤΥѡ��ƥ�������Linux4Win������ޤ���"
+#: ../../install_steps.pm_.c:375
+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 ""
+"�������ʥѥå������������Ĥ�������ȥ��󥹥ȡ��뤵��ޤ���Ǥ�����\n"
+"CD-ROM����CD-ROM�Υɥ饤�֤����������褦�Ǥ���\n"
+"���󥹥ȡ���ѤߤΥ���ԥ塼���ǡ��ʲ��Υ��ޥ�ɤ�CD-ROM������å�\n"
+"���ƤߤƤ���������\n"
+"�� rpm -qpl Mandrake/RPMS/*.rpm ��\n"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "������������"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "%s �ؤ褦����"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "�롼�ȥѡ��ƥ������Υ����� (MB)"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "ͭ���ʥե��åԡ��ɥ饤�֤�����ޤ���"
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "����åץѡ��ƥ������Υ����� (MB): "
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "���ƥå� `%s' ��Ϥ�ޤ�\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"�����ƥ�꥽��������ޤ��� Linux-Mandrake �򥤥󥹥ȡ��뤹��ˤ�\n"
+"�����Ĥ����꤬����ޤ���\n"
+"���ξɾ����������Ȥ��������˥ƥ����ȥ��󥹥ȡ�����ޤ���\n"
+"����򤹤�ˤϡ�CDROM ����֡��Ȥ����Ȥ���`F1'�򲡤���`text'�����Ϥ���\n"
+"����������"
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "�ʲ��Υ��󥹥ȡ��륯�饹��ɤ줫����Ǥ�������"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2450,7 +3525,7 @@ msgstr ""
 "����򲼤���ȡ������Ф���פʤ�Τ��������󥹥ȡ��뤵��ޤ���\n"
 "100%% ����ꤹ��ȡ�������ѥå������򤹤٤ƥ��󥹥ȡ��뤷�ޤ���"
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2465,58 +3540,98 @@ msgstr ""
 "����򲼤���ȡ������Ф���פʤ�Τ��������󥹥ȡ��뤵��ޤ���\n"
 "%d%% ����ꤹ��ȡ�����¤Υѥå������򥤥󥹥ȡ��뤷�ޤ���"
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "���Υ��ƥåפǤϤ�äȺ٤������򤬽���ޤ�"
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "���󥹥ȡ��뤹��ѥå�������γ��"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "���󥹥ȡ��뤷�����ѥå�����������ǲ�����"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "����"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "���󥹥ȡ���"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "��¸�ط��μ�ư���"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "�ĥ꡼��ΤФ�"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "�ĥ꡼��̤��"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "���Τޤޤȥ��롼���̤��ڤ��ؤ�"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "�ѥå�����������Ƥ��ޤ�"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "̾��: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "�С������: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "������: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "����: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "��ץ�����: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr "���Υѥå�����������Ǥ��ޤ��󡣥ǥ������ζ������̤����Ǥ���"
+
+#: ../../install_steps_gtk.pm_.c:386
+msgid "The following packages are going to be installed"
+msgstr "�ʲ��Υѥå����������󥹥ȡ��뤵��ޤ�"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "�ʲ��Υѥå���������������ޤ�"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "���Υѥå�����������������Ǥ��ޤ���"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "������Բķ�ʥѥå������Ǥ���������ˤϤǤ��ޤ���"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "���Υѥå�������������ˤǤ��ޤ��󡣤��Ǥ˥��󥹥ȡ���ѤߤǤ�"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2524,44 +3639,88 @@ msgstr ""
 "���Υѥå������ϥ��åץ��졼�ɤ�ɬ�פǤ���\n"
 "���������������Ƥ�����Ǥ�����"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "���Υѥå��������������Ǥ��ޤ��󡣥��åץ��졼�ɤ�ɬ�פǤ�"
 
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr "���Υѥå�����������Ǥ��ޤ��󡣥ǥ������ζ������̤����Ǥ���"
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "�ʲ��Υѥå����������󥹥ȡ���/��������ޤ�"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "���Υѥå�����������������Ǥ��ޤ���"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "���󥹥ȡ�����"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "����Ƥ��ޤ�"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "���Ф餯���Ԥ���������"
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "�Ĥ���� "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "��׻��� "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "���󥹥ȡ���ν���"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d �ѥå�����"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "�ѥå����� %s �Υ��󥹥ȡ���"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "ǧ���"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2571,184 +3730,504 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "Cd-Rom ��򴹤��Ƥ���������\n"
-"\"%s\" �Ȥ��� Cd-Rom ��ɥ饤�֤ˤ���ơ� Ok �򲡤��Ƥ���������\n"
+"�� %s �פȤ��� Cd-Rom ��ɥ饤�֤ˤ���ơ� Ok �򲡤��Ƥ���������\n"
 "CD���ʤ���С�Cancel �򲡤��Ƥ��� Cd-Rom ����Υ��󥹥ȡ������򤷤Ʋ�������"
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "����"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "��˿ʤߤޤ�����"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "�ѥå�����������ǥ��顼��ȯ��:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "�ѥå������Υ��󥹥ȡ���ǥ��顼��ȯ��:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "���顼ȯ��"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "�ɤθ����Ȥ�������Ǥ��������͡�"
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr "���եȻ��ѥ饤���󥹾��"
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" 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:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "�����ܡ���"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "�����ܡ��ɥ쥤�����Ȥϲ��Ǥ�����"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr "���󥹥ȡ������Ѳ�ǽ�ˤʤ�ۤ��θ��������Ǥ��ޤ�"
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "�롼�ȥѡ��ƥ������"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "�����"
 
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "�����ƥ�Υ롼�ȥѡ��ƥ������(/) �Ϥʤ�Ǥ�����"
-
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "���󥹥ȡ��륯�饹"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "�ɤΥ��󥹥ȡ��륯�饹��˾�ߤޤ�����"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
-msgstr "���󥹥ȡ���/���åץ��졼��"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Install/Update"
+msgstr "���󥹥ȡ���/����"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr "���󥹥ȡ���Ǥ��������åץ��졼�ɤǤ�����"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Is this an install or an update?"
+msgstr "���󥹥ȡ���Ǥ����������Ǥ�����"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "����ư"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "�侩"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "�������ޥ���"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "�������ѡ���"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "���ʤ��������˥ۥ�ȤΥ������ѡ��ȤǤ��礦�ͤ���\n"
-"��������֤ȡ����Ϥʤ����ˤ��餯�����ʤޤͤ��Ǥ����㤤�ޤ��衣"
+"��������֤ȡ����Ϥʤ����ˤ��餯�����ʤޤͤ��Ǥ����㤤�ޤ��衣\n"
+"``�ѥ���ɤ򥷥�ɥ��ˤ��ޤ���?''�Ȥ��ä������֤���ޤ������Τ褦�ʼ����"
+"�ۥ�Ȥ����������Ǥ�����"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
-msgstr "���åץ��졼��"
+#: ../../install_steps_interactive.pm_.c:216
+msgid "Update"
+msgstr "����"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "�Ρ��ޥ�"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "������ơ������"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "��ȯ��"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
 msgstr "�����ƥ�λȤ���������Ǥ���������"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "�ޥ����η��Ϥʤ�Ǥ�����"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "�ޥ����ݡ���"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "�ޥ����ϤɤΥ��ꥢ��ݡ��ȤˤĤʤ��äƤ��ޤ�����"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "PCMCIA�����ɤ�������..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "IDE ������"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "�Ȥ���ѡ��ƥ�����󤬤���ޤ���"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "�ɤΥѡ��ƥ�������롼�ȥѡ��ƥ������ˤ��ޤ���"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr "�ѡ��ƥ������򥹥���󤷤ƥޥ���ȥݥ���Ȥ�õ���Ƥ��ޤ�"
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "�ޥ���ȥݥ���Ȥ�����"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"�ѡ��ƥ������ơ��֥뤬�ɤ�ޤ��󡤲���Ƥ���褦�Ǥ�:(\n"
+"�����ʥѡ��ƥ�������ä��Ƥߤޤ��礦�����ʤ�����ȥǡ����������ä��ޤ�����"
+"\n"
+"���뤤�ϡ�DrakX�˥ѡ��ƥ������ơ��֥���ѹ������ʤ��꤬����ޤ���\n"
+"(���顼��%s�Ǥ�)\n"
+"\n"
+"���ѡ��ƥ�������õ�Ƥ�������Ǥ��͡�\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake �ϥѡ��ƥ������ơ��֥���������ɤ�ޤ���Ǥ�����\n"
+"����������ϲ��������Ƥ⤷��ޤ���衪"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "�롼�ȥѡ��ƥ������"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "�����ƥ�Υ롼�ȥѡ��ƥ������(/) �Ϥʤ�Ǥ�����"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "�ѡ��ƥ������ơ��֥���ѹ���ȿ�Ǥ���ˤϥ�֡��Ȥ��Ƥ�������"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "�ե����ޥåȤ���ѡ��ƥ�����������Ǥ�������"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "���ɥ֥��å��򸡺����ޤ�����"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "�ѡ��ƥ�������ե����ޥå�"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "�ե����� %s �κ����ȥե����ޥå�"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "���󥹥ȡ���˽�ʬ�ʥ���åפ�����ޤ��󡤥���åפ�ä��Ʋ�����"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "������Υѥå������򤵤����Ƥ��ޤ�"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "���åץ��졼�ɤ���ѥå������򤵤����Ƥ��ޤ�"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr "���󥹥ȡ���䥢�åץ��졼�ɤ�ɬ�פʥǥ������ζ������̤����Ǥ���"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
+msgstr ""
+"���󥹥ȡ���䥢�åץ��졼�ɤ�ɬ�פʥǥ������ζ������̤����Ǥ��� (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "���� (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "�Ǿ� (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "�侩 (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "��������"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "���󥹥ȡ��뤹�륵����������ǲ�����"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "�ѥå��������롼�פ�����"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "���̥ѥå�����������"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2758,12 +4237,12 @@ msgstr ""
 "CD����Ĥ�ʤ���С�����󥻥�򥯥�å����Ƥ���������\n"
 "�긵�ˤʤ�CD������С���������򤫤�Ϥ����Ƥ���Ok�򥯥�å����ޤ���"
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr "\"%s\"�Ȥ���Cd-Rom"
+msgstr "�� %s �פȤ���Cd-Rom"
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2771,172 +4250,11 @@ msgstr ""
 "�ѥå����� %s �򥤥󥹥ȡ���\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "���󥹥ȡ�����������"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "���ߤ� IP ��������ݻ�"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "�ͥåȥ��������ꤹ��"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "�ͥåȥ�������ꤷ�ʤ�"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "�ͥåȥ��������"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "��������ͥåȥ��������ѤߤǤ����ʲ��򤷤����Ǥ�����"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "�����ƥ�Υ������� LAN �ͥåȥ�������ꤷ�ޤ�����"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "�ͥåȥ�������ɤ����դ���ޤ���"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "��ǥ������"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "�����ƥ�Υ�ǥ�ˤ��������륢�åץͥåȥ�������ꤷ�ޤ�����"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "�ͥåȥ���ǥХ��� %s ������"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"���Υޥ���� IP ���ɥ쥹�����Ϥ��Ʋ�������\n"
-"�ơ��ι��ܤˤϥɥåȤǶ��ڤ�줿���ʿ�(�㡤1.2.3.4)��IP "
-"���ɥ쥹�Ȥ������Ϥ���ޤ���"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "IP �μ�ư����"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP ���ɥ쥹:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "�ͥåȥޥ���:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP ���ɥ쥹�� 1.2.3.4 �Τ褦�����Ϥ��Ʋ�����"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "�ͥåȥ��������"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"�ۥ���̾�����Ϥ��Ʋ�������\n"
-"�ۥ���̾�� ``mybox.mylab.myco.com'' �Τ褦�ˤ��Ʋ�������\n"
-"�⤷�����ȥ�����������С����� IP ���ɥ쥹�����Ϥ��Ʋ�������"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS ������:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "�����ȥ������ǥХ���:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "�����ȥ�����:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "�ۥ���̾:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "��ǥ�򸡺����ޤ�����"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "��ǥ�ϤɤΥ��ꥢ��ݡ��ȤˤĤʤ��äƤ��ޤ�����"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "�������륢�åץ��ץ����"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "��³̾"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "�����ֹ�"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "�������� ID"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "ǧ��"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "������ץȤ�Ȥ�ǧ��"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "�����ߥʥ뤫���ǧ��"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "�ɥᥤ��̾"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "�ե������� DNS ������"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "������� DNS ������"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3000,88 +4318,92 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "�ɤΥ����Ȥ���ѥå���������äƤ��뤫������"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "�����Ȥ���³���ƥѥå�����������������Ƥ��ޤ�"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "���󥹥ȡ��뤷�����ѥå�����������ǲ�����"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
 msgstr "���ʤ��λ����ӤϤɤ�Ǥ�����"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "�ϡ��ɥ����������å��� GMT �˥��åȤ��Ƥ���ޤ�����"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "�ɤΰ��������ƥ��Ȥ��ޤ�����"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "�ѥ���ɤʤ�"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "����ɥ��ե������Ȥ�"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "����ɥ�"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "MD5 �ѥ���ɤ�Ȥ�"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "NIS ��Ȥ�"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "���������ڡ���"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "���Υѥ���ɤϴ�ñ�����ޤ��ʺ���Ǥ� %d ʸ���ȤäƤ���������"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "ǧ��NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS �ɥᥤ��"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS ������"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "�����դ���桼��"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "�桼�����ɲ�"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(���Ǥ� %s �ϲä�äƤ��ޤ�)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3091,60 +4413,87 @@ msgstr ""
 "�桼��̾�����Ϥ��Ʋ�����\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "�ºݤλ�̾"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "�桼��̾"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "��������"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "�ѥ���ɤ���ñ�����ޤ�"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "�桼��̾��Ϳ���Ʋ�����"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "�桼��̾�ˤϱѾ�ʸ����������`-' `_' �����Ȥ��ޤ���"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "���Υ桼��̾�Ϥ��Ǥ˲ä�äƤ��ޤ�"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"��������֡��ȥǥ�����������ȡ��̾�Υ֡��ȥ�������Ȥ鷺�� Linux ��\n"
+"��ư�Ǥ��ޤ���SILO �򥤥󥹥ȡ��뤷�����ʤ����䡢¾�� OS ��\n"
+" SILO ���������硢�ޤ��ϥϡ��ɥ���������Τ��� SILO �����ޤ���ư\n"
+"���ʤ����˻��ѤǤ��ޤ���\n"
+"��������֡��ȥǥ������ϡ�Mandrake �Υ����ƥ������ѤΥ쥹���塼���᡼��\n"
+"�Ȥ��Ƥ���ѤǤ��ޤ������줬����Х����ƥब�����ˤ������ä��Ȥ���\n"
+"���줹��Τ��ڤˤʤ�ޤ���\n"
+"�֡��ȥǥ���������ʤ�С��ե��åԥ��ǥ�������ɥ饤�֤���������\n"
+"��OK�פ򲡤��Ƥ���������"
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "�ǽ�Υե��åԡ��ɥ饤��"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "�����ܤΥե��åԡ��ɥ饤��"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "�����å�"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3165,64 +4514,32 @@ msgstr ""
 "�Ȥ��Ƥ���ѤǤ��ޤ������줬����Х����ƥब�����ˤ������ä��Ȥ���\n"
 "���줹��Τ��ڤˤʤ�ޤ����֡��ȥǥ���������ޤ�����"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "ͭ���ʥե��åԡ��ɥ饤�֤�����ޤ��󡤤����ʤ���"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "�֡��ȥǥ��������ꤿ���ե��åԥ��ɥ饤�֤�����"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "�ե��åԡ���ɥ饤�� %s ������"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "�֡��ȥǥ������κ���"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "LILO �Υ��󥹥ȡ���˼��Ԥ��ޤ������ʲ��Υ��顼��ȯ��:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "SILO ��Ȥ��ޤ�����"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "SILO �ᥤ�󥪥ץ����"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"SILO �ˤϰʲ��Υ���ȥ꤬����ޤ���\n"
-"�ۤ��Υ���ȥ��ä��뤫�ѹ����뤳�Ȥ��Ǥ��ޤ���"
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "�ѡ��ƥ������"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "���Υ�٥�Ϥ��Ǥ˻Ȥ��Ƥ��ޤ�"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "SILO �Υ��󥹥ȡ���˼��Ԥ��ޤ������ʲ��Υ��顼��ȯ��:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "�֡��ȥ������ν���"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "aboot ��Ȥ��ޤ�����"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3230,129 +4547,124 @@ msgstr ""
 "aboot ���󥹥ȡ�����˥��顼ȯ����\n"
 "̵���˥��󥹥ȡ��뤷�Ƥߤޤ��������������ǽ�Υѡ��ƥ�������˲�����ޤ���"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Proxy ������"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy �� http://... �Ǥ�"
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy �� ftp://... �Ǥ�"
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "�֡��ȥ������Υ��󥹥ȡ���˼��Ԥ��ޤ������ʲ��Υ��顼��ȯ��:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Crackers�ؤ褦����"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "�������㤤"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "�㤤"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "�ۤɤۤ�"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "�⤤"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "���м��ʤۤɹ���"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "����¾�μ���"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "�ʥǡ���������뤪���줬����ޤ���"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "�ϡ��ɥǥ��������Ŭ�����ޤ�����"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "�������ƥ��ο�������Ǥ�������"
 
 # added a \n to the translation to avoid that the dialog window
 # in which it appears to be tooooo laaaaarge
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 "ɬ�פʤ����Τ�RAM������������Ƥ�������\n"
 "��%d MB�����Ĥ���ޤ�����"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "��ࡼ�Х֥��ǥ�����ư�ޥ������"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "�ƥ֡��Ȼ��� /tmp �ʲ���ä�"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "�ޥ���ץ��ե������ͭ����"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "��ư����num lock�򥪥�ˤ���"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Ram��������MB������"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "�����ѡ��ޥ���ȤϹ⤤�������ƥ���٥�ǤϻȤ��ޤ���"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX �ϡ�XFree 3.3��XFree 4.0ξ��������ե������Ĥ���ޤ����Ǥ�\n"
-"�ǥե���ȤǤ�3.3�����ФΤۤ���Ȥ��ޤ����б��ӥǥ������ɤ�¿������Ǥ���\n"
-"\n"
-"XFree 4.0 ���Ƥߤޤ���?"
+"����: ���Υ������ƥ���٥�Ǥϡ����󥽡���ǤΥ롼�ȥ��������\n"
+"���Ĥ���ޤ���\n"
+"root �ˤʤꤿ���Ȥ��ϡ��桼���ǥ������󤷤ơ�su�פ�Ȥ�ɬ�פ�����ޤ���\n"
+"����Ū�ˤϡ������Ф�����������ޥ����Ȥ���ȴ��Ԥ����ʤ�����Ǥ���\n"
+"�ٹ𤷤ޤ����衣"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "PCI�ǥХ����򤵤����Ƥߤޤ�����"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"���ա�numlock ��ͭ���ˤ���ȡ������Ĥ��Υ������ȥ����������̤�ʸ��\n"
+"�Τ����˿������֤��ޤ�(�㡧`p'���ǤĤ�`6'���֤��ޤ�)"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "���Ǥˤ��� X11 �������Ȥ��ޤ�����"
+
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr "linux��ʣ���Ѥˡ���ư���󥹥ȡ���ǥ�������Ĥ���ޤ�����"
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "���Υե��åԡ���ɥ饤�� %s ���������Ʋ�����"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "���󥹥ȡ���ե��åԡ��μ�ư����"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3362,7 +4674,7 @@ msgstr ""
 "\n"
 "�����˽�λ���ޤ�����"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3380,155 +4692,20 @@ msgstr ""
 "���ΥС������� Linux-Mandrake �ΥХ���������ϡ�\n"
 "http://www.linux-mandrake/ ��Ĵ�٤��ޤ���\n"
 "\n"
-"���󥹥ȡ���������ˤĤ��Ƥξ���ϥ桼�������ɤΡ֥��󥹥ȡ��뤷����פ�\n"
-"�Ϥ��Ʋ�������"
-
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "����åȥ�������"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "%s ������ %s �Υɥ饤�Х��󥹥ȡ�����"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(�⥸�塼�� %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "�ɤ� %s �ɥ饤�Ф��ޤ��礦����"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"%s �ɥ饤�Фϡ�������ư���Τ����̤ʾ����פ��礬����ޤ���������\n"
-"�դĤ��ϡ��ʤˤ�ʤ��������ư����礬�ۤȤ�ɤǤ������̤ʥ��ץ�����\n"
-"���ꤷ�ޤ�����������Ȥ�ɥ饤�Ф˥ޥ����ץ����֤�����ɬ�׾�������\n"
-"�����Ƥߤޤ��������ץ�������˥���ԥ塼������ߤ��뤫���Τ�ޤ��󤬡�\n"
-"�ޥ��󤬤���줿�ꤹ�뤳�ȤϤ���ޤ���"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "�����ȥץ�����"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "���ץ�������"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "�⥸�塼�� %s �Υ��ץ�������ꤷ�Ƥ���������"
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"�⥸�塼�� %s �ؤΥ��ץ����λ��ꡣ\n"
-"���ץ����Υե����ޥåȤ� ``̾��=�� ̾��2=��2 ...'' �Ǥ���\n"
-"��: ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "�⥸�塼��Υ��ץ����"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"�⥸�塼�� %s �Υ����ɤ��Ǥ��ޤ���Ǥ�����\n"
-"�ѥ�᡼�����Ѥ��Ƥ��ʤ����Ƥߤޤ�����"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "PCMCIA�����ɤ򤵤����Ƥߤޤ��礦����"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "PCMCIA�����ɤ�������..."
+"���󥹥ȡ���������ˤĤ��Ƥϥ桼�������ɤΡ֥��󥹥ȡ��뤷����פ�\n"
+"�Ϥ򻲾Ȥ��Ʋ�������"
 
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "%s�ǥХ����򤵤����Ƥߤޤ�����"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "%s %s ���󥿡��ե����������Ĥ���ޤ���"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "�̤Τ�ΤϤ���ޤ�����"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "%s ���󥿡��ե������Ϥ���ޤ�����"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "������"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "�Ϥ�"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "�ϡ��ɥ������ξ���򸫤Ʋ�����"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "�ͥåȥ���򤿤�������"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "�ͥåȥ������ߤ���"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake ���󥹥ȡ��� %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
-msgstr "  <Tab>/<Alt-Tab> ���Ǵ֤ΰ�ư  | <Space> ���� | <F12> ���Υ����꡼�� "
+msgstr "  <Tab>/<Alt-Tab> ���Ǵ֤ΰ�ư  | <Space> ���� | <F12> ���β��� "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"��������� %s �ϡ��ɥɥ饤�֤�ѡ��ƥ������Ǥ��ޤ���\n"
-"����ä��顢ɬ�� `w' ��Ȥä���¸���ޤ��礦��"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "���Ԥ�������"
 
@@ -3538,7 +4715,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "���� (%s)����ä����Τ�\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "���������򡤤⤦���ٻ�Ʋ�����\n"
 
@@ -3552,447 +4729,940 @@ msgstr "? (�ǥե���Ȥ� %s) "
 msgid "Your choice? (default %s) "
 msgstr "�ɤ�ˤ��ޤ������ʥǥե���Ȥ� %s��"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "�ɤ�ˤ��ޤ������ʥǥե���Ȥ� %s�����Фʤ��ʤ�֤ʤ��ס�"
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "�ɥ���"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "���ڥ���"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "�ե������"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "�ե��"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "�Υ륦����"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "�ݡ�����"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "�����ꥹ�������ܡ���"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "����ꥫ�������ܡ���"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "�����˥��ʸŤ���"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "�����˥��ʥ����ץ饤������"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "�����˥���ȯ�������"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "������Х������(��ƥ�)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "������Х������(cyrillic)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "�٥륮��"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "�֥륬�ꥢ"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "�֥饸��"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "�٥�롼��"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "�������ʥɥ��ļ������"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "�������ʥե�󥹼������"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "�ɥ��ġʥǥåɥ����ʤ���"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "�ǥ�ޡ���"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak (US)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (�Υ륦����)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "�����ȥ˥�"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
-msgstr "���른����\"��������\"�����"
+msgstr "���른���ʡ֥��������������"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
-msgstr "���른����\"��ƥ�\"�����"
+msgstr "���른���ʡ֥�ƥ�������"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "���ꥷ��"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "�ϥ󥬥꡼"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "�����饨��"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "�����饨���ȯ�������"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "�����"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "�����ꥢ"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "���ܸ�106�����ܡ���"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "��ƥ󥢥�ꥫ"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "��ȥ��˥� AZERTY (��)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "��ȥ��˥� AZERTY (��)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
-msgstr "��ȥ��˥� \"������\" QWERTY"
+msgstr "��ȥ��˥� �ֿ������ QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
-msgstr "��ȥ��˥� \"ȯ��\" QWERTY"
+msgstr "��ȥ��˥� ��ȯ���� QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "�ݡ����ɡ�qwerty �����"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "�ݡ����ɡ�qwertz�����"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "�ݥ�ȥ���"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "���ʥ��ʥ��٥å���"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "�������� ������������ ��"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "���������ǥ�"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "�����٥˥�"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "�����Х���"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "�����������ܡ���"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "�ȥ륳������Ū \"F\" ��ǥ��"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "�ȥ륳�ʸ��� \"Q\" ��ǥ��"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "�����饤��"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "����ꥫ�������ܡ��ɡʹ�ݼ���"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "�٥ȥʥ� �ֿ������ QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "�桼������ӥ��ʥ�ƥ������"
 
-# 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.
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - �ޥ���"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "ɸ��"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "�ޥ��������եȡ�����ƥ�ޥ�����PS/2��"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "����"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "�ۥ�����"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "�ޥ��������եȡ�����ƥ�ޥ����ʥ��ꥢ���"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "���Ѥ�2�ܥ���ޥ���"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "���Ѥ�3�ܥ���ޥ���"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC ���꡼�� (���ꥢ��)"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (���ꥢ��, �Ť� C7 ������)"
+
+#: ../../mouse.pm_.c:64
+msgid "busmouse"
+msgstr "�Х��ޥ���"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2�ܥ���"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3�ܥ���"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "�ʤ�"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "�ޥ����ʤ�"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "�� ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "������ɽ������ޤ�������"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "���󥿡��ͥåȤ�����"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "�����󥿡��ͥåȤ���³���ޤ�����"
+
+#: ../../netconnect.pm_.c:101
+msgid "Testing your connection..."
+msgstr "��³��ƥ��Ȥ��Ƥ��ޤ�..."
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "���ߤϥ��󥿡��ͥåȤ���³���Ƥ��ޤ���"
+
+#: ../../netconnect.pm_.c:107
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+"���Υޥ���ϥ��󥿡��ͥåȤؤĤʤ��äƤ��ʤ��褦�Ǥ��͡�\n"
+"��³���������ʤ����ƤߤƤ���������"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "ISDN������"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"�ץ��Х���������Ǥ���������\n"
+"�⤷�ꥹ�Ȥˤʤ���С�Unlisted������Ǥ���������"
+
+#: ../../netconnect.pm_.c:158
+msgid "Connection Configuration"
+msgstr "��³������"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "���Υե�����ɤ����뤫�����å����Ƥ�������"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "������ IRQ"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "������ mem (DMA)"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "������ IO"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "������ IO_0"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "������ IO_1"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "���ʤ��������ֹ�"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "�ץ��Х�����̾�� (�� provider.net)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "�ץ��Х����������ֹ�"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "�ץ��Х����� dns 1"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "�ץ��Х����� dns 2"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "��������⡼��"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "��������ȥ�������ʥ桼��̾��"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "��������ȥѥ����"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "�ѥ���ɤ�����"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "�衼���å�"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "�衼���å� (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "�������Τ���¾"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "�����Τ���¾ - D-Channel �Ǥʤ�(�꡼�����줿����)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "�ɤΥץ��ȥ����Ȥ��ޤ�����"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "ʬ����ʤ�"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "�ɤ�ʥ����ɤ�ȤäƤ��ޤ�����"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "³����"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "����"
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
 "\n"
+"�⤷ISA�����ɤ���äƤ����顢���β��̤��ͤ�Ŭ�ڤǤ��礦��\n"
+"\n"
+"�⤷PCMCIA�����ɤ���äƤ����顢�����ɤ�irq��io���Τ�ɬ�פ�����ޤ���\n"
+
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "���ʤ���ISDN�����ɤϤɤ�Ǥ�����"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "ISDN�����ɤ�ߤĤ��ޤ���:\n"
+
+#: ../../netconnect.pm_.c:287
+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 "
+"�����ɤ�����Ǥ���������"
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr "ISDN PCI �����ɤϸ��դ���ޤ���Ǥ��������β��̤�������Ǥ�������"
+
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"LILO operating system chooser-he youkosou!\n"
+"�����ƥ��˥������ͥåȥ����ץ������Ĥ���ޤ��󡣤��μ����\n"
+"��³������Ǥ��ޤ���"
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "�ͥåȥ�����󥿡��ե�����������"
+
+#: ../../netconnect.pm_.c:336
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "���󥿡��ͥå���³�˻Ȥ��ͥåȥ�������ץ������Ӥޤ��礦"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "�ͥåȥ�����󥿡��ե�����"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
-"<TAB>: Ichiran Hyouji\n"
+"Do you agree?"
+msgstr ""
 "\n"
-"Ichiran kara erande <ENTER> wo oshimasu. %d byou de Default ni narimasu.\n"
+"��������Ǥ��͡�"
+
+#: ../../netconnect.pm_.c:352
+msgid "I'm about to restart the network device:\n"
+msgstr "�ͥåȥ���ǥХ�����Ƶ�ư���ޤ���:\n"
+
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "ADSL������"
+
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "�֡��Ȼ�����³���ޤ�����"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "��ǥ�򸡺����ޤ�����"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "��ǥ�ϤɤΥ��ꥢ��ݡ��ȤˤĤʤ��äƤ��ޤ�����"
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "�������륢�åץ��ץ����"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "��³̾"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "�����ֹ�"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "�������� ID"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "ǧ��"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "������ץȤ�Ȥ�ǧ��"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "�����ߥʥ뤫���ǧ��"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "�ɥᥤ��̾"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "�ե������� DNS ������"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "������� DNS ������"
+
+#: ../../netconnect.pm_.c:582
+msgid ""
 "\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr ""
+"\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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "OS���򥽥ե�GRUB�ؤ褦������"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr ""
+"\n"
+"���󥿡��ͥå���³�������Ǥ��ޤ���"
 
-#: ../../lilo.pm_.c:432
-#, 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."
+#: ../../netconnect.pm_.c:582
+msgid "You are not currently connected to Internet."
+msgstr "���ߤϥ��󥿡��ͥåȤ���³���Ƥ��ޤ���"
 
-#: ../../lilo.pm_.c:433
-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"
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
+"\n"
+"��³���ڤ뤫�����뤤�Ϻ����ꤷ�Ƥ���������"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "no henshuu niha 'e', command line nara 'c' wo oshi masu."
+#: ../../netconnect.pm_.c:586
+msgid "You are currently connected to internet."
+msgstr "���󥿡��ͥåȤ���³����Ƥ��ޤ���"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Sentaku shita OS ga %d byou de jidoutekini kidou shimasu."
+#: ../../netconnect.pm_.c:590
+msgid "Connect to Internet"
+msgstr "���󥿡��ͥåȤؤ���³"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "/boot ���������Ǥ�"
+#: ../../netconnect.pm_.c:592
+msgid "Disconnect from Internet"
+msgstr "���󥿡��ͥåȤ�������"
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "�ǥ����ȥå�"
+#: ../../netconnect.pm_.c:594
+msgid "Configure network connection (LAN or Internet)"
+msgstr "�ͥåȥ����³ (LAN/���󥿡��ͥå�)������"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "�������ȥ�˥塼"
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "���󥿡��ͥå���³������"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - �ޥ���"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr "�ͥåȥ���ǥХ��� $netc->{NET_DEVICE} ��Ƶ�ư���ޤ��������Ǥ��͡�"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB �ޥ���"
+#: ../../netconnect.pm_.c:641
+msgid "Configure a normal modem connection"
+msgstr "�դĤ��Υ�ǥ���³������"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB �ޥ�����2�ܥ����"
+#: ../../netconnect.pm_.c:661
+msgid "Configure an ISDN connection"
+msgstr "ISDN ��³������"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB �ޥ�����3�ܥ���ʾ��"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "��¢ISDN������"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB�ޥ���"
+#: ../../netconnect.pm_.c:668
+msgid "External ISDN modem"
+msgstr "���� ISDN ��ǥ�"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB�ޥ�����2�ܥ����"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "���󥿡��ͥåȤ���³"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB�ޥ�����3�ܥ���ʾ��"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "�ɤμ����ISDN��³�Ǥ�����"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "���ѥޥ��� (PS/2)"
+#: ../../netconnect.pm_.c:691
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "DSL (�ޤ��� ADSL) ��³������"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "�ե��"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "���Ѥ�3�ܥ���ޥ��� (PS/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "¾�ι�"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "���ʤ�������ΤϤɤι�Ǥ�����"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "Alcatel��ǥ�"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "ECI ��ǥ�"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
+"�⤷adsl��ǥबalcatel���ʤ顢alcatel������Ǥ��������������Ǥʤ����\n"
+"ECI ������Ǥ�������"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "pppoe��Ȥ�"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "pppoe��Ȥ�ʤ�"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"adsl ����³����դĤ��Τ�����ϡ�dhcp + pppoe�Ǥ���\n"
+"�Ǥ⡢dhcp�����Ȥ�ʤ���³������ˤϤ���ޤ���\n"
+"�狼��ʤ���С�'use pppoe'������Ǥ���������"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "�ޥ��������եȡ�����ƥ�ޥ�����PS/2��"
+#: ../../netconnect.pm_.c:765
+msgid "Configure a cable connection"
+msgstr "�����֥�ƥ����³������"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI �Х��ޥ���"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"�ɤ�dhcp���饤����Ȥ�Ȥ��ޤ�����\n"
+"�ǥե���Ȥ� dhcpd�Ǥ�"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "�ޥ��������եȡ��Х��ޥ���"
+#: ../../netconnect.pm_.c:800
+msgid "Disable Internet Connection"
+msgstr "���󥿡��ͥå���³��̵���ˤ���"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "�����ƥå����Х��ޥ���"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "LAN ����"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB�ޥ���"
+#: ../../netconnect.pm_.c:815
+msgid "Network configuration"
+msgstr "�ͥåȥ������"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB�ޥ�����3�ܥ���ʾ��"
+#: ../../netconnect.pm_.c:816
+msgid "Do you want to restart the network"
+msgstr "�ͥåȥ����Ƶ�ư���Ƥߤޤ�����"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "�ޥ����ʤ�"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "�ͥåȥ����̵���ˤ���"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A �ʾ�(serial)"
+#: ../../netconnect.pm_.c:834
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "���󥿡��ͥå���³���꡿LAN ����"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC ���꡼�� (���ꥢ��)"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"��������ͥåȥ��������ѤߤǤ���\n"
+"�ʲ��򤷤����Ǥ�����"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (���ꥢ��)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "�ɤΤ褦�ˤ��ƥ��󥿡��ͥåȤ���³���ޤ���?"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (���ꥢ��)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "�ͥåȥ��������"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (���ꥢ��)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
+"�������󥿡��ͥå���³�����꤬�����ޤ������ۤ��Υޥ���\n"
+"���Υޥ����ͳ�ǥ��󥿡��ͥåȤ���³����褦������Ǥ��ޤ�\n"
+"�����������륨�ꥢ�ͥåȥ�� (LAN) "
+"��Ĥ���ˤϡ����ѤΥͥåȥ�������ץ����פ�ޤ���\n"
+"\n"
+"���󥿡��ͥå���³�ζ�ͭ�����ꤷ�ޤ�����\n"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "�ޥ��������եȡ�����ƥ�ޥ����ʥ��ꥢ���"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "�ͥåȥ�������ɤ����դ���ޤ���"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (���ꥢ��)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "�ͥåȥ��������"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (���ꥢ��)"
+#: ../../network.pm_.c:274
+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'' �Τ褦�����¤��Ʋ�������"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (���ꥢ��, �Ť� C7 ������)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "�ۥ���̾:"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (���ꥢ��)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+"�ٹ�: ���ΥǥХ����ϡ����Ǥ˥��󥿡��ͥå���³�Ѥ����ꤵ��Ƥ��ޤ���\n"
+"��Ȥ������Ĥ�������С����Τޤ� OK �򲡤��Ƥ���������\n"
+"�ʲ��Υե�����ɤ��ѹ�����ȡ����꤬�Ѥ�äƤ��ޤ��ޤ���"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "���ѥޥ��� (���ꥢ��)"
+#: ../../network.pm_.c:302
+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 ""
+"���Υޥ���� IP ���ɥ쥹�����Ϥ��Ʋ�������\n"
+"�ơ��ι��ܤˤϥɥåȤǶ��ڤ�줿���ʿ�(�㡤1.2.3.4)��IP "
+"���ɥ쥹�Ȥ������Ϥ���ޤ���"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "�ޥ��������եȸߴ��ʥ��ꥢ���"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "�ͥåȥ���ǥХ��� %s ������"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "���Ѥ�3�ܥ���ޥ��� (���ꥢ��)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "IP �μ�ư����"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (���ꥢ��)"
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "IP ���ɥ쥹:"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "������ɽ������ޤ�������"
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "�ͥåȥޥ���:"
+
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP ���ɥ쥹�� 1.2.3.4 �Τ褦�����Ϥ��Ʋ�����"
+
+#: ../../network.pm_.c:341
+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 ""
+"�ۥ���̾�����Ϥ��Ʋ�������\n"
+"�ۥ���̾�� ``mybox.mylab.myco.com'' �Τ褦�ˤ��Ʋ�������\n"
+"�⤷�����ȥ�����������С����� IP ���ɥ쥹�����Ϥ��Ʋ�������"
+
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "DNS ������:"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "�����ȥ�����:"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "�����ȥ������ǥХ���:"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "�ץ�����������"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy �� http://... �Ǥ�"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy �� ftp://... �Ǥ�"
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr "���Υޥ���Ǥϡ���ĥ�ѡ��ƥ������ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4002,21 +5672,21 @@ msgstr ""
 "�ɤ����Ƥ�Ȥ�������С��ץ饤�ޥ�ѡ��ƥ��������ư���ơ�̤����η��\n"
 "��ĥ�ѡ��ƥ��������٤ˤ�äƤ��ޤ��礦��"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "�ե����� %s ���ɤߤȤꥨ�顼�Ǥ�"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "%s �ե����뤫������������Ԥ��ޤ����� %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "�Хå����åץե����뤬����Ƥ��ޤ�"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "�ե����� %s �ؤν񤭹��ߥ��顼"
@@ -4050,42 +5720,51 @@ msgstr "����"
 msgid "maybe"
 msgstr "���֤�"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (����)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (�ȤƤ�����)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (����)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "��ά��ɽ��"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "�ܺ٤�ɽ��"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "��������ץ��"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "��⡼�� lpd"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "��⡼�ȥץ��"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "��⡼��CUPS ������"
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "��⡼�� lpd������"
+
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "�ͥåȥ���ץ�󥿡ʥ����åȡ�"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/������ɥ��� 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "�ץ�󥿥ǥХ�����URI"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "�ǥХ����θ�����Ǥ��ġ�"
@@ -4097,13 +5776,13 @@ msgstr "�ݡ��ȤΥƥ���"
 #: ../../printerdrake.pm_.c:35
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
-msgstr "\"%s\"�ץ�󥿤������ΤȤ����Ǹ��Ĥ���ޤ���"
+msgstr "��%s�ץץ�󥿤������ΤȤ����Ǹ��Ĥ���ޤ���"
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "��������ץ�󥿥ǥХ���"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4111,36 +5790,36 @@ msgstr ""
 "�ץ�󥿤��Ĥʤ��äƤ���ǥХ����ϲ��Ǥ���\n"
 "(���� /dev/lp0 �� LPT1: �ˤʤ�ޤ�)��\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "�ץ�󥿥ǥХ���"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "��⡼��lpd�ץ�󥿥��ץ����"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 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."
 msgstr ""
-"��⡼�Ȥ� lpd �� �ץ��ȥ��塼��Ȥ��ˤϡ��ץ�󥿥����ФΥۥ��ȥ͡����\n"
+"��⡼�Ȥ� lpd �� �ץ��ȥ��塼��Ȥ��ˤϡ��ץ�󥿥����ФΥۥ���̾��\n"
 "����֤��֤���륵���о�Υ��塼��̾����ɬ�פˤʤ�ޤ���."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "��⡼�ȥۥ���̾"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "��⡼�ȥ��塼"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (������ɥ��� 9x/NT) �ץ�󥿤Υ��ץ����"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4152,27 +5831,27 @@ msgstr ""
 "¿ʬ�ץ��ȥ����Ф� IP ���ɥ쥹�����������������ץ�󥿤ζ�ͭ̾��\n"
 "Ŭ�ڤʥ桼��̾���ѥ���ɤ���ӥ�����롼�פξ���ɬ�פˤʤ�ޤ���"
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "SMB�����Хۥ���"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "SMB�����Ф�IP"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "������̾"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "������롼��"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "Netware �ץ�󥿤Υ��ץ����"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4181,133 +5860,157 @@ msgid ""
 msgstr ""
 "Netware �ץ�󥿤�Ȥ��ˤϡ�NetWare �ۥ���̾(����TCP/IP "
 "�ۥ���̾�Ȥϰ㤦��)�ȡ�\n"
-"���������������ץ�󥿤Υץ��ȥ��塼̾��Ŭ�ڤʥ桼��̾����ӥѥ���ɤ�\n"
-"ɬ�פˤʤ�ޤ���"
+"���������������ץ�󥿤Υץ��ȥ��塼̾��Ŭ�ڤʥ桼��̾�����\n"
+"�ѥ���ɤ�ɬ�פˤʤ�ޤ���"
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "�ץ�󥿥�����"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "�������塼��̾��"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "�����åȥץ�󥿤Υ��ץ����"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"�����åȥץ�󥿤ǰ�������ʤ顢�ץ�󥿤Υۥ���̾�ȡ�����\n"
+"��äƤϥݡ����ֹ椬ɬ�פˤʤ�ޤ���"
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "�ץ�󥿥ۥ���̾"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "�ݡ���"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr "CUPS �ǥץ�󥿤򥢥���������ʤ顢ľ�� URI �����Ǥ��ޤ���"
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "�ɤ�ʥץ�󥿤�ȤäƤ��ޤ�����"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "�������ޤ�����"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "�ƥ��ȥڡ���������ġ�"
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"�ƥ��ȥڡ�����ץ�󥿥ǡ���������ޤ�����\n"
+"�ץ�󥿤�ư���Ф��ޤǡ�����äȻ��֤�������ޤ���\n"
+"�����Υ��ơ�������\n"
+"%s\n"
+"\n"
+"�����Ƚ��Ϥ���ޤ�������"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"�ƥ��ȥڡ�����ץ�󥿥ǡ���������ޤ�����\n"
+"�ץ�󥿤�ư���Ф��ޤǡ�����äȻ��֤�������ޤ���\n"
+"�����Ƚ��Ϥ���ޤ�������"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "ASCII�ƥ��ȥڡ�����������Ƥߤ�"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "PostScript�ƥ��ȥڡ�����������Ƥߤ�"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "�ƥ��ȥڡ�����ξ���Ȥ�������Ƥߤ�"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "�ץ�󥿤�����"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "�ɤ�ʥץ�󥿤�ȤäƤ��ޤ�����"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "�ץ�󥿥��ץ����"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "�ѻ極����"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "����֤θ�ǥڡ����ӽФ��ޤ�����"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Uniprint�ɥ饤�Х��ץ����"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "�����٥��ץ����"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "�ƥ����Ȥ�PostScript�ǰ������ޤ�����"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "�Ǹ�Υڡ����������"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "ʸ���Υ��㥮����ʤ����ޤ�����"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "���ϥڡ���������Υڡ�����"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "������;���ݥ���ȿ���1/72������ˤǻ���"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "�岼��;���ݥ���ȿ���1/72������ˤǻ���"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "����¾ GhostScript���ץ����"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "����¾�ƥ����ȥ��ץ����"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "�������ޤ�����"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "�ƥ��ȥڡ���������ġ�"
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"�ƥ��ȥڡ�����ץ�󥿥ǡ���������ޤ�����\n"
-"�ץ�󥿤�ư���Ф��ޤǡ�����äȻ��֤�������ޤ���\n"
-"�����Υ��ơ�������\n"
-"%s\n"
-"\n"
-"�����Ƚ��Ϥ���ޤ�������"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"�ƥ��ȥڡ�����ץ�󥿥ǡ���������ޤ�����\n"
-"�ץ�󥿤�ư���Ф��ޤǡ�����äȻ��֤�������ޤ���\n"
-"�����Ƚ��Ϥ���ޤ�������"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "�ץ��"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "�ץ�󥿤�����򤷤ޤ�����"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4315,19 +6018,66 @@ msgstr ""
 "�ʲ��ΰ������塼������ޤ���\n"
 "�������塼���ɲá��ѹ��Ǥ��ޤ���"
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "CUPS ����"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr "CUPS �ɥ饤�Хǡ����١������ɤ�Ǥ��ޤ�..."
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "�ץ�󥿤���³������Ǥ�������"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "�ץ�󥿤Ϥɤ��Ĥʤ��äƤ��ޤ�����"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "��⡼�ȥץ�󥿤���³������Ǥ�������"
+
+#: ../../printerdrake.pm_.c:388
+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 �����Сפ����Ӥޤ��礦��"
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "���塼�κ��"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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"
+"����Ǥ��ޤ������Υץ�󥿤Ϥʤ�Ȥ���̾���ˤ��ޤ����� "
+"�����ƥޥ���ȤϤɤ��Ĥʤ��äƤ��ޤ�����"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "�ץ�󥿤�̾��"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "�ץ�󥿤�����"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "�ץ�󥿤ξ��"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4339,45 +6089,45 @@ msgstr ""
 "�Ȥ�̾���ȥǥ��쥯�ȥ�ϲ��ˤ��ޤ�����\n"
 "�ޤ��ץ�󥿤Ϥɤ���³����Ƥ��ޤ�����"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "���塼��̾����"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "���ס���Υǥ��쥯�ȥꡧ"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "�ץ�󥿤���³����"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "�ե����ޥåȺѤߤ� RAID md%d �ˤϥѡ��ƥ��������ɲäǤ��ޤ���"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "$file �ե����뤬�񤭹���ޤ���"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid �˼���"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid �˼��� (raidtools �����äƤʤ��Τ���?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "RAID ��٥� %d �Τ���ˤϥѡ��ƥ���������Ǥ�\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron �ϼ���Ū�ʥ��ޥ�ɥ������塼��Ǥ���"
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4385,7 +6135,7 @@ msgstr ""
 "apmd �ϥХåƥ꡼�ξ��֤�Ĵ�٤Ƥ����syslog��ͳ�ǵ�Ͽ���ޤ���\n"
 "���Ӥ��ʤ��ʤä��Ȥ��˥ޥ���򥷥�åȥ����󤹤�Τˤ�Ȥ��ޤ���"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4393,7 +6143,7 @@ msgstr ""
 "at���ޥ�ɤǥ������塼�뤵�줿���ޥ�ɤ�at�¹Ի��˻��ꤷ�����֤�\n"
 "�¹Ԥ��ơ�ʿ����٤��㤤�Ȥ��˥Хå����ޥ�ɤ�¹Ԥ��ޤ���"
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4404,7 +6154,7 @@ msgstr ""
 "�¹Ԥ��ޤ���vixie cron��ɸ���UNIX cron�˹��٤ʥ������ƥ���\n"
 "���Ϥ����ꥪ�ץ����ʤɤε�ǽ���ɲä��Ƥ��ޤ���"
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4415,13 +6165,13 @@ msgstr ""
 "�Ȥ���褦�ˤ��ޤ����ޥ����ˤ�륳�󥽡���ǤΥ��åȡ��ڡ�����\n"
 "�䡢�ݥåץ��åץ�˥塼��Ȥ��ޤ���"
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 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�θ����˻Ȥ��ޤ���"
+msgstr "Apache��World Wide Web�����Фǡ�HTML �ե������CGI�θ����˻Ȥ��ޤ���"
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4435,7 +6185,7 @@ msgstr ""
 "rsh��rlogin�ʤɤΥ����ӥ����Ϥ�ô�����ޤ���inetd��̵���ˤ���ȡ�\n"
 "���������Ƽ掠���ӥ����٤Ƥ�̵���ˤʤ�ޤ���"
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4445,7 +6195,7 @@ msgstr ""
 "�����ɤ��ޤ��������kbdconfig�桼�ƥ���ƥ���Ȥä����ꤷ�ޤ����̾��\n"
 "ͭ���ˤ��Ƥ����ޤ��礦��"
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4453,7 +6203,7 @@ msgstr ""
 "lpd �ϥץ�󥿥ǡ����ǡ�lpr��ư���ɬ�פǤ�������Ū��\n"
 "�ϥץ�󥿤˰�������֤򿶤�ʬ���륵���ФǤ���"
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4461,7 +6211,7 @@ msgstr ""
 "named (BIND) �ϡ�IP���ɥ쥹�ȥۥ���̾���ӤĤ��뤿��Υɥᥤ��̾\n"
 "�����С�Domain Name Server, DNS) �Ǥ���"
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4469,7 +6219,7 @@ msgstr ""
 "�ͥåȥ���ե����륷���ƥ� (NFS), SMB (LanManager/Windows),\n"
 "NCP (NetWare) �ޥ���ȥݥ���Ȥ򤹤٤ƥޥ���ȡ�����ޥ���Ȥ��ޤ���"
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4477,7 +6227,7 @@ msgstr ""
 "��ư����ͭ���ˤ�������Υͥåȥ�����󥿡��ե������򤹤٤ơ�\n"
 "ͭ����̵���ˤ��ޤ���"
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4487,7 +6237,7 @@ msgstr ""
 "�Ǥ������Υ����ӥ��� NFS �����е�ǽ���󶡤��ޤ�������ˤ�/etc/exports \n"
 "�ե������Ȥ��ޤ���"
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4495,7 +6245,7 @@ msgstr ""
 "NFS ��TCP/IP�ͥåȥ����ǥե����붦ͭ�򤹤�Τˤ褯�Ȥ��ץ��ȥ���\n"
 "�Ǥ������Υ����ӥ��� NFS �ե�������å���ǽ���󶡤��ޤ���"
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4506,7 +6256,7 @@ msgstr ""
 "�ʤɤ�PC�����ɤ�Ȥ���褦�ˤ��뤿��Τ�ΤǤ������ꤹ��ޤ�\n"
 "�ϵ�ư���ʤ��Τǡ�ɬ�פʤ��ޥ��������Ƥ��äƤ�����Ǥ���"
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4517,7 +6267,7 @@ msgstr ""
 "���Ѥ���ޤ���RPC������Ȥ��ץ��ȥ���Υ����ФȤʤ�ޥ���Ǥϡ�����\n"
 "portmap �����Ф�ư���Ƥ���ɬ�פ�����ޤ���"
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4525,7 +6275,7 @@ msgstr ""
 "Postfix �ϥ᡼��ž������������ȤǤ� (MTA) �Ǥ�������ϡ��ޥ���֤�\n"
 "�᡼�����Ȥꤹ��ץ������Ǥ���"
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4533,7 +6283,7 @@ msgstr ""
 "���ȯ���μ���夲�뤿��ˡ������ƥ�Υ���ȥ��ԡ��ס������¸��\n"
 "���褵���ޤ���"
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4543,7 +6293,7 @@ msgstr ""
 "��ǽ�ˤ��ޤ���RIP �Ͼ����ϥͥåȥ���Ǥ������Ǥ褯�Ȥ��ޤ�����\n"
 "�ͥåȥ����ʣ���ˤʤäƤ���ȡ�����Ǥ��Խ�ʬ�Ǥ���"
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4551,7 +6301,7 @@ msgstr ""
 "rstat�ץ��ȥ����Ȥ��ȡ��ͥåȥ����Υ桼���������Υͥåȥ��\n"
 "����³�����ޥ���Τ��٤ƤˤĤ��ơ���ǽ��ɸ��������褦�ˤʤ�ޤ���"
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4559,7 +6309,7 @@ msgstr ""
 "rusers�ץ��ȥ���Ǥϡ��ͥåȥ����Υ桼��������������ۤ��Υޥ���\n"
 "�˥������󤷤Ƥ���ͤ����򸫤뤳�Ȥ��Ǥ��ޤ���"
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4567,7 +6317,7 @@ msgstr ""
 "rwho �ǡ�������äƤ���ޥ���Ǥϡ����Υޥ���˥����������\n"
 "�桼��������rwho�ץ��ȥ����ͳ�Ǹ����ޤ� (finger�˻��Ƥ��ޤ�)��"
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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."
@@ -4575,52 +6325,223 @@ msgstr ""
 "Syslog �ϡ��Ƽ�Υǡ���󤬤�����ʥ����ե�����˥�å�������Ͽ\n"
 "����Ȥ��˻Ȥ��ޤ������äȵ�ư���Ƥ����ۤ��������Ǥ��礦��"
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr "���ε�ư������ץȤ�USB�ޥ����ѤΥ⥸�塼�������ɤ��ޤ���"
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "��ư��/����åȥ�������ˡ�X�ե���ȥ����Ф򳫻�/��ߤ��ޤ���"
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "��ư���˼�ưŪ�ˤ��������륵���ӥ�������Ǥ�������"
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"SILO operating system chooser-he youkosou!\n"
-"\n"
-"<TAB>: Ichiran Hyouji\n"
-"\n"
-"Ichiran kara erande <ENTER> wo oshimasu. %d byou de Default ni narimasu.\n"
-"\n"
+"�ѡ��ƥ������ơ��֥뤬�ɤ�ޤ��󡤲���Ƥ���褦�Ǥ�:(\n"
+"�����ʥѡ��ƥ��������������褦�Ȥ��ޤ�"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "LILO/GRUB ������"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "��ư�ǥ���������"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "�ե��åԡ���ե����ޥå�"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "����"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "LILO �Υ��󥹥ȡ���˼��Ԥ��ޤ������ʲ��Υ��顼��ȯ��:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "���󥿡��ͥå���³��ͭ�ϸ���ͭ��"
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+"���󥿡��ͥå���³��ͭ�Υ��åȥ��åפϤ��Ǥ˴�λ��\n"
+"ͭ���ˤʤäƤ��ޤ���\n"
+"\n"
+"�ɤ����ޤ�����"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+msgid "disable"
+msgstr "̵����"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr "̵��"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+msgid "reconfigure"
+msgstr "������"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "���󥿡��ͥå���³��ͭ�ϸ���̵���Ǥ�"
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+"���󥿡��ͥå���³��ͭ�Υ��åȥ��åפϤ��Ǥ˴�λ��\n"
+"̵���ˤʤäƤ��ޤ���\n"
+"\n"
+"�ɤ����ޤ�����"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+msgid "enable"
+msgstr "ͭ����"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "����ե���������Ƥ����Ǥ��ʤ���"
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "�ץ�󥿤ζ�ͭ��³"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+"���Υޥ���Υ��󥿡��ͥå���³��ͭ����褦������Ǥ��ޤ���\n"
+"\n"
+"�����������륨�ꥢ�ͥåȥ�� (LAN) "
+"��Ĥ���ˤϡ����ѤΥͥåȥ�������ץ����פ�ޤ���\n"
+"\n"
+"���󥿡��ͥå���³�ζ�ͭ�����ꤷ�ޤ�����"
+
+#: ../../standalone/drakgw_.c:177
+msgid "using module"
+msgstr "�⥸�塼������"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "�ͥåȥ�������ץ�������ޤ���"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"�����ƥ��˥������ͥåȥ����ץ������Ĥ���ޤ��󡣥ϡ��ɥ���������ġ����¹"
+"Ԥ����Ƥ���������"
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"�����ƥ�ˤ����ꤵ�줿�ͥåȥ�������ץ����ҤȤĤ�������ޤ���\n"
+"\n"
+"$interface\n"
+"\n"
+"���Υ����ץ��� LAN ����³���ޤ�����"
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"�������륨�ꥢ�ͥåȥ���ˤĤʤ���ͥåȥ�������ץ���\n"
+"����Ǥ���������"
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"�ͥåȥ�������ץ��Ϥ⤦���꤬����Ǥ��ޤ���\n"
+"�������ʤ����ޤ�����"
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr "���ߤ�$_������Ǥ�LAN���ɥ쥹�����ͤ��뤫�⤷��ޤ���\n"
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "�ե������������������򸡽С�"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+"�ٹ𡪥ե����䥦�����������򸡽С����󥹥ȡ����ˡ���ư�Ǽ�ľ�����פ뤫��"
+"���ޤ���³���ޤ�����"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "������ץȤ����ꡢ���եȥ������Υ��󥹥ȡ��롢�����Фε�ư..."
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring..."
+msgstr "������..."
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "ipchains RPM �� urpmi �ǥ��󥹥ȡ���Ǥ��ޤ���"
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "dhcp RPM �� urpmi �ǥ��󥹥ȡ���Ǥ��ޤ���"
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "linuxconf RPM �� urpmi �ǥ��󥹥ȡ���Ǥ��ޤ���"
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "bind RPM �� urpmi �ǥ��󥹥ȡ���Ǥ��ޤ���"
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "caching-nameserver RPM �� urpmi �ǥ��󥹥ȡ���Ǥ��ޤ���"
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "����ǤȤ��������ޤ���"
+
+#: ../../standalone/drakgw_.c:513
+msgid ""
+"Everything has been configured.\n"
+"You may now share Internet connection with other computers on your Local "
+"Area Network, using automatic network configuration (DHCP)."
+msgstr ""
+"���꤬���٤ƽ����ޤ�����\n"
+"����Ǽ�ư�ͥåȥ�������dhcp) ��Ȥäơ�LAN "
+"���¾�Υޥ���ȥ��󥿡��ͥå���³��ͭ�Ǥ��ޤ���"
+
 #: ../../standalone/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4682,23 +6603,31 @@ msgstr "�������ƥ���٥��������"
 msgid "Choose the tool you want to use"
 msgstr "���Ѥ���ġ��������ǲ�����"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "�����ܡ��ɥ쥤�����Ȥϲ��Ǥ�����"
+#: ../../standalone/livedrake_.c:23
+msgid "Change Cd-Rom"
+msgstr "CD-ROM�������ؤ��Ƥ�������"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "�ޥ����η��Ϥʤ�Ǥ�����"
+#: ../../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 ""
+"���󥹥ȡ���CD ��ɥ饤�֤ˤ���ơ� Ok �򲡤��Ƥ���������\n"
+"CD���ʤ���С�Cancel �򲡤��ƥ饤�֥��åץ��졼�ɤ���򤷤Ʋ�������"
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr "�饤�֤��äפä��졼�ɤ򳫻ϤǤ��ޤ���!!!\n"
+
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "serial_usb�����Ĥ���ޤ���\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "����ܥ���򥨥ߥ�졼�Ȥ��ޤ�����"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "�ޥ����ϤɤΥ��ꥢ��ݡ��ȤˤĤʤ��äƤ��ޤ�����"
 
@@ -4911,6 +6840,1245 @@ msgstr "�ĥ꡼�ξܺ٤򸡺���"
 msgid "Finding leaves takes some time"
 msgstr "�ĥ꡼�ξܺ٤򸫤Ĥ���Τϻ��֤�������ޤ�"
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "����ե�����ʥǥ����ȥåפ��ä�"
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "K �ǥ����ȥå״Ķ�������Ū�ʥ���ե������Ķ��ˡ���Ϣ�ġ���ͤ��碌"
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr "�Ŀ;������"
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr "CD ��Ĥ��äƾƤ��ġ���"
+
+msgid "Internet Tools"
+msgstr "���󥿡��ͥåȥġ���"
+
+msgid "Internet"
+msgstr "���󥿡��ͥå�"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr "�Ŀͤκ�̳����"
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm �ʤ�"
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr "The Gimp�ʤɤβ����������ե�"
+
+msgid "Office"
+msgstr "���ե�����Ϣ"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr "�ǡ����١������饤����Ȥȥ����� (mysql, postgresql)"
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Palm Pilot �� Visor�ѥġ���"
+
+msgid "Multimedia - Graphics"
+msgstr "�ޥ����ǥ���������"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr "�ӥǥ��ץ졼����Խ����ե�"
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "��ڥ��եȡ��ƥ�ӥ����ࡢ�ܡ��ɥ����ࡢ��ά������ʤ�"
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"���ե����ϥ��ե�: ��ץ� (kword, abiword), ɽ�׻� (kspread, gnumeric), pdf "
+"�ӥ塼���ʤ�"
+
+# ../../share/compssUsers
+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
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "�����ǥ�����Ϣ�ġ��롧mp3, midi, �ߥ������ʤ�"
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+"xchat, licq, gaim�ʤɤΥ���å��ѥ��ե� (IRC �䥤�󥹥���ȥ�å�����) "
+"�ȥե�����ž���ġ���"
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux ��ե꡼���եȴ�Ϣ���ܤ�ϥ��ġ�ʸ��"
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm�ʤ�"
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"�Ȥ��䤹�����ץꥱ��������ǥ����ȥåץġ������ġ�����ե������Υ桼���Ķ"
+"�"
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "�ޥ����ǥ���"
+
+msgid "KDE"
+msgstr "KDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr "������ɤ�ӥǥ��κ����Խ����ե�"
+
+msgid "Multimedia"
+msgstr "�ޥ����ǥ���"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr "����¾����ե��å��ǥ����ȥå�"
+
+msgid "Multimedia - Sound"
+msgstr "�ޥ����ǥ������������"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "�ɥ�����ơ������"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "gnucash�ʤɤβȷ״������ե�"
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr "�������"
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr "������"
+
+msgid "Multimedia - CD Burning"
+msgstr "�ޥ����ǥ�����CD ��Ƥ�"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr "�̿���Ϣ"
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr "�ǡ����١���"
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "���󥹥ȡ��뤹�륵����������ǲ�����"
+
+#~ msgid "Total size: "
+#~ msgstr "��ץ�����: "
+
+#~ msgid ""
+#~ "The system is now connected to Internet! Congratulation.\n"
+#~ "Feel free to launch draknet at any time to setup your connection.\n"
+#~ msgstr ""
+#~ "�ޥ����̵�����󥿡��ͥåȤ���³����ޤ���������ǤȤ���\n"
+#~ "��³����ˤϡ����ĤǤ� draknet ��ư���Ƥ���������\n"
+
+# 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)
+# 
+#~ msgid ""
+#~ "Welcome to %s the operating system chooser!\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s operating system chooser-he youkosou!\n"
+#~ "\n"
+
+#~ msgid "Reconfigure local network"
+#~ msgstr "LAN ������ꤹ��"
+
+#~ msgid ""
+#~ " Introduction\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"
+#~ "\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., 43, rue d'Aboukir, 75002 Paris - France, 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. 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"
+#~ "Some versions of the Software Products may contain components which are not "
+#~ "governed by the GPL \n"
+#~ "License or similar agreements. Each such component is then governed by the "
+#~ "terms and conditions \n"
+#~ "of its own specific license. Please read carefully and comply with such "
+#~ "specific licenses before \n"
+#~ "you install, use or redistribute the said components. Such licenses will in "
+#~ "general prevent the \n"
+#~ "transfer,  duplication (except for backup purposes), redistribution, reverse "
+#~ "engineering, \n"
+#~ "de-assembly, \n"
+#~ "de-compilation or modification of the component. Any breach of agreement "
+#~ "will immediately terminate \n"
+#~ "your rights under the specific license. Unless the specific license terms "
+#~ "grant you such rights, \n"
+#~ "you usually cannot install the programs on more than one system, or adapt it "
+#~ "to be used on a \n"
+#~ "network. \n"
+#~ "In doubt, please contact directly the distributor or editor of the "
+#~ "component. Transfer to third \n"
+#~ "parties or copying of such components including the documentation is usually "
+#~ "forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "3. 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,\n"
+#~ "by all means and for all purposes.\n"
+#~ "\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "
+#~ "MandrakeSoft S.A.  All rights \n"
+#~ "are \n"
+#~ "reserved. The duplication is forbidden without prior written consent by "
+#~ "MandrakeSoft S.A.\n"
+#~ "\n"
+#~ "\n"
+#~ "4. Limited Warranty\n"
+#~ "\n"
+#~ "The Software Products and attached documentation are provided \"as is\", "
+#~ "with no warranty, to the \n"
+#~ "extent permitted by law. Should the Software Products be defective, "
+#~ "MandrakeSoft S.A. will at its \n"
+#~ "own will either replace the Software Products, or reimburse the paid fee.\n"
+#~ "This limited warranty is void if you fail to comply to the recommendations, "
+#~ "instructions and \n"
+#~ "conditions \n"
+#~ "of use listed in the documentation or license agreements of the Software "
+#~ "Products.\n"
+#~ "To the extent permitted by law, MandrakeSoft S.A. will in no circumstances "
+#~ "be liable for any \n"
+#~ "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"
+#~ "judgement, or any other consequential loss) arising out of  the use or "
+#~ "inability to use the \n"
+#~ "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 \n"
+#~ "damages for loss of business, interruption of business, financial loss, "
+#~ "legal fees and penalties \n"
+#~ "resulting from a court judgement, or any other consequential loss) arising "
+#~ "out of the possession \n"
+#~ "and \n"
+#~ "use of software components or arising out of  downloading software "
+#~ "components from one of \n"
+#~ "Linux-Mandrake \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 "
+#~ "included in the Software \n"
+#~ "Products.\n"
+#~ "\n"
+#~ "\n"
+#~ "5. Governing Laws \n"
+#~ "\n"
+#~ "If any portion of this agreement is held void, illegal or inapplicable by a "
+#~ "court judgement, 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, \n"
+#~ "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"
+#~ "43, rue d'Aboukir, 75002 Paris - France\n"
+#~ msgstr ""
+#~ " Introduction\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"
+#~ "\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., 43, rue d'Aboukir, 75002 Paris - France, 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. 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"
+#~ "Some versions of the Software Products may contain components which are not "
+#~ "governed by the GPL \n"
+#~ "License or similar agreements. Each such component is then governed by the "
+#~ "terms and conditions \n"
+#~ "of its own specific license. Please read carefully and comply with such "
+#~ "specific licenses before \n"
+#~ "you install, use or redistribute the said components. Such licenses will in "
+#~ "general prevent the \n"
+#~ "transfer,  duplication (except for backup purposes), redistribution, reverse "
+#~ "engineering, \n"
+#~ "de-assembly, \n"
+#~ "de-compilation or modification of the component. Any breach of agreement "
+#~ "will immediately terminate \n"
+#~ "your rights under the specific license. Unless the specific license terms "
+#~ "grant you such rights, \n"
+#~ "you usually cannot install the programs on more than one system, or adapt it "
+#~ "to be used on a \n"
+#~ "network. \n"
+#~ "In doubt, please contact directly the distributor or editor of the "
+#~ "component. Transfer to third \n"
+#~ "parties or copying of such components including the documentation is usually "
+#~ "forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "3. 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,\n"
+#~ "by all means and for all purposes.\n"
+#~ "\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "
+#~ "MandrakeSoft S.A.  All rights \n"
+#~ "are \n"
+#~ "reserved. The duplication is forbidden without prior written consent by "
+#~ "MandrakeSoft S.A.\n"
+#~ "\n"
+#~ "\n"
+#~ "4. Limited Warranty\n"
+#~ "\n"
+#~ "The Software Products and attached documentation are provided \"as is\", "
+#~ "with no warranty, to the \n"
+#~ "extent permitted by law. Should the Software Products be defective, "
+#~ "MandrakeSoft S.A. will at its \n"
+#~ "own will either replace the Software Products, or reimburse the paid fee.\n"
+#~ "This limited warranty is void if you fail to comply to the recommendations, "
+#~ "instructions and \n"
+#~ "conditions \n"
+#~ "of use listed in the documentation or license agreements of the Software "
+#~ "Products.\n"
+#~ "To the extent permitted by law, MandrakeSoft S.A. will in no circumstances "
+#~ "be liable for any \n"
+#~ "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"
+#~ "judgement, or any other consequential loss) arising out of  the use or "
+#~ "inability to use the \n"
+#~ "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 \n"
+#~ "damages for loss of business, interruption of business, financial loss, "
+#~ "legal fees and penalties \n"
+#~ "resulting from a court judgement, or any other consequential loss) arising "
+#~ "out of the possession \n"
+#~ "and \n"
+#~ "use of software components or arising out of  downloading software "
+#~ "components from one of \n"
+#~ "Linux-Mandrake \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 "
+#~ "included in the Software \n"
+#~ "Products.\n"
+#~ "\n"
+#~ "\n"
+#~ "5. Governing Laws \n"
+#~ "\n"
+#~ "If any portion of this agreement is held void, illegal or inapplicable by a "
+#~ "court judgement, 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, \n"
+#~ "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"
+#~ "43, rue d'Aboukir, 75002 Paris - France\n"
+
+#~ msgid ""
+#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "����ԥ塼���ϥ��󥿡��ͥå���³��ͭ����褦������Ǥ��ޤ���\n"
+#~ "\n"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "���꤬���������ޤ�����\n"
+
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "���̤Υ�ǥ�ǥ��󥿡��ͥåȤ���³"
+
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "ISDN��Ȥäƥ��󥿡��ͥåȤ���³"
+
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "DSL(�ޤ���ADSL)��Ȥäƥ��󥿡��ͥåȤ���³"
+
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "�����֥��Ȥäƥ��󥿡��ͥåȤ���³"
+
+#~ msgid ""
+#~ "Time (secs) of inactivity after which\n"
+#~ "it hangs up. (leave blank to disable it)"
+#~ 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 "�ɤΥѡ��ƥ�����󥿥��פˤ��ޤ�����"
+
+#~ 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "GNU/Linux�Υ��󥹥ȡ��뤬���Ƥ���ʣ���Υǥ����ȥ�ӥ塼������\n"
+#~ "�С������ȶ�¸���������Ȥ��ˤϡ��֥��󥹥ȡ���פ����Ӥޤ��礦��\n"
+#~ "\n"
+#~ "���Ǥ˥��󥹥ȡ��뤺�ߤ�Mandrake Linux��ߺѤ������ʤ顢�֥쥹���塼�פ�\n"
+#~ "���Ӥޤ��礦��\n"
+#~ "\n"
+#~ "\n"
+#~ "������ܰ�:\n"
+#~ "\n"
+#~ "  - ����ư(�侩): GNU/Linux�Υ��󥹥ȡ��뤬���Ƥʤ顢��������Ӥޤ��礦��\n"
+#~ "\n"
+#~ "  - �������ޥ���: GNU/Linux �˾ܤ�����С���ʬ�Υޥ���μ�ʻȤ�����\n"
+#~ "    ���碌�����Ӥޤ��礦���ܤ����ϰʲ��򻲾Ȥ��Ƥ���������\n"
+#~ "\n"
+#~ "  - �������ѡ���: �����������GNU/Linux�˾ܤ����ͤ��������ü��\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "GNU/Linux�ѤΥѡ��ƥ������ν������Ǥ��Ƥ���С����� GNU/Linux \n"
+#~ "�򥤥󥹥ȡ��뤷���ꡢ\n"
+#~ "�̤Υ桼�ƥ���ƥ��ǥѡ��ƥ��������ä����ˡ��ɤΥѡ��ƥ�������\n"
+#~ "Linux-Mandrake�����ƥ�򥤥󥹥ȡ��뤹�뤫�����Ӥޤ��礦��\n"
+#~ "�⤷�ѡ��ƥ��������äƤ��ʤ���С��ϡ��ɥǥ������Υѡ��ƥ�������\n"
+#~ "�����Ǻ��ޤ����ѡ��ƥ������Ȥ����Τϡ�����ԥ塼���Υϡ��ɥǥ�����\n"
+#~ "����Ū�ˤ��碌������Ū�˶��ڤ뤳�ȤǤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "�������ѡ��ƥ�������Ĥ���ʤ顢�ּ�ư������ơפ����٤С���ưŪ��\n"
+#~ "Linux�ѤΥѡ��ƥ�����󤬤Ǥ�������ޤ����ѡ��ƥ�������Ĥ���ϡ���\n"
+#~ "�ǥ����������֤Ȥ��ϡ��ǽ��IDE�ɥ饤�֤���hda�ס�2���ܤ���hdb�ס��ǽ�\n"
+#~ "��SCSI�ɥ饤�֤���sda�ס��Ȥ������ˤʤ�ޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "�褯����ѡ��ƥ��������ڤ����Ȥ��Ƥϡ�root�ѡ��ƥ������(/) ��\n"
+#~ "boot�ѡ��ƥ������(/boot) ����ޤ���root�ϥե����륷���ƥ��\n"
+#~ "�ǥ��쥯�ȥ�ΤƤäڤ�ǡ�/boot�ˤϥ���ԥ塼���Υ����å������줿\n"
+#~ "�Ȥ��˵�ư��ɬ�פʥե����뤬�֤��Ƥ���Ȥ����Ǥ���\n"
+#~ "\n"
+#~ "\n"
+#~ "�ѡ��ƥ��������ڤ�ȡ��դĤ��Ϥ����Υǡ����������ä��ơ���Ȥ�\n"
+#~ "���ޤ��󡣤�����ѡ��ƥ��������ڤ�Τϡ��鿴�ԤˤϤ��ä��ʤ�\n"
+#~ "�Ǥ������ȤäƤⵤ��줹���ΤǤ��������ʤ�ʤ��褦�ˡ�DiskDrake\n"
+#~ "�Ϥ��Υץ�������ʤ�٤���ñ�ˤ��ޤ����ޤ��ϥɥ�����ơ�������\n"
+#~ "�ɤ�ǡ���˿ʤ����ˤ��ä��굤������失�ޤ��礦��\n"
+#~ "\n"
+#~ "\n"
+#~ "�ɤΥ��ץ����⡢�����ܡ��ɤ����٤ޤ����ѡ��ƥ����������֤ˤϡ�\n"
+#~ "���֤Ⱦ岼�Υ������륭����Ȥ��ޤ��礦���ѡ��ƥ�������������顢\n"
+#~ "���Υ������Ȥ��ޤ���\n"
+#~ "\n"
+#~ "- Ctrl-c  �������ѡ��ƥ���������ʶ��Υѡ��ƥ����������������\n"
+#~ "\n"
+#~ "- Ctrl-d  ���Υѡ��ƥ���������\n"
+#~ "\n"
+#~ "- Ctrl-m  �ޥ���ȥݥ���Ȥ�����\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."
+#~ msgstr ""
+#~ "��������ä��ѡ��ƥ������Ϥ��٤ơ��ե����ޥåȤ��ʤ��ȻȤ��ޤ���\n"
+#~ "�ʥե����ޥåȤȤ����Τϥե����륷���ƥ��Ĥ��뤳�ȤǤ��ˡ������\n"
+#~ "��¸�Υѡ��ƥ�������ե����ޥåȤ��ơ������Υǡ�����õ��Ǥ��ޤ���\n"
+#~ "���ա���¸�Υѡ��ƥ������ϡ��ե����ޥåȤ��ʤ���ɬ�פϤ���ޤ���\n"
+#~ "�ä���¸�������ǡ�����/home �� /usr/local�ʤɡˤ�����С��ե����ޥå�\n"
+#~ "���ƤϤ����ޤ���"
+
+#~ 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."
+#~ msgstr ""
+#~ "������ѥå������򥤥󥹥ȡ��뤷�Ƥ��ޤ�������ˤϿ�ʬ������ޤ��衣\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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "�⤷ DrakX ���ޥ����򸫤Ĥ����ʤ��ä��ꡢ�������Ф줿�������å�\n"
+#~ "�������ä��ꤹ��Ȥ��ϡ���˥ޥ����ΰ������ФƤ���Ϥ��Ǥ���\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX �Τ�ä�����Ǥ褱��С�'OK' �򥯥�å����ޤ��礦��\n"
+#~ "���꤬�����äƤ����顢��ʬ�Υޥ����ˤ����Ф�\n"
+#~ "�ᤤ����Υޥ������˥塼��������Ǥ���������\n"
+#~ "\n"
+#~ "\n"
+#~ "���ꥢ��ޥ�����ȤäƤ���Ȥ��ˤϡ����줬�Ĥʤ��äƤ��륷�ꥢ��ݡ���\n"
+#~ "����ꤷ�Ƥ���������"
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "�����Ǥϡ��������륨�ꥢ�ͥåȥ����LAN�ˤ���ǥ������򤷤ޤ���\n"
+#~ "\n"
+#~ "�֥������� LAN�פ����֤ȡ�DrakX �ϥޥ���Υ������ͥåȥ����ץ���õ��\n"
+#~ "�ޤ���PCI�Υ����ץ��ϼ�ưŪ�˸��Ĥ��ä����ꤵ���Ϥ��Ǥ���\n"
+#~ "�⤷���Ȥ��Υ����ץ���ISA �ʤ顢��ư�Ǥϸ��ФǤ��ޤ��󡣤��ξ�硢\n"
+#~ "���Ȥ������ɽ���ФƤ���Τǡ�������������Ǥ���������\n"
+#~ "\n"
+#~ "\n"
+#~ "SCSI�����ץ��ξ�硢�Ȥꤢ�����ɥ饤�Ф˥����ץ���õ�����Ƥߤޤ��礦��\n"
+#~ "����ʤ顢��ʬ�ǥɥ饤�ФΥ��ץ�������ꤷ�ޤ������ꥪ�ץ����ϡ�\n"
+#~ "��ʬ�Υϡ��ɥ���������°ʸ���Ĵ�٤Ƥ���������\n"
+#~ "\n"
+#~ "\n"
+#~ "���Υޥ��󤬤��Ǥ˴�¸�Υͥåȥ���ˤĤʤ��äƤ���ʤ顢�ͥåȥ��\n"
+#~ "�����Ԥ�ɬ�פʾ���򶵤�äƤ���Ϥ��Ǥ�(IP ���ɥ쥹���ͥåȥ����\n"
+#~ "���֥ޥ������̾Υͥåȥޥ����ˡ��ۥ���̾)������ʤɤǼ�ʬ�����Υͥå�\n"
+#~ "����������Ȥ��Ƥ���ʤ顢���ɥ쥹�ʤɤϼ�ʬ�����Ӥޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "�֥�ǥ�ˤ��������륢�åספ����֤ȡ���ǥ�ˤ�륤�󥿡��ͥå���³\n"
+#~ "�����ꤵ��ޤ���DrakX �ϥ�ǥ��õ���ޤ��������줬���Ԥ����顢��ǥ��\n"
+#~ "�Ĥʤ��äƤ��륷�ꥢ��ݡ��Ȥ�ʬ�ǻ��ꤷ�Ƥ���������"
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "GNU/Linux �ǤϤ�����ʥץ�󥿤��Ȥ��ޤ����������줾�����꤬�������ޤ���\n"
+#~ "���������������ס���ϥǥե���ȤΥץ��̾�Ȥ��ơ�lp�פ�Ȥ��ޤ���\n"
+#~ "�����顢lp�Ȥ���̾���Υץ�󥿤���Ĥ�ɬ�פǤ����Ǥ⡢��ĤΥץ��\n"
+#~ "��ʣ����̾����Ĥ��뤳�Ȥ�Ǥ��ޤ������ΤȤ��ϡ�|�פǶ��ڤ�ޤ���\n"
+#~ "�����顢�ץ�󥿤ˤ狼��䤹��̾����Ĥ�������С��������˽񤤤�\n"
+#~ "�����Ф��ߤޤ������Ȥ��С�My Printer|lp�פȤ������ˡ�\n"
+#~ "̾������ˡ�lp�פ��ޤޤ��ץ�󥿤��ǥե���Ȥˤʤ�ޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "�ץ�󥿤�ľ�ܥ���ԥ塼���ˤĤʤ��äƤ���С��֥�������ץ�󥿡פ�\n"
+#~ "���Ӥޤ������ξ�硢�ץ�󥿤ΤĤʤ��äƤ���ݡ��Ȥ���ꤷ�ơ�Ŭ�ڤ�\n"
+#~ "�ե��륿�����Ӥޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "�ͥåȥ����Τۤ���Unix�ޥ���ˤĤʤ��ä��ץ�󥿤�Ȥ��ʤ顢\n"
+#~ "�֥�⡼�� lpd�פ����Ӥޤ��礦�������Ȥ��ˤϡ��桼��̾��ѥ���ɤ�\n"
+#~ "����ޤ��󤬡����Υ����о�ΰ������塼��̾�����פ�ޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "SMB�ץ�󥿤�Ȥ��ʤ�ʤĤޤ�ͥåȥ����Υ�����ɥ���9x/NT�ޥ���\n"
+#~ "�ˤĤʤ��ä��ץ�󥿤�Ȥ��Ȥ�����̣�Ǥ��ˡ����Υޥ����SMB ̾�ʤ���\n"
+#~ "��TCP/IP̾�Ȥ���ʪ�Ǥ��ˤȡ����ˤ�äƤ�IP���ɥ쥹��ɬ�פˤʤ�ޤ���\n"
+#~ "����˥桼��̾��������롼��̾�ȥѥ���ɡ�����ˤϥץ��̾��\n"
+#~ "�ʤ��ȥץ�󥿤˥��������Ǥ��ޤ���NetWare �ץ�󥿤⡢������롼�פ�\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."
+#~ msgstr ""
+#~ "�����Ǥϡ֤Ϥ��פ�������Τ򶯤��侩���ޤ����夫��MS������ɥ�����\n"
+#~ "���󥹥ȡ��뤷���顢�֡��ȥ������Ͼ�񤭤���ޤ��������ʤä��顢\n"
+#~ "�֡��ȥǥ��������äƤ����ʤ��ȡ�Linux��Ω���夲���ʤ��ʤ�ޤ��衣"
+
+#~ msgid "Move your wheel!"
+#~ msgstr "�ۥ������ޤ路�Ƥߤޤ��礦��"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "�ѹ��������˴����ޤ�����"
+
+#~ msgid "Cable connection"
+#~ msgstr "�����֥���³"
+
+#~ msgid "Host name:"
+#~ msgstr "�ۥ���̾:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "�ޥ����η��Ϥʤ�Ǥ�����"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "�����٤μ�ư����"
+
+#~ 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"
+#~ msgstr ""
+#~ "ͭ���ʲ����٤����뤿����̤���ˡ���Ƥߤޤ���\n"
+#~ "�����꡼�����Ǥ��ޤ�...\n"
+#~ "����ʤ��˥��Υ����å����ڤäƤ�������礦�֡�����ä��� beep ��\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?"
+#~ msgstr ""
+#~ "ͭ���ʲ�����(��: 800x600)��ưŪ��õ���ޤ���\n"
+#~ "��������ǥޥ��󤬻ߤޤäƤ��ޤ����⤷��ޤ���\n"
+#~ "õ���Ƥߤޤ��礦����"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "ͭ���ʥ⡼�ɤ����դ���ޤ���\n"
+#~ "¾�Υӥǥ�������/��˥��ǻ�Ʋ�������"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "�����٤μ�ư����"
+
+#~ msgid "dhcpd"
+#~ msgstr "dhcpd"
+
+#~ msgid "pump"
+#~ msgstr "pump"
+
+#~ msgid "dhcpxd"
+#~ msgstr "dhcpxd"
+
+#~ msgid "dhcp-client"
+#~ msgstr "dhcp-client"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB �ޥ���"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB �ޥ�����2�ܥ����"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB �ޥ�����3�ܥ���ʾ��"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB�ޥ���"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB�ޥ�����2�ܥ����"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB�ޥ�����3�ܥ���ʾ��"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "���ѥޥ���"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI �Х��ޥ���"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "�ޥ��������եȡ��Х��ޥ���"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "�����ƥå����Х��ޥ���"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB�ޥ���"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB�ޥ�����3�ܥ���ʾ��"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A �ʾ�(serial)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (���ꥢ��)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (���ꥢ��)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (���ꥢ��)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "���ѥޥ��� (���ꥢ��)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "�ޥ��������եȸߴ��ʥ��ꥢ���"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "���Ѥ�3�ܥ���ޥ��� (���ꥢ��)"
+
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse (���ꥢ��)"
+
+#~ msgid ""
+#~ "I need to configure your network adapter to be able to connect to internet."
+#~ msgstr ""
+#~ "���󥿡��ͥå���³�ˤϡ��ͥåȥ�������ץ������ꤹ��ɬ�פ�����ޤ���"
+
+#~ msgid ""
+#~ "Please choose which network adapter do you want to use to connect to "
+#~ "internet.\n"
+#~ "If you don't know, choose eth0.\n"
+#~ msgstr ""
+#~ "���󥿡��ͥåȤˤĤʤ�����Υͥåȥ�������ץ�������Ǥ���������\n"
+#~ "�狼��ʤ���С�eth0 ������Ǥ����ޤ��礦��\n"
+
+#~ 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"
+#~ "\n"
+#~ "Do you want to keep XFree 3.3?"
+#~ msgstr ""
+#~ "DrakX �ϡ�XFree 3.3��XFree 4.0ξ��������ե������Ĥ���ޤ����Ǥ�\n"
+#~ "�ǥե���ȤǤ��б��ӥǥ������ɤ�̵���¤ꡢ4.0�����ФΤۤ���Ȥ��ޤ���\n"
+#~ "\n"
+#~ "XFree 3.3 �Τޤޤˤ��Ƥ����ޤ���?"
+
+#~ msgid "Cryptographic"
+#~ msgstr "�Ź沽"
+
+#~ msgid "Configure LAN"
+#~ msgstr "LAN ������"
+
+#~ msgid "End configuration"
+#~ 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 "URI for Local printer"
+#~ msgstr "��������ץ�󥿤�URI"
+
+#~ msgid "URI for Network printer"
+#~ msgstr "�ͥåȥ���ץ�󥿤�URI"
+
+#~ msgid "Local Printer Device (URI)"
+#~ msgstr "��������ץ�󥿥ǥХ��� (URI)"
+
+#~ msgid ""
+#~ "What URI device is your printer connected to\n"
+#~ "(note that parallel:/dev/lp0 is equivalent to LPT1:)?"
+#~ msgstr ""
+#~ "�ץ�󥿤��Ĥʤ��äƤ���ǥХ����ϲ��Ǥ���\n"
+#~ "(���� �ѥ����/dev/lp0 �� LPT1: �ˤʤ�ޤ�)��\n"
+
+#~ msgid "Network Printer Options (URI)"
+#~ msgstr "Netware �ץ�󥿤Υ��ץ���� (URI)"
+
+#~ msgid "curly"
+#~ msgstr "������"
+
+#~ msgid "default"
+#~ msgstr "�ǥե����"
+
+#~ msgid "tie"
+#~ msgstr "�ͥ�����"
+
+#~ msgid "brunette"
+#~ msgstr "�֥�ͥå�"
+
+#~ msgid "girl"
+#~ msgstr "���λ�"
+
+#~ msgid "woman-blond"
+#~ msgstr "�֥���ɽ���"
+
+#~ msgid "automagic"
+#~ msgstr "�����ȥޥ��å�"
+
+#~ msgid "Normal"
+#~ msgstr "�Ρ��ޥ�"
+
+#~ msgid "Have you been provided with a hostname?"
+#~ msgstr "�ۥ��ȥ͡�����󶡤���Ƥ��ޤ�����"
+
+#~ msgid "Local Area Network specification"
+#~ msgstr "�������륨�ꥢ�ͥåȥ���ξܺ�"
+
+#~ msgid "You may now decide which class C network to use.\n"
+#~ msgstr "�ɤΥ��饹C�ͥåȥ����Ȥ������Ƥ���������\n"
+
+#~ msgid "Network:"
+#~ msgstr "�ͥåȥ��:"
+
+#~ msgid "Internet Connection Sharing - setup of $device"
+#~ msgstr "���󥿡��ͥåȶ�ͭ��³ - $device ������"
+
+#~ msgid ""
+#~ "The following interface is about to be configured:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+#~ msgstr ""
+#~ "���Υ��󥿡��ե����������ꤷ�褦�Ȥ��Ƥޤ���\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+
+#~ msgid "Everything configured!"
+#~ msgstr "���Ƥ����ꤷ�ޤ�����"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "�����ܡ��ɥ쥤�����Ȥϲ��Ǥ�����"
+
+#~ msgid "Configure my card"
+#~ msgstr "�����ɤ�����"
+
+#~ msgid "pptp alcatel"
+#~ msgstr "pptp alcatel"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "PCMCIA�����ɤ򤵤����Ƥߤޤ��礦����"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "%s�ǥХ����򤵤����Ƥߤޤ�����"
+
+#~ msgid "Small(%dMB)"
+#~ msgstr "�Ǿ�(%dMB)"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "��ǥ������"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "�����ƥ�Υ�ǥ�ˤ��������륢�åץͥåȥ�������ꤷ�ޤ�����"
+
+#~ msgid "Do you want to configure a ISDN connection for your system?"
+#~ msgstr "�����ƥ��ISDN��³�����ꤷ�ޤ�����"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "PCI�ǥХ����򤵤����Ƥߤޤ�����"
+
+#~ msgid "Searching root partition."
+#~ msgstr "�롼�ȥѡ��ƥ������򸡺�"
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: ����ϥ롼�ȥѡ��ƥ������ǤϤ���ޤ��󡤤ۤ�������ǲ�������"
+
+#~ msgid "No root partition found"
+#~ msgstr "�롼�ȥѡ��ƥ�����󤬸��Ĥ���ޤ���"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "NIS �ɥᥤ�󤬤ʤ��Τǥ֥����ɥ��㥹�Ȥ��Ȥ��ޤ���"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "�ɤΥѡ��ƥ�������롼�ȥѡ��ƥ������ˤ��ޤ���"
+
+#~ msgid "Autologin at startup"
+#~ msgstr "��ư���μ�ư��������"
+
+#~ msgid "Autologin - Choose default user"
+#~ msgstr "��ư�������� - �ǥե���ȥ桼��������"
+
+#~ msgid "You don't have any windows partitions!"
+#~ msgstr "������ɥ����Υѡ��ƥ�����󤬤���ޤ���"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "Linux4Win����������ζ���������ޤ���"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "����ư"
+
+# 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.
+#
+#~ 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 ""
+#~ "LILO operating system chooser-he youkosou!\n"
+#~ "\n"
+#~ "<TAB>: Ichiran Hyouji\n"
+#~ "\n"
+#~ "Ichiran kara erande <ENTER> wo oshimasu. %d byou de Default ni narimasu.\n"
+#~ "\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "SILO �ᥤ�󥪥ץ����"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "SILO �ˤϰʲ��Υ���ȥ꤬����ޤ���\n"
+#~ "�ۤ��Υ���ȥ��ä��뤫�ѹ����뤳�Ȥ��Ǥ��ޤ���"
+
+#~ msgid "This label is already in use"
+#~ msgstr "���Υ�٥�Ϥ��Ǥ˻Ȥ��Ƥ��ޤ�"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "SILO �Υ��󥹥ȡ���˼��Ԥ��ޤ������ʲ��Υ��顼��ȯ��:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX �Ϥޤ���PCI�Х���SCSI�����ץ���õ���ˤ����ޤ��������ץ����ߤ�\n"
+#~ "���äơ��Ȥ��ɥ饤�Ф��狼��С������ưŪ���Ȥ߹��ߤޤ��������ץ�\n"
+#~ "���������󤢤äƤ�����פǤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "�⤷ISA�Х���SCSI�����ץ���ȤäƤ����ꡢPCI�Х���SCSI�����ץ��Ǥ�\n"
+#~ "DrakX�˥ɥ饤�Ф��狼��ʤ��ä��ꤹ��Ȥ����ޤ���SCSI�����ץ����ʤ�\n"
+#~ "�Ȥ��ˤϡ��ץ���ץȤ��ФƤ��ơ�SCSI�����ץ������뤫�ɤ��������ޤ���\n"
+#~ "�ʤ���С֤������פ������Ƥ�������������С֤Ϥ��פ������ޤ��礦��\n"
+#~ "����ȥɥ饤�Фΰ���ɽ���ФƤ���Τǡ�Ŭ�ڤʤ�Τ�����Ǥ���������\n"
+#~ "\n"
+#~ "\n"
+#~ "�ɥ饤�Ф�������顢���Υɥ饤�Фǥ��ץ�������ꤷ�������ɤ�����\n"
+#~ "DrakX�������Ƥ��ޤ����ǽ�ϡ��ɥ饤�Ф˥ϡ��ɥ�������ץ����֤�����\n"
+#~ "�ߤޤ��礦�����������Ϥ���Ǥ��ޤ������ޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "���줬����ʤ顢���Υ����ץ��ˤĤ��ƥɥ�����ơ������˽񤤤Ƥ��ä�\n"
+#~ "���Ȥ䡢������ɥ����Υץ��ѥƥ��ξ���ʤɤ�פ������Ƥߤޤ��礦������\n"
+#~ "���ȡ��륬���ɤǤ⡢����򹵤��Ƥ����褦�ˤ����ᤷ�ޤ�����͡����ξ���\n"
+#~ "��ɥ饤�Фˤ錄���Ƥ�뤳�Ȥˤʤ�ޤ���"
+
+#~ msgid "Shutting down"
+#~ msgstr "����åȥ�������"
+
 #~ msgid "useless"
 #~ msgstr "̵��"
 
@@ -4925,9 +8093,6 @@ msgstr "�ĥ꡼�ξܺ٤򸫤Ĥ���Τϻ��֤�������ޤ�"
 #~ "������Ȥ��ޤ���? ���ʤ��� Linux "
 #~ "��Ǥ�����Ȥ����������뤫��Τ���Ʋ�������"
 
-#~ msgid "Recommended"
-#~ 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"
@@ -4940,12 +8105,12 @@ msgstr "�ĥ꡼�ξܺ٤򸫤Ĥ���Τϻ��֤�������ޤ�"
 #~ "or 7.0 (Air)."
 #~ msgstr ""
 #~ "Linux�Υ��󥹥ȡ��뤬���Ƥ����ۤ���Linux�ǥ����ȥ�ӥ塼������\n"
-#~ "�С������ȶ�¸���������Ȥ��ˤϡ� \"���󥹥ȡ���\" �����Ӥޤ��礦��\n"
+#~ "�С������ȶ�¸���������Ȥ��ˤϡ��֥��󥹥ȡ���פ����Ӥޤ��礦��\n"
 #~ "\n"
 #~ "\n"
 #~ "Mandrake Linux: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus),\n"
 #~ "6.1 (Helios), Gold 2000, 7.0 (Air)�ʤɡ��Ť�Mandrake Linux��\n"
-#~ "���åץ��졼�ɤ���ʤ�\"���åץ��졼��\"�����Ӥޤ��礦��"
+#~ "���åץ��졼�ɤ���ʤ�֥��åץ��졼�ɡפ����Ӥޤ��礦��"
 
 #~ msgid "Do you want to use LILO?"
 #~ msgstr "LILO ��Ȥ��ޤ�����"
@@ -5035,14 +8200,14 @@ msgstr "�ĥ꡼�ξܺ٤򸫤Ĥ���Τϻ��֤�������ޤ�"
 #~ "\n"
 #~ "  - ������������: Linux�˾ܤ�����С������ƥ�λȤ����˱����ơ֥Ρ��ޥ��\n"
 #~ "�ֳ�ȯ�ѡס֥����Сפ��椫�����Ӥޤ��礦���դĤ��Υ����ƥ�ˤ�������С�\n"
-#~ "\"�Ρ��ޥ�\"�������Ǥ��礦����˥��եȳ�ȯ�򤹤�Ĥ��ʤ顢\"��ȯ��\"��\n"
+#~ "�֥Ρ��ޥ�פ������Ǥ��礦����˥��եȳ�ȯ�򤹤�Ĥ��ʤ顢�ֳ�ȯ�ѡפ�\n"
 #~ "���Ӥޤ������뤤�ϡ����ѥ����Сʥ᡼���ѡ������ѤʤɤʤɡˤȤ��ƻȤ��ʤ�\n"
-#~ "\"������\"����������Ǥ���\n"
+#~ "�֥����Сפ���������Ǥ���\n"
 #~ "\n"
 #~ "\n"
 #~ "  - �������ѡ��ȡ�Expert: GNU/Linux �Х�Х�ǡ��٤����������ޥ����򤷤�\n"
 #~ "����С����Υ��󥹥ȡ��������Ǥ������������ΤȤ��������ƥ�λ��Ӥ�\n"
-#~ "\"�������ޥ���\"�ˤʤ�ޤ���"
+#~ "�֥������ޥ����פˤʤ�ޤ���"
 
 #~ msgid "Help"
 #~ msgstr "�إ��"
@@ -5059,9 +8224,6 @@ msgstr "�ĥ꡼�ξܺ٤򸫤Ĥ���Τϻ��֤�������ޤ�"
 #~ msgid "Which language do you want?"
 #~ msgstr "�ɤθ����Ȥ��ޤ�����"
 
-#~ msgid "Which usage do you want?"
-#~ msgstr "�ɤλ���ˡ�����Ӥޤ�����"
-
 #~ msgid "Which packages do you want to install"
 #~ msgstr "�ɤΥѥå������򥤥󥹥ȡ��뤷�ޤ���"
 
@@ -5100,9 +8262,6 @@ msgstr "�ĥ꡼�ξܺ٤򸫤Ĥ���Τϻ��֤�������ޤ�"
 #~ msgid "Password:"
 #~ msgstr "�ѥ����:"
 
-#~ msgid "Local Printer Options"
-#~ msgstr "��������ץ�󥿤Υ��ץ����"
-
 #~ msgid "server"
 #~ msgstr "������"
 
@@ -5148,8 +8307,5 @@ msgstr "�ĥ꡼�ξܺ٤򸫤Ĥ���Τϻ��֤�������ޤ�"
 #~ msgid "Installation CD Nr 1"
 #~ msgstr "���󥹥ȥ졼����� CD Nr 1"
 
-#~ msgid "Dialup with modem"
-#~ msgstr "��ǥ�ǥ������륢�å�"
-
 #~ msgid "Local LAN"
 #~ msgstr "�������� LAN"
diff --git a/perl-install/share/po/ko.po b/perl-install/share/po/ko.po
index 372d5487f..320d02bbb 100644
--- a/perl-install/share/po/ko.po
+++ b/perl-install/share/po/ko.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-05-30 20:59+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 2000-05-30 16:27+0100\n"
 "Last-Translator: Ricky Jang <ricky@iolinux.co.kr>\n"
 "Language-Team: I.O. Linux sytems <mandrake@iolinux.co.kr>\n"
@@ -15,43 +15,91 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:116 ../../Xconfigurator.pm_.c:236
-msgid "Generic"
-msgstr "�Ϲ����ΰ͵�"
-
-#: ../../Xconfigurator.pm_.c:172
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "���� ī��"
 
-#: ../../Xconfigurator.pm_.c:172
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "���� ī�� ����"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "X ���� ����"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X ����"
 
-#: ../../Xconfigurator.pm_.c:198
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "� ������ �׸��� �߰��Ͻðڽ��ϱ�?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+#, fuzzy
+msgid "XFree configuration"
+msgstr "��ġ�� ȯ�漳��"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "�׷��� ī�� �޸� �뷮 ����"
 
-#: ../../Xconfigurator.pm_.c:225
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "���� �ɼ� ����"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "����� ����"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "�����"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -72,39 +120,40 @@ msgstr ""
 "�ʵ��� �����Ͻñ� �ٶ��ϴ�. �ڽ��� ����Ϳ� ���� �� �𸥴ٸ� ������ ������\n"
 "�����Ͻñ� �ٶ��ϴ�."
 
-#: ../../Xconfigurator.pm_.c:246
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "���� ���ļ�"
 
-#: ../../Xconfigurator.pm_.c:246
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "���� ���ļ�"
 
-#: ../../Xconfigurator.pm_.c:285
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "����Ͱ� �������� �ʾҽ��ϴ�."
 
-#: ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "�׷��� ī�尡 ���� �������� �ʾҽ��ϴ�."
 
-#: ../../Xconfigurator.pm_.c:291
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "�ػ󵵰� ���õ��� �ʾҽ��ϴ�."
 
-#: ../../Xconfigurator.pm_.c:304
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "�� ������ �׽�Ʈ�� ���ðڽ��ϱ�?"
 
-#: ../../Xconfigurator.pm_.c:308
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+#, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "���� : �� �׷���ī�忡���� ������� �����մϴ�."
 
-#: ../../Xconfigurator.pm_.c:311
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "�׽�Ʈ ����"
 
-#: ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -112,184 +161,168 @@ msgstr ""
 "\n"
 "������ �ٲپ� ���ʽÿ�. "
 
-#: ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "���� �߻�:"
 
-#: ../../Xconfigurator.pm_.c:373
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d �� ���ҽ��ϴ�."
 
-#: ../../Xconfigurator.pm_.c:377
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "�� ������ �½��ϱ�?"
 
-#: ../../Xconfigurator.pm_.c:385
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "���� �߻�, ������ �ٲپ� ���ʽÿ�."
 
-#: ../../Xconfigurator.pm_.c:393 ../../Xconfigurator.pm_.c:574
-msgid "Automatic resolutions"
-msgstr "�ڵ� �ػ�"
-
-#: ../../Xconfigurator.pm_.c:394
-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"
-msgstr ""
-"��밡���� �ػ󵵸� ã�� ���� �ٸ� ��带 �����ϰ� �ֽ��ϴ�.\n"
-"ȭ���� �����Ÿ����Դϴ�...\n"
-"���Ѵٸ� ������ų�� �ְ�, �� �Ҹ��� ���� �������Դϴ�."
-
-#: ../../Xconfigurator.pm_.c:452 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "�ػ�"
 
-#: ../../Xconfigurator.pm_.c:487
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "�ػ󵵿� ������ �����ϼ���"
 
-#: ../../Xconfigurator.pm_.c:489
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "���� ī��: %s"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 ����: %s"
 
-#: ../../Xconfigurator.pm_.c:499
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:523
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "�ػ�"
 
-#: ../../Xconfigurator.pm_.c:575
-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?"
-msgstr ""
-"��� ������ �ػ󵵸� �˻��մϴ�. ( ��: 800x600) \n"
-"������, �ý����� �ٿ��ų���� �ֽ��ϴ�.\n"
-"����Ͻðڽ��ϱ�?"
-
-#: ../../Xconfigurator.pm_.c:580
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"�ùٸ� ��尡 �����ϴ�.\n"
-"�ٸ� ���� ī�峪 ����͸� ������ ���ʽÿ�."
-
-#: ../../Xconfigurator.pm_.c:920
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Ű���� ���̾Ƽ�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "���콺 ����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "���콺 ��ġ��: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "�����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "����� �����ֻ���: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "����� �������ļ�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "���� ī��: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "�׷��� �޸�: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "����� �������ļ�: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "�ػ�"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "X������ ����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:943
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "X������ ����: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "X-Window ȯ�漳���� �غ���"
 
-#: ../../Xconfigurator.pm_.c:957
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "����� ����"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "���� ī�� ����"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "���� �ɼ� ����"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "�ػ� ����"
 
-#: ../../Xconfigurator.pm_.c:961
-msgid "Automatical resolutions search"
-msgstr "�ڵ� �ػ� ã��"
-
-#: ../../Xconfigurator.pm_.c:965
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "���� ����"
 
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "�ٽ� �׽�Ʈ"
 
-#: ../../Xconfigurator.pm_.c:967 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "����"
 
-#: ../../Xconfigurator.pm_.c:971 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "������ �ϱ� ���Ͻʴϱ�?"
 
-#: ../../Xconfigurator.pm_.c:978
-msgid "Forget the changes?"
-msgstr "���氪���� �����ڽ��ϱ�?"
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "���� IP������ ����"
 
-#: ../../Xconfigurator.pm_.c:996
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "%s�� �������Ŀ� ���氪���� ����˴ϴ�."
 
-#: ../../Xconfigurator.pm_.c:1012
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "�����ų�� Crtl-Alt-BackSpaceŰ�� ��������."
 
-#: ../../Xconfigurator.pm_.c:1015
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X�����찡 ���۵˴ϴ�."
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -297,229 +330,229 @@ msgstr ""
 "���ýÿ� �ڵ����� X�����찡 ���۵ǵ��� �Ҽ� �ֽ��ϴ�.\n"
 "�ٽ� ���������� �ڵ����� X������ ���۵Ǳ� ���Ͻʴϱ�?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1152
+#, 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."
+msgstr ""
+"���ýÿ� �ڵ����� X�����찡 ���۵ǵ��� �Ҽ� �ֽ��ϴ�.\n"
+"�ٽ� ���������� �ڵ����� X������ ���۵Ǳ� ���Ͻʴϱ�?"
+
+#: ../../Xconfigurator.pm_.c:1154
+#, fuzzy
+msgid "Choose the default user:"
+msgstr "���ο� ũ�⸦ ������ �ֽʽÿ�"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "��ġ�� ��Ű�� ����"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256�� (8 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "3��2õ���� ���� ����Į�� (15 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "6��5õ���� ���� ����Į�� (16 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "õ���鸸���� ���� Ʈ��Į�� (24bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "40�ﰡ�� ���� Ʈ��Į�� (32 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr ""
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr ""
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr ""
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr ""
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr ""
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr ""
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB �̻�"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "ǥ�� VGA, 640x480 @ 60Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "���� VGA, 800x600 @ 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 ȣȯ, 1024x768 @ 87 Hz interlaced (800x600 �ȵ�)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "���� VGA, 1024x768 @ 87 Hz interlaced, 800x600 @ 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Ȯ�� ���� VGA, 800x600 @ 60 Hz, 640x480 @ 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "High Frequency SVGA,  1024x768 @ 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "1280x1024 @ 60 Hz ��� ���� �����"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "1280x1024 @ 74 Hz ��� ���� �����"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "1280x1024 @ 76 Hz ��� ���� �����"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "1600x1200 @ 70 Hz ��� ���� �����"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "1600x1200 @ 76 Hz ��� ���� �����"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "�����Ӹ�"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "�⺻"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "�Ż�"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "����"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "����"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "�ݹ߿���"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "�ڵ�"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "��Ʈ ��Ƽ���� ù��° ����"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "����̺��� ù��° ����(MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
+#: ../../any.pm_.c:95
+#, fuzzy
+msgid "SILO Installation"
 msgstr "LILO/grub ��ġ"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "��Ʈ�δ��� ��� ��ġ�ϰ� �����ʴϱ�?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub ��ġ"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 #, fuzzy
 msgid "None"
 msgstr "�Ϸ�"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "��ġ Ŭ���� ����"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+#, fuzzy
+msgid "Bootloader installation"
+msgstr "LILO �� �ɼ�"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "��Ʈ ��ġ"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (������ BIOS�鿡�� �۵����� �������� �ֽ��ϴ�.)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr ""
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 #, fuzzy
 msgid "compact"
 msgstr "����"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "����Ʈ �̹����� ���õɶ����� ��ٸ� �ð�"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "���� ���"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "����Ʈ �̹����� ���õɶ����� ��ٸ� �ð�"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "��ȣ"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "��ȣ (Ȯ��)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "������ �ɼ��� �����մϴ�."
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "����"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 #, fuzzy
 msgid "Bootloader main options"
 msgstr "LILO �� �ɼ�"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "�ɼ�: ``������ �ɼ�����''�� ��ȣ���� ���ɼ� �����ϴ�."
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "�ٽ� �õ��� �ֽʽÿ�"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "�н����尡 ��ġ���� �ʽ��ϴ�."
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 #, fuzzy
 msgid ""
 "Here are the different entries.\n"
@@ -528,226 +561,398 @@ msgstr ""
 "LILO �׸� �� �ִ� �͵��Դϴ�.\n"
 "�� �߰��ϰų�, �ִ°͵��� �����Ҽ� �ֽ��ϴ�."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "�߰�"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "�Ϸ�"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "� ������ �׸��� �߰��Ͻðڽ��ϱ�?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "������"
 
-#: ../../any.pm_.c:123
-msgid "Other OS (windows...)"
+#: ../../any.pm_.c:175
+#, fuzzy
+msgid "Other OS (SunOS...)"
 msgstr "��Ÿ OS (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "� ������ �׸��� �߰��Ͻðڽ��ϱ�?"
+#: ../../any.pm_.c:175
+msgid "Other OS (windows...)"
+msgstr "��Ÿ OS (windows...)"
 
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "�̹���"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr ""
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "�߰�"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "�ʱ�ȭ �����ũ"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "�б�-����"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr ""
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "����"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "�׸��"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "�⺻"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ȯ��"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "�׸� ����"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "�׸���� �Է��ϼ���"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "�� �׸���� �̹� ���ǰ� �ֽ��ϴ�."
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "%s %s ī�尡 �߰ߵǾ����ϴ�."
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "�� �ٸ����� ������ ��ʴϱ�?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "�� �ٸ� %s �������̽� ī�带 ������ ��ʴϱ�?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "�ƴϿ�"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "��"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "%sī�� ����̹� %s ��ġ��"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(%s ��� ���)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "� %s ����̹��� �õ��� ���ϱ�?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "�ڵ��˻�"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "�ɼ� ����"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr ""
+
+#: ../../any.pm_.c:557
+#, 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 ""
+
+#: ../../any.pm_.c:560
+#, fuzzy
+msgid "Module options:"
+msgstr "��ȭ�ɱ� �ɼ�"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"%s ����� �о���̴µ� �����߽��ϴ�.\n"
+"�ٸ� ������ �ٽ� �õ��� ���ðڽ��ϱ�?"
+
+#: ../../bootloader.pm_.c:234
+#, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "�ü�� �������� GRUB�� ���Ű� ȯ���մϴ�."
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "%cŰ�� %c�� ����Ͽ� ������ �׸��� �����Ͽ� �ֽʽÿ�."
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "���õ� �ü���� �����ҷ��� ���͸�, �����ҷ��� 'e'�� �����ּ���."
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "������ ���ɵ� �Ǵ�, �������� ���ؼ��� 'c'�����ּ���."
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "������ �׸����� %d���� �ڵ����� ���õ˴ϴ�."
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr ""
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "����ũž"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "���� �޴�"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "%d �� ���ҽ��ϴ�."
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "����"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "�𸶿�Ʈ"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "����"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "����"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:590
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "ũ������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "����"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "����Ʈ ��ġ"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "/etc/fstab�� ����"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "���� ���� ��ȯ"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "�Ϲ� ���� ��ȯ"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "���Ϸ� ���� ����"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "���Ͽ� ����"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "�÷��Ƿ� ���� ����"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "�÷��ǿ� ����"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "��� �����"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "��� ����"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "�ڵ� �Ҵ�"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "��� 1�� ��Ƽ���� ������Դϴ�."
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "���̻� ��Ƽ���� �߰��Ҽ� �����ϴ�."
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr ""
 "�� ���� ��Ƽ���� ����Ƿ���, Ȯ�� ��Ƽ���� ����� �ִ� ��Ƽ���ϳ��� ���켼��"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "��Ƽ�� ���̺� ����"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "�ǵ�����"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "��Ƽ�� ���̺� ���"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "���ΰ���"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "�����"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "����"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "��Ÿ"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "����"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "�����"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "��Ÿ"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "���Ͻý��� ����:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "�󼼼���"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -759,17 +964,17 @@ msgstr ""
 "�� ��Ƽ���� ũ�⸦ ������ ���� �����մϴ�.\n"
 "(�װ��� Ŭ������, \"ũ������\"�� Ŭ���ϼ���.)"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "�������� ����� ���� ���弼��."
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
 #: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "���Ǳ��� ��������!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -779,77 +984,77 @@ msgstr ""
 "�� �����)\n"
 "�� ����Ϳ� �����Ͻʽÿ�."
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "���� : �� ������ �����մϴ�."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "����"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:680
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "����Ʈ ��ġ: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "��ġ: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS ����̺� ����: %s (���� �����ϻ���)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "����: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "����: ���� %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "ũ��: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s ����"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "%d �Ǹ��� ���� %d �Ǹ��� ����\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "�ʱ�ȭ����\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "���ʱ�ȭ����\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "����Ʈ �Ǿ���\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "���̵� ��ġ %s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "������ ����(��): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -857,79 +1062,79 @@ msgstr ""
 "�⺻������ ���õǴ� ��Ƽ��\n"
 "    (lilo�� ���Ѱ��� �ƴ϶� MS-DOS boot�� ���Ѱ���)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "%s ���\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "ũ�� %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "���̵�-��ũ %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "������ ���� �̸�: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "��Ƽ���� Ŭ���ϼ���"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "ũ�� : %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "��ġ: %s �Ǹ���, %s ���, %s ����\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "��Ƽ�� ����: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "%d �����󿡼� ID %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "����Ʈ"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "����"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "RAID�� �߰�"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "RAID�� ���� ����"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "RAID ����"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "���������� ���"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "�ൿ�� �����ϼ���"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -940,7 +1145,7 @@ msgstr ""
 "�����ϴ�. ( 1024 �Ǹ��� ���Ͽ����� �����մϴ�.\n"
 "LILO�� ����Ѵٰ� �ϴ��� �������� �ʰ�, LILO ��ü�� ����Ҽ��� �����ϴ�."
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -951,59 +1156,64 @@ msgstr ""
 "���� /boot ��Ƽ���� ������ �����ϴ�.\n"
 "LILO ��Ʈ �Ŵ����� ����Ϸ� �Ѵٸ�, �����ؼ� /boot ��Ƽ���� �߰��Ͻʽÿ�."
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "��ſ� ``%s''�� ����մϴ�"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "``�𸶿�Ʈ''�� ���� ����ϼ���"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "%s�� ��Ƽ�� ������ ������ �� ��Ƽ�ǳ��� ��� �ڷḦ �Ұ� �˴ϴ�."
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "����Ͻðڽ��ϱ�?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "������ ���� �ʰ� �����Ͻðڽ��ϱ�?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "��Ƽ���� ������� �ʰ� �����Ͻðڽ��ϱ�?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "��Ƽ�� ���� ����"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
 msgstr "� ��Ƽ�� �������� �ٲٽðڽ��ϱ�?"
 
-#: ../../diskdrake.pm_.c:483
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "%s������ ��� ���������� ����Ʈ �Ͻðڽ��ϱ�?"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "��ġ %s�� ��� ����Ʈ �Ͻðڽ��ϱ�?"
 
-#: ../../diskdrake.pm_.c:489
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1012,38 +1222,38 @@ msgstr ""
 "�����ϴ�.\n"
 "loopback�� ���� �����Ͻʽÿ�."
 
-#: ../../diskdrake.pm_.c:508
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "%s ��Ƽ���� �����ϸ�, ��� ����Ÿ�� �Ұ� �˴ϴ�."
 
-#: ../../diskdrake.pm_.c:510
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "loopback filed�� %s ������"
 
-#: ../../diskdrake.pm_.c:512 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "%s ��Ƽ�� ������"
 
-#: ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "��� ��Ƽ���� ��������,"
 
-#: ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "��� ��Ƽ���� ��� ����Ÿ�� �ҰԵ˴ϴ�."
 
-#: ../../diskdrake.pm_.c:527
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "�̵�"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "� ��ũ�� �̵��ϰ� �����ʴϱ�?"
 
@@ -1072,79 +1282,84 @@ msgstr "%s ����̺��� ��Ƽ�� ���̺��� �����մϴ�."
 msgid "You'll need to reboot before the modification can take place"
 msgstr "����Ȱ��� �����ϱ� ���ؼ� �������� �ʿ��մϴ�."
 
-#: ../../diskdrake.pm_.c:569 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "���� ���Ͻ�Ʈ���� ���� �����"
 
-#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:618
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "ũ�⺯��"
 
-#: ../../diskdrake.pm_.c:585
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "� ��Ƽ�� �������� �ٲٽðڽ��ϱ�?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "�� ��Ƽ���� ��� ����Ÿ�� ����Ͽ��� �մϴ�."
 
-#: ../../diskdrake.pm_.c:587
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "%s ��Ƽ���� ũ�⸦ �����ϸ�, ��� ����Ÿ�� �ҰԵ˴ϴ�."
 
-#: ../../diskdrake.pm_.c:597
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "���ο� ũ�⸦ ������ �ֽʽÿ�"
 
-#: ../../diskdrake.pm_.c:597 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:652
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "�� ��Ƽ�� �����"
 
-#: ../../diskdrake.pm_.c:672
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "���� ����: "
 
-#: ../../diskdrake.pm_.c:676 ../../diskdrake.pm_.c:750
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "ũ��(MB) :"
 
-#: ../../diskdrake.pm_.c:679 ../../diskdrake.pm_.c:753
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "���Ͻý��� ����: "
 
-#: ../../diskdrake.pm_.c:682
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:729 ../../install_steps.pm_.c:132
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "�� ��Ƽ���� loopback���� ���ɼ� �����ϴ�."
 
-#: ../../diskdrake.pm_.c:739
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:749
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "������ ���� �̸�: "
 
-#: ../../diskdrake.pm_.c:775
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr ""
 "������ �Ǵٸ� �����鿡 ���ؼ� ���ǰ� �ֽ��ϴ�, �ٸ����� ������ �ֽʽÿ�"
 
-#: ../../diskdrake.pm_.c:776
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "������ �̹� �����մϴ�. �װ��� ����մϱ�?"
 
-#: ../../diskdrake.pm_.c:798 ../../diskdrake.pm_.c:814
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "������ �������ֽʽÿ�"
 
-#: ../../diskdrake.pm_.c:807
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1152,11 +1367,11 @@ msgstr ""
 "����� ��Ƽ���� ũ�Ⱑ �����ʽ��ϴ�.\n"
 "����Ͻðڽ��ϱ�?"
 
-#: ../../diskdrake.pm_.c:815
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "���"
 
-#: ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1164,77 +1379,77 @@ msgstr ""
 "�÷��� ��ũ�� ����̺꿡 �����ʽÿ�\n"
 "�÷��� ��ũ�� ��� �ڷḦ �Ұ� �˴ϴ�."
 
-#: ../../diskdrake.pm_.c:830
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "��Ƽ�� ���̺��� ���޺��� �Ͻðڽ��ϱ�?"
 
-#: ../../diskdrake.pm_.c:841
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "��ġ"
 
-#: ../../diskdrake.pm_.c:842
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "����"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "ũ��"
 
-#: ../../diskdrake.pm_.c:855
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "�߰��� ���̵带 �����Ͻʽÿ�"
 
-#: ../../diskdrake.pm_.c:856
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr ""
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s ���� ����(����̺� %s)"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "%s�� %s �����̹Ƿ� �����Ҽ� �����ϴ�."
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "nfs ����Ʈ ����"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "����Ʈ ����: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "%s�� �𸶿�Ʈ�� �����߻�: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "����Ʈ ��ġ�� �ݵ�� /�� �����Ͽ��� �մϴ�."
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "����Ʈ ��ġ %s�� �̹� �����մϴ�.\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "��ȯ ����Ʈ %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "%s�� �������� ������ �����߻�: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1242,51 +1457,81 @@ msgstr ""
 "���� �߻� - ���ο� ���� �ý����� ���� � �ùٸ� ��ġ�� ã�� �� �����ϴ�.�� "
 "������ �ذ��Ͻ÷���, �ϵ��� ������ ���ñ� �ٶ��ϴ�."
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "� ��Ƽ�ǵ� �������� �ʽ��ϴ�."
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "��ġ �� �ý��� ���ÿ� ����� �� �������ֽʽÿ�."
 
-#: ../../help.pm_.c:10
+#: ../../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 "���� ����Ʈ���� ����� Ű���� ���̾ƿ��� ��ġ�ϴ°��� �����Ͻʽÿ�"
 
-#: ../../help.pm_.c:13
+#: ../../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
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"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"
-"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).\n"
 "\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
-"  - 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"
+"\t* Recommanded: 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"
-"  - 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"
+"\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1294,40 +1539,38 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 #, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "����:\n"
 "\n"
@@ -1362,310 +1605,720 @@ msgstr ""
 "  ��� ������), ��������(NIS), �����ͺ��̽� ������ ��Ÿ ��� ��밡���ϴ�.\n"
 "  � ������ ��ġ(KDE�� GNOME����) ������ ��ġ�ɰ��̶� ������� ���ʽÿ�.\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 ""
+
+#: ../../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"
+"\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"
-"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"
+"\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"
-"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"
+"\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"
-"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."
+"\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 ""
-"DrakX�� �켱 �ϳ� �̻��� PCI SCSI �ƴ��Ͱ� �ִ��� �˻��մϴ�.\n"
-"���� �߰ߵǰ�, �װ��� �˷��� ����̹��� ����Ѵٸ� �ڵ����� \n"
-"�� ����� �ε��Ұ��Դϴ�.\n"
+
+#: ../../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"
+"\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"
+"\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"
+msgstr ""
+
+#: ../../help.pm_.c:218
+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"
-"���� ����� SCSIī�尡 ISA �̰ų�, PCI���� DrakX�� �𸣴� ������\n"
-"����̹��� ����ϴ°��̳� SCSIī�尡 �ƿ� �������� ������ �ִ���\n"
-"�������� ���� �����ؾ� �մϴ�. ���� ������ ���� �ʴٸ� \"�ƴϿ�\"\n"
-"�� �����Ͻð�, �ִٸ� \"��\"�� �����Ͻʽÿ�. ����̹� ����Ʈ��\n"
-"��Ÿ�����̰�, �ű⼭ �ش��ϴ� ī�带 �����Ͻʽÿ�.\n"
 "\n"
+"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"����̹��� ������ �Ŀ�, DrakX�� �ɼ��� �����ϱ� ���ϴ����� ������\n"
-"�Դϴ�. ����, �ڵ����� �ϵ��� �����ϵ��� �Ͻʽÿ�. ���� �� ��\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"
-"�� ��ġ ���̵忡�� �����ϴ� �ϵ���� ������ ���� ���ʽÿ�. �װ͵�����\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 ""
+
+#: ../../help.pm_.c:252
+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:94
+#: ../../help.pm_.c:257
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
+msgstr ""
+
+#: ../../help.pm_.c:267
+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"
-"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"
+"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"
-"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"
 "\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"
-"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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
+"IDE hard drives:\n"
 "\n"
-"- Ctrl-d  to delete a partition\n"
+"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-m  to set the mount point\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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
+
+#: ../../help.pm_.c:303
 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."
+"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 ""
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:358
 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."
+"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:161
+#: ../../help.pm_.c:363
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
+"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"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"Please be patient."
 msgstr ""
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:371
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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:180
+#: ../../help.pm_.c:376
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
-"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"
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
+msgstr ""
+
+#: ../../help.pm_.c:380
+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 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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"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:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+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:425
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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:225
+#: ../../help.pm_.c:437
+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:441
+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:445
 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:229
+#: ../../help.pm_.c:449
 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:233
+#: ../../help.pm_.c:453
 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 ""
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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:257
+#: ../../help.pm_.c:486
+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:490
+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:505
+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 ""
+
+#: ../../help.pm_.c:521
 msgid ""
-"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"
+"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 ""
+
+#: ../../help.pm_.c:542
+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"
-"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"
+"   * 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 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"
+"     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 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."
+"     If you want to acces a printer located on NetWare network, select "
+"\"NetWare\".\n"
 msgstr ""
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:567
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"Your printer has not been detected. Please enter the name of the device on\n"
+"which it is connected.\n"
 "\n"
 "\n"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"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:302
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+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 ""
+
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
 msgstr ""
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
 msgstr ""
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1689,34 +2342,33 @@ msgid ""
 "and maintenance purposes."
 msgstr ""
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
 msgstr ""
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1727,7 +2379,7 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1744,14 +2396,45 @@ msgid ""
 "\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."
 msgstr ""
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 ""
+
+#: ../../help.pm_.c:692
+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 ""
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -1763,57 +2446,61 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
 msgstr ""
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
 msgstr ""
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\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"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"\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"
+"\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."
 msgstr ""
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -1822,96 +2509,117 @@ msgid ""
 "the additional instructions."
 msgstr ""
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "��� ����"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "��ġ Ŭ���� ����"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "�ϵ� ��ũ ����"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "���콺 ����"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Ű���� ����"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "��Ÿ"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "���Ͻý��� ����"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "��Ƽ�� ����"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "��ġ�� ��Ű�� ����"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "�ý��� ��ġ"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "��Ʈ��ŷ ����"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "��ȣ"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "�ð��� ����"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "���� ����"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "������ ����"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "root �н����� ����"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "����� �߰�"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "��Ʈ ��ũ ����"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "��Ʈ �δ� ��ġ"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "X ����"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr ""
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "��ġ ������"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "$f ������ �д��߿� ������ ������ϴ�."
+
+#: ../../install_gtk.pm_.c:426
+#, fuzzy
+msgid "Please test the mouse"
+msgstr "� ������ ���콺�� ����Ͻʴϱ�?"
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "� ������ ���콺�� ����Ͻʴϱ�?"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -1921,220 +2629,238 @@ msgstr ""
 "�̸� ���ؼ�, ��Ƽ���� �����ϼ���. (�̹� �ִ� ��Ƽ���� Ŭ���ϰų�).\n"
 "�׸��� ����, ``����Ʈ ��ġ''�� Ŭ������ '/'���� �����Ͻʽÿ�."
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"�ϵ� ��ũ�� ��Ƽ�� ���̺��� ������ �����ϴ�. �ʹ������Ȱ� �����ϴ�. :(\n"
-"�߸��� ��Ƽ���� ���� ���� ����Ұ��Դϴ�."
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "���� ��Ƽ���� �ݵ�� �ʿ��մϴ�."
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"��ũ�巹ũ�� ��Ƽ�� ���̺��� ��Ȯ�� �о���µ� �����߽��ϴ�.\n"
-"����� �����(?)���� ����Ͻʽÿ�."
+"���� ��Ƽ���� �����ϴ�.\n"
+"\n"
+"��� �����մϱ�?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "��Ƽ ��Ƽ���� ã�� �ֽ��ϴ�."
+#: ../../install_interactive.pm_.c:68
+#, fuzzy
+msgid "Use free space"
+msgstr "���������� ���"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "����"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: �̰��� ��Ʈ ��Ƽ���� �ƴմϴ�. �ٸ����� ������ �ֽʽÿ�."
+#: ../../install_interactive.pm_.c:78
+#, fuzzy
+msgid "Use existing partition"
+msgstr "��Ƽ�� ����"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "��Ʈ ��Ƽ���� �����ϴ�."
+#: ../../install_interactive.pm_.c:80
+#, fuzzy
+msgid "There is no existing partition to use"
+msgstr "��Ƽ�� ���̺��� ���޺��� �Ͻðڽ��ϱ�?"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "NIS domain�� �ƴѰ����δ� ���Ʈĳ��Ʈ�� ����Ҽ� �����ϴ�."
+#: ../../install_interactive.pm_.c:87
+#, fuzzy
+msgid "Use the Windows partition for loopback"
+msgstr "���������� ���"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "$f ������ �д��߿� ������ ������ϴ�."
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Linux4Win�� �ִµ� ����� ��Ƽ���� ������ �ֽʽÿ�."
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "ũ�� ����"
 
-#: ../../install_steps.pm_.c:174
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr ""
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "��Ʈ ��Ƽ�� ũ��(MB): "
 
-#: ../../install_steps.pm_.c:318
-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"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "���� ��Ƽ�� ũ��(MB): "
+
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
 msgstr ""
 
-#: ../../install_steps.pm_.c:391
-#, c-format
-msgid "Welcome to %s"
-msgstr "%s�� ���Ű��� ȯ���մϴ�."
+#: ../../install_interactive.pm_.c:105
+#, fuzzy
+msgid "Which partition do you want to resize?"
+msgstr "� ��Ƽ�� �������� �ٲٽðڽ��ϱ�?"
 
-#: ../../install_steps.pm_.c:743
-msgid "No floppy drive available"
-msgstr "�÷��� ����̺긦 ����� �� �����ϴ�."
+#: ../../install_interactive.pm_.c:107
+#, fuzzy
+msgid "Computing Windows filesystem bounds"
+msgstr "���� ���Ͻ�Ʈ���� ���� �����"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "%s �ܰ�� �Ѿ�ϴ�.\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "���� ��Ƽ���� �ݵ�� �ʿ��մϴ�."
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"���� ��Ƽ���� �����ϴ�.\n"
-"\n"
-"��� �����մϱ�?"
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "��ġ�� ��Ű�� ����"
+#: ../../install_interactive.pm_.c:122
+#, fuzzy
+msgid "Which size do you want to keep for windows on"
+msgstr "� ���͸� �̵��ϰ� �����ʴϱ�?"
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "��ü ũ��: "
+#: ../../install_interactive.pm_.c:123
+#, fuzzy, c-format
+msgid "partition %s"
+msgstr "��Ƽ��"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "����: %s\n"
+#: ../../install_interactive.pm_.c:129
+#, fuzzy, c-format
+msgid "FAT resizing failed: %s"
+msgstr "�ڵ� ũ�� ���� ����"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "ũ��: %d KB\n"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "��ġ�ϰ��� �ϴ� ��Ű���� �����ϼ���."
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "����"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "��ġ"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "��ġ��"
+#: ../../install_interactive.pm_.c:156
+#, fuzzy, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "%s ��Ƽ���� ũ�⸦ �����ϸ�, ��� ����Ÿ�� �ҰԵ˴ϴ�."
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "��ø� ��ٸ�����, "
+#: ../../install_interactive.pm_.c:164
+#, fuzzy
+msgid "Expert mode"
+msgstr "������"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "���� �ð� "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "��ü �ð� "
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "��ġ �غ����Դϴ�"
+#: ../../install_interactive.pm_.c:171
+#, fuzzy, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"%s �ϵ� ����̺��� ��Ƽ�� �۾��� �� �� �ֽ��ϴ�.\n"
+"���� �Ϸ���, 'w'�� ���� �����ϴ°��� �������ʽÿ�."
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
-#, c-format
-msgid "Installing package %s"
-msgstr "%s ��Ű�� ��ġ��"
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "� ������ ��Ƽ�ǵ� ã�� �� �����ϴ�."
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "��� �����մϱ�?"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "���̻� ��Ƽ���� �߰��Ҽ� �����ϴ�."
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "��Ű���� �����ϴ��� �����߻�:"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "�̹� �ִ� X11 ������ ����Ͻðڽ��ϱ�?"
+#: ../../install_interactive.pm_.c:218
+#, fuzzy, c-format
+msgid "Partitioning failed: %s"
+msgstr "��Ƽ�� ����: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "���� ��ġ ������ �ϳ��� ������ �ֽʽÿ�."
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "��Ʈ������ ������"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "� ������ ��Ƽ�ǵ� ã�� �� �����ϴ�."
+#: ../../install_interactive.pm_.c:238
+#, fuzzy
+msgid "Bringing down the network"
+msgstr "��Ʈ������ ������"
+
+#: ../../install_steps.pm_.c:74
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Lnx4win�� ���� ����� ������ �����ϴ�."
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:375
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "�ڵ� ũ�� ���� ����"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "%s�� ���Ű��� ȯ���մϴ�."
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Linux4Win�� �ִµ� ����� ��Ƽ���� ������ �ֽʽÿ�."
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "�÷��� ����̺긦 ����� �� �����ϴ�."
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "ũ�� ����"
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "%s �ܰ�� �Ѿ�ϴ�.\n"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "��Ʈ ��Ƽ�� ũ��(MB): "
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "���� ��Ƽ�� ũ��(MB): "
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "���� ��ġ ������ �ϳ��� ������ �ֽʽÿ�."
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2143,7 +2869,7 @@ msgid ""
 "a percentage of 100%% will install all selected packages."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2153,103 +2879,190 @@ msgid ""
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "��ġ�� ��Ű���� �ۼ�������"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "��ġ�ϰ��� �ϴ� ��Ű���� �����ϼ���."
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "����"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "��ġ"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "������ �ڵ� �˻�"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Ʈ�� Ȯ��"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Ʈ�� ����"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "�׷캰/��Ű���� ���� ���"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "�߸��� ��Ű��"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "����: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "ũ��: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "�߿伺: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "��ü ũ��: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+#, fuzzy
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr "�� ��Ű���� ������ �����ϴ�. �̹� ��ġ �Ǿ����ϴ�."
+
+#: ../../install_steps_gtk.pm_.c:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "���� ��Ű������ ���ŵ˴ϴ�."
+
+#: ../../install_steps_gtk.pm_.c:387
+#, fuzzy
+msgid "The following packages are going to be removed"
+msgstr "���� ��Ű������ ��ġ/���� �ɰ̴ϴ�."
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "�� ��Ű���� ����/���� �Ҽ� �����ϴ�."
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "�̰��� �ǹ����� ��Ű���Դϴ�. �ݵ�� ���õǾ�� �ϴϴ�."
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "�� ��Ű���� ������ �����ϴ�. �̹� ��ġ �Ǿ����ϴ�."
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 #, fuzzy
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "�� ��Ű���� ������ �����ϴ�. �̹� ��ġ �Ǿ����ϴ�."
 
-#: ../../install_steps_gtk.pm_.c:493
-#, fuzzy
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr "�� ��Ű���� ������ �����ϴ�. �̹� ��ġ �Ǿ����ϴ�."
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "���� ��Ű������ ��ġ/���� �ɰ̴ϴ�."
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "�� ��Ű���� ����/���� �Ҽ� �����ϴ�."
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "��ġ��"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "������"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "��ø� ��ٸ�����, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "���� �ð� "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "��ü �ð� "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "���"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "��ġ �غ����Դϴ�"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d ��Ű��"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "%s ��Ű�� ��ġ��"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Accept"
+msgstr "����� �߰�"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2259,194 +3072,397 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "ũ������"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "��� �����մϱ�?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "��Ű���� �����ϴ��� �����߻�:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "���� ��Ű���� ��ġ�� ������ �߻��߽��ϴ�: "
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "���� �߻�"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "����� �� ������ �ֽʽÿ�."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Ű����"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Ű���� ���̾ƿ� ����"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr "��ġ�� �ٸ� �ٸ� �� �����Ҽ� �ֽ��ϴ�."
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "��Ʈ ��Ƽ��"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "�ý��ۿ��� ��Ʈ ��Ƽ��(/)�� ����Դϱ�?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "��ġ ����"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "��ġ ������ ������ �ֽʽÿ�."
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "��ġ/���׷��̵�"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "��ġ�� ���׷��̵� �Դϱ�?"
 
-#: ../../install_steps_interactive.pm_.c:110
-#, fuzzy
-msgid "Automated"
-msgstr "IP �ڵ� �Ҵ�"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "����ȭ"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
+#, fuzzy
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "������ ������ �Դϱ�? �峭�� �ƴմϴ�.\n"
 "�����ϰ� �Ҽ� �������� ����, ���� �ִ°͵��� �ſ� �����մϴ�."
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "���׷��̵�"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "�Ϲݻ����"
+#: ../../install_steps_interactive.pm_.c:222
+#, fuzzy
+msgid "Workstation"
+msgstr "����"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "�����ڿ�"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "����"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+#, fuzzy
+msgid "What is your system used for?"
 msgstr "� �뵵�� ����Ͻʴϱ�?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "� ������ ���콺�� ����Ͻʴϱ�?"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "���콺 ��Ʈ"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "� �ø��� ��Ʈ�� ���콺�� ����Ǿ� �ֳ���?"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "PCMCIS ī�� ȯ�漳����..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "IDE ������"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "��밡���� ��Ƽ���� �����ϴ�."
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "��Ʈ ��Ƽ������ ����� ��Ƽ���� ������ �ֽʽÿ�."
-
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "����Ʈ ��ġ�� ������ �ֽʽÿ�."
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, fuzzy, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"�ϵ� ��ũ�� ��Ƽ�� ���̺��� ������ �����ϴ�. �ʹ������Ȱ� �����ϴ�. :(\n"
+"�߸��� ��Ƽ���� ���� ���� ����Ұ��Դϴ�."
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"��ũ�巹ũ�� ��Ƽ�� ���̺��� ��Ȯ�� �о���µ� �����߽��ϴ�.\n"
+"����� �����(?)���� ����Ͻʽÿ�."
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "��Ʈ ��Ƽ��"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "�ý��ۿ��� ��Ʈ ��Ƽ��(/)�� ����Դϱ�?"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "��Ƽ�� ���̺� ��������� �����Ϸ��� �������� �ؾ� �մϴ�."
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "������ ��Ƽ���� �����Ͻʽÿ�"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "��� ���� �˻縦 �մϱ�?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "��Ƽ�� ����"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, fuzzy, c-format
 msgid "Creating and formatting file %s"
 msgstr "loopback ���� %s�� �����ϰ� ����"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "������ ��Ű���� ã�� �ֽ��ϴ�."
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "���׷��̵��� ��Ű���� �˻����Դϴ�."
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, fuzzy, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
+msgstr "�� ��Ű���� ������ �����ϴ�. �̹� ��ġ �Ǿ����ϴ�."
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Complete (%dMB)"
+msgstr "�Ϲݻ����"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Recommended (%dMB)"
+msgstr "������"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "����ȭ"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "��ġ�� ��Ű�� ����"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "��Ű�� �׷� ����"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "���� ��Ű�� ����"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2454,173 +3470,11 @@ msgstr ""
 " %s ��Ű�� ��ġ�� \n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "��ġ�� ȯ�漳��"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "���� IP������ ����"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "��Ʈ�� ȯ���� ���� �ٽ� ����"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "��Ʈ�� ������ ���� �ʽ��ϴ�."
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "��Ʈ�� ȯ�� ����"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "���� ��Ʈ���� �̹� �����Ǿ� �ֽ��ϴ�. ��� �Ͻðڽ��ϱ�?"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "���� ��Ʈ�� ������ �Ͻðڽ��ϱ�?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "��Ʈ�� ī�带 ã���� �����ϴ�"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "�� ����"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "������ ��ȭ���� ȯ���� �����Ͻðڽ��ϱ�?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "%s ��Ʈ�� ī�� ������"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"�� �ý����� ���� IP ������ �Է��� �ֽʽÿ�.\n"
-"������ �׸���� ��� �������̸� .���� ���е� IP �ּҷ� �Է��ϼž� �մϴ�.\n"
-"(��, 1.2.3.4)"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "IP �ڵ� �Ҵ�"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP �ּ�:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "�ݸ���ũ:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP �ּҴ� 1.2.3.4�� ���� �����̾�� �մϴ�."
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "��Ʈ�� ����"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"ȣ��Ʈ �̸��� �Է��� �ֽʽÿ�.\n"
-"ȣ��Ʈ �̸��� ``mybox.mylab.myco.com''�� ���� ������ ȣ��Ʈ \n"
-"�̸��̾�� �մϴ�. \n"
-"����Ʈ ���̰� �ִٸ� �� IP �ּҵ� �Է��ؾ� �մϴ�."
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS ����:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "����Ʈ���� ��ġ:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "����Ʈ����:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "ȣ��Ʈ �̸�:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "���� ã�����?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "� �ø��� ��Ʈ�� ���콺�� ����Ǿ� �ֳ���?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "��ȭ�ɱ� �ɼ�"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "���� �̸�"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "��ȭ ��ȣ"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "�α� ID"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "����� ����"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "��ũ��Ʈ ���"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "�͹̳� ���"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "������ �̸�"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "�� DNS ����"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "�� DNS ����"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2659,88 +3513,94 @@ msgid ""
 "USA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "��Ű���� ���� �̷� ����Ʈ�� ������ �ֽʽÿ�."
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "��밡���� ��Ű���� ����Ʈ�� �̷� ����Ʈ�� �����ؼ� �޽��ϴ�."
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "��ġ�� ��Ű�� ����"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
+#, fuzzy
 msgid "Which is your timezone?"
-msgstr "� �ð��븦 ����Ͻʴϱ�?"
+msgstr "� �뵵�� ����Ͻʴϱ�?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "�ϵ���� �ð��� GTM�� ������ �ֽ��ϱ�?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "� ��Ƽ�� �������� �ٲٽðڽ��ϱ�?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "��ȣ ����"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Shadow file���"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "MD5 ��ȣ ���"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "NIS ���"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "�� ��ȣ�� �ʹ� �ܼ��մϴ�.( ��� %d ���ڴ� �Ѿ�� �մϴ�)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "NIS ����"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS ������"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS ����"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "����� �߰�"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "����� �߰�"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(�̹� %s��(��) �߰��Ǿ����ϴ�.)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -2750,60 +3610,78 @@ msgstr ""
 "����� �Է�\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "���� �̸�"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "����� ���̵�"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "�� ��ȣ�� �ʹ� �ܼ��մϴ�."
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "����� ���̵� �Է��� �ֽʽÿ�"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "���� ���̵�� ���� �ҹ��ڳ� ����, '-' �׸��� '_' �� ���Եɼ� �ֽ��ϴ�."
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "�� ���� ���̵�� �̹� �߰��Ǿ����ϴ�."
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "ù��° �÷��� ����̺�"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "�ι�° �÷��� ����̺�"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "����"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -2817,182 +3695,146 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "�˼��մϴ�. ��밡���� �÷��� ����̺갡 �����ϴ�."
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "��Ʈ ��ũ�� ���鶧 ����� �÷��� ����̺긦 ������ �ֽʽÿ�"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "�÷��� ��ũ�� %s ����̺꿡 �����ʽÿ�"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "��Ʈ ��ũ ������"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "LILO ��ġ ����. ������ ���� ������ �߻��߽��ϴ�:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "SILO�� ����Ͻðڽ��ϱ�?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "SILO �� �ɼ�"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "��Ƽ��"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "�� �̸��� ���� ������Դϴ�."
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "SILO ���� ����. ������ ���� ������ �߻��߽��ϴ�:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "��Ʈ �δ� �غ���"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
+#, fuzzy
 msgid "Do you want to use aboot?"
-msgstr "aboot�� ����Ͻðڽ��ϱ�?"
+msgstr "SILO�� ����Ͻðڽ��ϱ�?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "������ ȯ�漳��"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "�� ������"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP ������"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "������ �̸��� httP://... �̾�� �մϴ�."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "������ �̸��� ftp://... �̾�� �մϴ�."
+#: ../../install_steps_interactive.pm_.c:925
+#, fuzzy
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "LILO ��ġ ����. ������ ���� ������ �߻��߽��ϴ�:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "���ȿ� �Ű�Ⱦ�"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "���� �̾���"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "����"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "����"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "�ְ��� ����"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "���μ��� ����"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(����Ÿ ������ ����ų���� �ֽ��ϴ�)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "�ϵ� ����̺긦 ����ȭ�ϰڽ��ϱ�?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "���� �ܰ踦 ������ �ּ���"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "��Ȯ�� RAM ũ�⸦ �Է��� �ּ��� (found %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "�̵��� ������ġ �̵�� �ڵ� ����Ʈ"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "���ý� /tmp ���丮 �ڵ� û��"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "���� profiles ����"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "���۽� num lockŰ ���"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "�� ũ�⸦ MB�� �Է��ϼ���"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "���� ���� ���������� supermount�� ����� �� �����ϴ�."
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "PCI ��ġ���� ã���ϱ�?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "�̹� �ִ� X11 ������ ����Ͻðڽ��ϱ�?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s ����̺꿡 �� �÷��� ��ũ�� �����ʽÿ�"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "�ڵ� ��ġ �÷��� ��ũ ����"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3002,7 +3844,7 @@ msgstr ""
 "\n"
 "���� ���� ���� �Ͻðڽ��ϱ�?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3022,146 +3864,18 @@ msgstr ""
 "��ġ�� �ý��� ������ ���� ������ ���� �ǵ巹��ũ ������ ���� ���̵带\n"
 "�����Ͻñ� �ٶ��ϴ�."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "�ý��� ����"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "%sī�� ����̹� %s ��ġ��"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(%s ��� ���)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "� %s ����̹��� �õ��� ���ϱ�?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "�ڵ��˻�"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "�ɼ� ����"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"%s ����� �о���̴µ� �����߽��ϴ�.\n"
-"�ٸ� ������ �ٽ� �õ��� ���ðڽ��ϱ�?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "PCMCIAī�带 �˻��Ͻðڽ��ϱ�?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "PCMCIS ī�� ȯ�漳����..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "%s ��ġ���� ã���ϱ�?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "%s %s ī�尡 �߰ߵǾ����ϴ�."
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "�� �ٸ����� ������ ��ʴϱ�?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "�� �ٸ� %s �������̽� ī�带 ������ ��ʴϱ�?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "�ƴϿ�"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "��"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "�ϵ���� ������ ������"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "��Ʈ������ ������"
-
-#: ../../install_steps_interactive.pm_.c:1207
-#, fuzzy
-msgid "Bringing down the network"
-msgstr "��Ʈ������ ������"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "������-�ǵ巹��ũ ��ġ %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 " <Tab>/<Alt-Tab> �׸� �̵�        |  <Space> ����      |  <F12> ���� ȭ��"
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"%s �ϵ� ����̺��� ��Ƽ�� �۾��� �� �� �ֽ��ϴ�.\n"
-"���� �Ϸ���, 'w'�� ���� �����ϴ°��� �������ʽÿ�."
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "��ٷ� �ּ���"
 
@@ -3171,7 +3885,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr ""
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "�߸��� �����Դϴ�, �ٽ� �ϼ���\n"
 
@@ -3185,465 +3899,991 @@ msgstr " ? (�⺻ %s) "
 msgid "Your choice? (default %s) "
 msgstr "����� ������? (�⺻ %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "�����ϼ��� (�⺻�� %s �̸�, `none' �Է½� ����) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "ü��"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "����"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "�庸��"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "�ɶ���"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "�븣����"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "���þ�"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "����"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "�̱�"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "�̱� (������)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "�̱� (Ÿ�ڱ�)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "���⿡"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "�Ұ�����"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "����� (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 #, fuzzy
 msgid "Belarusian"
 msgstr "�Ұ�����"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "������ (����)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "������ (�Ҿ�)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "���� (dead Ű ����)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "����ũ"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+#, fuzzy
+msgid "Dvorak (US)"
+msgstr "�庸��"
+
+#: ../../keyboard.pm_.c:139
+#, fuzzy
+msgid "Dvorak (Norwegian)"
+msgstr "�븣����"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "������Ͼ�"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "�׸���"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "�밡��"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "ũ�ξ�Ƽ��"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "�̽���"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+#, fuzzy
+msgid "Iranian"
+msgstr "��Ż����"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "���̽�����"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "��Ż����"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "��ƾ �Ƹ޸�ī"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "�׵�����"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 #, fuzzy
 msgid "Lithuanian AZERTY (old)"
 msgstr "�����ƴϾ� AZERTY"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 #, fuzzy
 msgid "Lithuanian AZERTY (new)"
 msgstr "�����ƴϾ� AZERTY"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr ""
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr ""
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "������Į"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "ĳ���� (����)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "���ι�Ű��"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "�±�"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "US Ű���� (����)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr ""
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "���� ������ (��ƾ ���̾ƿ�)"
 
-# 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.
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - ���콺"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "������ ���콺��/�۽�Ʈ���콺 (�ø���)"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "����ũ�μ���Ʈ ���ڸ����콺"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "ALPS �۶��̵�����Ʈ"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "�˽��� ��ŷ ���콺"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "���Ͼ �ݸ��콺"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "���Ͼ �ݽ�ũ��"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "�Ϲ����ΰ͵�"
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "����"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "����ũ�μ���Ʈ ���ڸ����콺 (�ø���)"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "�Ϲ����� 2��ư ���콺"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "�Ϲ����� 3��ư ���콺"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "������ ���콺��/�۽�Ʈ���콺"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "���콺 �ý��� (�ø���)"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "������ CC �ø��� (�ø���)"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "������ ���콺��+/�۽�Ʈ���콺+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM �ø���"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM ��ƮŸ����"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "������ ���콺 (�ø���, ������ C7 ����)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "���콺 ����"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+#, fuzzy
+msgid "none"
+msgstr "�Ϸ�"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "���콺 ����"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "�̰��� �½��ϱ�?"
+
+#: ../../netconnect.pm_.c:93
+#, fuzzy
+msgid "Internet configuration"
+msgstr "������ ȯ�漳��"
+
+#: ../../netconnect.pm_.c:94
+#, fuzzy
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "�� ������ �׽�Ʈ�� ���ðڽ��ϱ�?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "��Ʈ��ŷ ����"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "� ��ũ�� �̵��ϰ� �����ʴϱ�?"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "���� �̸�"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+#, fuzzy
+msgid "ISDN Configuration"
+msgstr "ȯ�漳��"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "������ ȯ�漳��"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr ""
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr ""
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr ""
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:169
+#, fuzzy
+msgid "Provider phone number"
+msgstr "��ȭ ��ȣ"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr ""
+
+#: ../../netconnect.pm_.c:172
+#, fuzzy
+msgid "Dialing mode"
+msgstr "������ �̸�"
+
+#: ../../netconnect.pm_.c:174
+#, fuzzy
+msgid "Account Login (user name)"
+msgstr "����Ʈ ��ġ"
+
+#: ../../netconnect.pm_.c:175
+#, fuzzy
+msgid "Account Password"
+msgstr "��ȣ"
+
+#: ../../netconnect.pm_.c:176
+#, fuzzy
+msgid "Confirm Password"
+msgstr "��ȣ"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "�׽�Ʈ ����"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:214
+#, fuzzy
+msgid "Which protocol do you want to use ?"
+msgstr "� ��Ƽ�� �������� �ٲٽðڽ��ϱ�?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr ""
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr ""
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr ""
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:239
+#, fuzzy
+msgid "Continue"
+msgstr "����Ͻðڽ��ϱ�?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr ""
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:257
+#, fuzzy
+msgid "Which is your ISDN card ?"
+msgstr "� �ð��븦 ����Ͻʴϱ�?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:287
+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 ""
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr ""
+
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "���ο� ũ�⸦ ������ �ֽʽÿ�"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "� �ø��� ��Ʈ�� ���콺�� ����Ǿ� �ֳ���?"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
+"Do you agree?"
 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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "�ü�� �������� GRUB�� ���Ű� ȯ���մϴ�."
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "�� ������ �׽�Ʈ�� ���ðڽ��ϱ�?"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "%cŰ�� %c�� ����Ͽ� ������ �׸��� �����Ͽ� �ֽʽÿ�."
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "ȯ�漳��"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "���õ� �ü���� �����ҷ��� ���͸�, �����ҷ��� 'e'�� �����ּ���."
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "aboot�� ����Ͻðڽ��ϱ�?"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "������ ���ɵ� �Ǵ�, �������� ���ؼ��� 'c'�����ּ���."
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "���� ã�����?"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "������ �׸����� %d���� �ڵ����� ���õ˴ϴ�."
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "� �ø��� ��Ʈ�� ���콺�� ����Ǿ� �ֳ���?"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:544
+#, fuzzy
+msgid "Dialup options"
+msgstr "�ɼ� ����"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "���� �̸�"
+
+#: ../../netconnect.pm_.c:546
+#, fuzzy
+msgid "Phone number"
+msgstr "��ȭ ��ȣ"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "�α� ID"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "����� ����"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
 msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "����ũž"
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "��ũ��Ʈ ���"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "���� �޴�"
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "�͹̳� ���"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - ���콺"
+#: ../../netconnect.pm_.c:550
+#, fuzzy
+msgid "Domain name"
+msgstr "���� �̸�"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB ���콺"
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "�� DNS ����"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "���� ADB ���콺 (2 ��ư)"
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "�� DNS ����"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "���� ADB ���콺 (3+ ��ư)"
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "���� �̸�"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "���� USB ���콺"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "��Ʈ��ŷ ����"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "���� USB ���콺 (2 ��ư)"
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "� ��ũ�� �̵��ϰ� �����ʴϱ�?"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "���� USB ���콺 (3+ ��ư)"
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "�Ϲ����� ���콺 (PS/2)"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "� ��ũ�� �̵��ϰ� �����ʴϱ�?"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "������ ���콺��/�۽�Ʈ���콺 (PS/2)"
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "���� �̸�"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "�Ϲ����� 3��ư ���콺 (PS/2)"
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "���� �̸�"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS �۶��̵�����Ʈ (PS/2)"
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "��Ʈ��ŷ ����"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "������ ���콺��+/�۽�Ʈ���콺+ (PS/2)"
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "������ ������"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "�˽��� ��ŷ ���콺 (PS/2)"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr ""
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII ���̸��콺 (PS/2)"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "��Ʈ��ŷ ����"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "���Ͼ �ݸ��콺 (PS/2)"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "��Ʈ��ŷ ����"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "���Ͼ �ݸ��콺 ���� (PS/2)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr ""
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "���Ͼ �ݽ�ũ�� (PS/2)"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "������"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "����ũ�μ���Ʈ ���ڸ����콺 (PS/2)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+#, fuzzy
+msgid "Connect to the Internet"
+msgstr "���� �̸�"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI ���� ���콺"
+#: ../../netconnect.pm_.c:672
+#, fuzzy
+msgid "What kind is your ISDN connection?"
+msgstr "� �ø��� ��Ʈ�� ���콺�� ����Ǿ� �ֳ���?"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "����ũ�μ���Ʈ ���� ���콺"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "��Ʈ��ŷ ����"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "������ ���� ���콺"
+#: ../../netconnect.pm_.c:700
+#, fuzzy
+msgid "France"
+msgstr "���"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB ���콺"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr ""
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB ���콺 (3��ư �̻�)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr ""
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "���콺 ����"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr ""
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "����ũ�μ���Ʈ Rev 2.1A �̻� (�ø���)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "������"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "������ CC �ø��� (�ø���)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "������ ���콺��+/�۽�Ʈ���콺+ (�ø���)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII ���̸��콺 (�ø���)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "���Ͼ �ݸ��콺 (�ø���)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "����ũ�μ���Ʈ ���ڸ����콺 (�ø���)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "��Ʈ��ŷ ����"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM �ø��� (�ø���)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "� ��Ƽ�� �������� �ٲٽðڽ��ϱ�?"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM ��ƮŸ���� (�ø���)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "��Ʈ��ŷ ����"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "������ ���콺 (�ø���, ������ C7 ����)"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "��Ʈ��ŷ ����"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "������ ���콺��/�۽�Ʈ���콺 (�ø���)"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "��Ʈ�� ȯ�� ����"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "�Ϲ����� ���콺 (�ø���)"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "�� ������ �׽�Ʈ�� ���ðڽ��ϱ�?"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "����ũ�μ���Ʈ ȣȯ (�ø���)"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "��Ʈ��ŷ ����"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "�Ϲ����� 3��ư ���콺 (�ø���)"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "���� �̸�"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "���콺 �ý��� (�ø���)"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "���� ��Ʈ���� �̹� �����Ǿ� �ֽ��ϴ�. ��� �Ͻðڽ��ϱ�?"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "�̰��� �½��ϱ�?"
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "� ��ũ�� �̵��ϰ� �����ʴϱ�?"
+
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "��Ʈ�� ȯ�� ����"
+
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
+
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "��Ʈ�� ī�带 ã���� �����ϴ�"
+
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "��Ʈ�� ����"
+
+#: ../../network.pm_.c:274
+#, fuzzy
+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"
+"ȣ��Ʈ �̸��� ``mybox.mylab.myco.com''�� ���� ������ ȣ��Ʈ \n"
+"�̸��̾�� �մϴ�. \n"
+"����Ʈ ���̰� �ִٸ� �� IP �ּҵ� �Է��ؾ� �մϴ�."
 
-#: ../../partition_table.pm_.c:527
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+#, fuzzy
+msgid "Host name"
+msgstr "ȣ��Ʈ �̸�:"
+
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+
+#: ../../network.pm_.c:302
+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 ""
+"�� �ý����� ���� IP ������ �Է��� �ֽʽÿ�.\n"
+"������ �׸���� ��� �������̸� .���� ���е� IP �ּҷ� �Է��ϼž� �մϴ�.\n"
+"(��, 1.2.3.4)"
+
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "%s ��Ʈ�� ī�� ������"
+
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "IP �ڵ� �Ҵ�"
+
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "IP address"
+msgstr "IP �ּ�:"
+
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Netmask"
+msgstr "�ݸ���ũ:"
+
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr ""
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP �ּҴ� 1.2.3.4�� ���� �����̾�� �մϴ�."
+
+#: ../../network.pm_.c:341
+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 ""
+"ȣ��Ʈ �̸��� �Է��� �ֽʽÿ�.\n"
+"ȣ��Ʈ �̸��� ``mybox.mylab.myco.com''�� ���� ������ ȣ��Ʈ \n"
+"�̸��̾�� �մϴ�. \n"
+"����Ʈ ���̰� �ִٸ� �� IP �ּҵ� �Է��ؾ� �մϴ�."
+
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "DNS ����:"
+
+#: ../../network.pm_.c:347
+#, fuzzy
+msgid "Gateway"
+msgstr "����Ʈ����:"
+
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "����Ʈ���� ��ġ:"
+
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "��ġ�� ȯ�漳��"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "�� ������"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP ������"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "������ �̸��� httP://... �̾�� �մϴ�."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "������ �̸��� ftp://... �̾�� �մϴ�."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: ../../partition_table.pm_.c:545
+#: ../../partition_table.pm_.c:558
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions"
 msgstr "��Ƽ�� ���̺����� �� ������ ������ ����Ҽ��� �����ϴ�."
 
-#: ../../partition_table.pm_.c:634
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s ������ �д��� ������ �߻��Ͽ����ϴ�."
 
-#: ../../partition_table.pm_.c:641
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr ""
 
-#: ../../partition_table.pm_.c:643
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr ""
 
-#: ../../partition_table.pm_.c:664
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr ""
@@ -3677,42 +4917,55 @@ msgstr "��� �ִ� ��Ű��( ^^ )"
 msgid "maybe"
 msgstr "��ġ�ϴ°��� �������� ( ^^; )"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "����ȭ ��Ű�� (�߿���) "
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "����ȭ ��Ű�� (�ſ� ����)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "����ȭ ��Ű�� (����)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "�ܼ��ϰ�"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "�����ϰ�"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "���� ����� ������"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+#, fuzzy
+msgid "Remote printer"
+msgstr "�׸� ����"
+
+#: ../../printer.pm_.c:21
+#, fuzzy
+msgid "Remote CUPS server"
+msgstr "����Ʈ ȣ��Ʈ ť"
+
+#: ../../printer.pm_.c:22
+#, fuzzy
+msgid "Remote lpd server"
 msgstr "����Ʈ ������"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "�ݿ��� ������ �ɼ�"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "������ �ý��ۿ� ����� ������"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "�뺧 �ݿ���"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr ""
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "��ġ�� �˻��ϰ� �ֽ��ϴ�..."
@@ -3726,44 +4979,44 @@ msgstr "��Ʈ �˻�"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 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."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "����Ʈ ȣ��Ʈ�̸�"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "����Ʈ ȣ��Ʈ ť"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) ������ �ɼ�"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -3772,27 +5025,27 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "SMB ���� ȣ��Ʈ"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "SMB ���� IP"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "���� �̸�"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "�۾� �׷�"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "�ݿ��� ������ �ɼ�"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -3800,130 +5053,155 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "�ݿ��� ������ �ɼ�"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "������ ������"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "���� �̾���"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "���� �μ⸦ �Ͻðڽ��ϱ�?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "���� ������ �μ�..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"���� �μ� �������� ������ �������� ���½��ϴ�.\n"
+"������ �Ǳ���� �ణ�� �ð��� �ɸ� �� �ֽ��ϴ�.\n"
+"������ ��Ȳ: \n"
+"%s\n"
+"\n"
+"�ٸ��� �μ�Ǿ����ϱ�?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"���� �μ� �������� ������ �������� ���½��ϴ�.\n"
+"������ �Ǳ���� �ణ�� �ð��� �ɸ� �� �ֽ��ϴ�.\n"
+"�ٸ��� �μ�Ǿ����ϱ�?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "���� ũ��"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "���� �μ⸦ �Ͻðڽ��ϱ�?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "���� ������ �μ�..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"���� �μ� �������� ������ �������� ���½��ϴ�.\n"
-"������ �Ǳ���� �ణ�� �ð��� �ɸ� �� �ֽ��ϴ�.\n"
-"������ ��Ȳ: \n"
-"%s\n"
-"\n"
-"�ٸ��� �μ�Ǿ����ϱ�?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"���� �μ� �������� ������ �������� ���½��ϴ�.\n"
-"������ �Ǳ���� �ణ�� �ð��� �ɸ� �� �ֽ��ϴ�.\n"
-"�ٸ��� �μ�Ǿ����ϱ�?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "������"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "�����͸� �����Ͻðڽ��ϱ�?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -3931,19 +5209,64 @@ msgstr ""
 "������ ���� ������ ť���� �ֽ��ϴ�.\n"
 "�� �߰��� �ϰų� �����ϴ°��� �����մϴ�."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "������"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "������ �������� ������ �ֽʽÿ�"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "�����Ͱ� ����Ǿ� �ֽ���K?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+#, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "������ �������� ������ �ֽʽÿ�"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "ť ����"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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 ""
+
+#: ../../printerdrake.pm_.c:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "���� ����� ������"
+
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "�ɼ� ����"
+
+#: ../../printerdrake.pm_.c:406
+#, fuzzy
+msgid "Location"
+msgstr "����"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -3951,45 +5274,45 @@ msgid ""
 "connected?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "������ ť"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Spool ���丮"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "������ ������"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr ""
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr ""
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr ""
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr ""
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr ""
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anancron�� �ֱ����� ���� �����췯 �Դϴ�."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -3997,7 +5320,7 @@ msgstr ""
 "apmd�� ���͸� ���¿� syslog�� ���ļ� �α� ����� �����ϴµ� ���˴ϴ�.\n"
 "���� ���͸����� �̾��Ҷ� �ڵ����� �ý����� �˴ٿ� �����ִ� ��ɵ� �մϴ�."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4005,7 +5328,7 @@ msgstr ""
 "������ �ð��� �ѹ��� �ϳ��� �����ŵ�ϴ�. at�� batch ���ɵ��� �ý���\n"
 "�ε����� ������ �����ŵ�ϴ�."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4016,7 +5339,7 @@ msgstr ""
 "���α׷��̴�. vixie cron�� �⺻ UNIX Cron�� ���ȼ��� ��ɼ��� ����Ų ȯ��\n"
 "���� �ɼ��� �߰��ߴ�. �͵��� �߰��ߴ�."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4024,13 +5347,13 @@ msgid ""
 "and includes support for pop-up menus on the console."
 msgstr ""
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
 msgstr ""
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4040,51 +5363,51 @@ msgid ""
 "all of the services it is responsible for."
 msgstr ""
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
 "You should leave this enabled for most machines."
 msgstr ""
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP networks.\n"
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4092,7 +5415,7 @@ msgid ""
 "it installed on machines that don't need it."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4100,44 +5423,44 @@ msgid ""
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr ""
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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:66
+#: ../../services.pm_.c:67
 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."
@@ -4145,46 +5468,197 @@ msgstr ""
 "Syslog�� ���� ������� �α� �޼����� ���� ������ �ý��� �α� ���Ϸ�\n"
 "����µ� �����մϴ�. �׻� Syslog�� �����Ű�°��� �����ϴ�."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr "�� ���� ��ũ��Ʈ�� usb mouse�� ����Ҽ� �ֵ��� ����� �ε��� �ݴϴ�."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "�ý��� ���ð� ����ÿ� X ��Ʈ ���� ���۰� ����"
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "���ýÿ� �ڵ����� ���۵� ���񽺸� ������ �ֽʽÿ�."
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
+"�ϵ� ��ũ�� ��Ƽ�� ���̺��� ������ �����ϴ�. �ʹ������Ȱ� �����ϴ�. :(\n"
+"�߸��� ��Ƽ���� ���� ���� ����Ұ��Դϴ�."
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "LILO/GRUB ����"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "��Ʈ ��ũ ����"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr ""
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "����"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "LILO ��ġ ����. ������ ���� ������ �߻��߽��ϴ�:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+msgid "disable"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "X ����"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+msgid "enable"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+#, fuzzy
+msgid "Internet Connection Sharing"
+msgstr "������ ������"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "������ �̸�"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "IDE ������"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "�����մϴ�"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4232,23 +5706,30 @@ msgstr ""
 msgid "Choose the tool you want to use"
 msgstr ""
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "�ػ� ����"
+
+#: ../../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 ""
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "� ������ ���콺�� ����Ͻʴϱ�?"
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr ""
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "3��ư ���ķ���Ʈ?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "� �ø��� ��Ʈ�� ���콺�� ����Ǿ� �ֳ���?"
 
@@ -4457,6 +5938,435 @@ msgstr ""
 msgid "Finding leaves takes some time"
 msgstr ""
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "������ ȯ�漳��"
+
+#, fuzzy
+msgid "Internet"
+msgstr "��� �ִ� ��Ű��( ^^ )"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+#, fuzzy
+msgid "Office"
+msgstr "���� ��Ű��"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "��Ƽ�̵��"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "��Ƽ�̵��"
+
+# ../../share/compssUsers
+msgid "KDE"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "��Ƽ�̵��"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "��Ƽ�̵��"
+
+#, fuzzy
+msgid "Gnome"
+msgstr "�Ϸ�"
+
+#, fuzzy
+msgid "Documentation"
+msgstr "����� ����"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "��Ƽ�̵��"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "��ġ�� ��Ű�� ����"
+
+#~ msgid "Total size: "
+#~ msgstr "��ü ũ��: "
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "��Ʈ�� ȯ���� ���� �ٽ� ����"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "���� �̸�"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "���� �̸�"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "���� �̸�"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "���� �̸�"
+
+#, fuzzy
+#~ msgid "Germany"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "Germany (1TR6)"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "������ �ϱ� ���Ͻʴϱ�?"
+
+#, fuzzy
+#~ msgid "Install/Rescue"
+#~ msgstr "��ġ"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "ũ������"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "� ��Ƽ�� �������� �ٲٽðڽ��ϱ�?"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "���氪���� �����ڽ��ϱ�?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "������ ������"
+
+#~ msgid "Host name:"
+#~ msgstr "ȣ��Ʈ �̸�:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "� ������ ���콺�� ����Ͻʴϱ�?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "�ڵ� �ػ�"
+
+#~ 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"
+#~ msgstr ""
+#~ "��밡���� �ػ󵵸� ã�� ���� �ٸ� ��带 �����ϰ� �ֽ��ϴ�.\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?"
+#~ msgstr ""
+#~ "��� ������ �ػ󵵸� �˻��մϴ�. ( ��: 800x600) \n"
+#~ "������, �ý����� �ٿ��ų���� �ֽ��ϴ�.\n"
+#~ "����Ͻðڽ��ϱ�?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "�ùٸ� ��尡 �����ϴ�.\n"
+#~ "�ٸ� ���� ī�峪 ����͸� ������ ���ʽÿ�."
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "�ڵ� �ػ� ã��"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB ���콺"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "���� ADB ���콺 (2 ��ư)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "���� ADB ���콺 (3+ ��ư)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "���� USB ���콺"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "���� USB ���콺 (2 ��ư)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "���� USB ���콺 (3+ ��ư)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "�Ϲ����� ���콺"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII ���̸��콺"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "���Ͼ �ݸ��콺 ����"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI ���� ���콺"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "����ũ�μ���Ʈ ���� ���콺"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "������ ���� ���콺"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB ���콺"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB ���콺 (3��ư �̻�)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "����ũ�μ���Ʈ Rev 2.1A �̻� (�ø���)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "������ ���콺��+/�۽�Ʈ���콺+ (�ø���)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII ���̸��콺 (�ø���)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "���Ͼ �ݸ��콺 (�ø���)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "�Ϲ����� ���콺 (�ø���)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "����ũ�μ���Ʈ ȣȯ (�ø���)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "�Ϲ����� 3��ư ���콺 (�ø���)"
+
+#, fuzzy
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "�˽��� ��ŷ ���콺"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "nfs ����Ʈ ����"
+
+#~ msgid "Cryptographic"
+#~ msgstr "��ȣ"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "���� ��Ʈ�� ������ �Ͻðڽ��ϱ�?"
+
+#~ msgid "Show less"
+#~ msgstr "�ܼ��ϰ�"
+
+#~ msgid "Show more"
+#~ msgstr "�����ϰ�"
+
+#~ msgid "curly"
+#~ msgstr "�����Ӹ�"
+
+#~ msgid "default"
+#~ msgstr "�⺻"
+
+#~ msgid "tie"
+#~ msgstr "�Ż�"
+
+#~ msgid "brunette"
+#~ msgstr "����"
+
+#~ msgid "girl"
+#~ msgstr "����"
+
+#~ msgid "woman-blond"
+#~ msgstr "�ݹ߿���"
+
+#~ msgid "automagic"
+#~ msgstr "�ڵ�"
+
+#~ msgid "Normal"
+#~ msgstr "�Ϲݻ����"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "PCMCIAī�带 �˻��Ͻðڽ��ϱ�?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "%s ��ġ���� ã���ϱ�?"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "�� ����"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "������ ��ȭ���� ȯ���� �����Ͻðڽ��ϱ�?"
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "Lnx4win�� ���� ����� ������ �����ϴ�."
+
+#~ msgid "SILO main options"
+#~ msgstr "SILO �� �ɼ�"
+
+#~ msgid "This label is already in use"
+#~ msgstr "�� �̸��� ���� ������Դϴ�."
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "SILO ���� ����. ������ ���� ������ �߻��߽��ϴ�:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX�� �켱 �ϳ� �̻��� PCI SCSI �ƴ��Ͱ� �ִ��� �˻��մϴ�.\n"
+#~ "���� �߰ߵǰ�, �װ��� �˷��� ����̹��� ����Ѵٸ� �ڵ����� \n"
+#~ "�� ����� �ε��Ұ��Դϴ�.\n"
+#~ "\n"
+#~ "\n"
+#~ "���� ����� SCSIī�尡 ISA �̰ų�, PCI���� DrakX�� �𸣴� ������\n"
+#~ "����̹��� ����ϴ°��̳� SCSIī�尡 �ƿ� �������� ������ �ִ���\n"
+#~ "�������� ���� �����ؾ� �մϴ�. ���� ������ ���� �ʴٸ� \"�ƴϿ�\"\n"
+#~ "�� �����Ͻð�, �ִٸ� \"��\"�� �����Ͻʽÿ�. ����̹� ����Ʈ��\n"
+#~ "��Ÿ�����̰�, �ű⼭ �ش��ϴ� ī�带 �����Ͻʽÿ�.\n"
+#~ "\n"
+#~ "\n"
+#~ "����̹��� ������ �Ŀ�, DrakX�� �ɼ��� �����ϱ� ���ϴ����� ������\n"
+#~ "�Դϴ�. ����, �ڵ����� �ϵ��� �����ϵ��� �Ͻʽÿ�. ���� �� ��\n"
+#~ "���մϴ�.\n"
+#~ "\n"
+#~ "\n"
+#~ "���� �׷��� �ʴٸ�, ������ ��������(����� �ý��ۿ� ��ġ�Ǿ� �ִٸ�)\n"
+#~ "�� ��ġ ���̵忡�� �����ϴ� �ϵ���� ������ ���� ���ʽÿ�. �װ͵�����\n"
+#~ "����̹��� �ʿ�� �ϴ� �ɼ��� ������ �ٰ��Դϴ�."
+
+#~ msgid "Shutting down"
+#~ 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"
@@ -4478,9 +6388,6 @@ msgstr ""
 #~ "5.1(Venice), 5.2(Leloo), 5.3(Festen), 6.0(Venus), 6.1(Helios), Gold 2000\n"
 #~ "or 7.0(Air)."
 
-#~ msgid "Recommended"
-#~ msgstr "������"
-
 #~ msgid "useless"
 #~ msgstr "�������"
 
diff --git a/perl-install/share/po/lt.po b/perl-install/share/po/lt.po
index ee2cc34c1..edbe2bf11 100644
--- a/perl-install/share/po/lt.po
+++ b/perl-install/share/po/lt.po
@@ -1,56 +1,110 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # K�stutis Kru�ikas <DrKestas@takas.lt>, 1999
-# MykolasNorvaisas@cinotes.impro.mii.lt, 1999-2000
+# Mykolas Norvai�as <Myka@centras.lt>, 1999-2000
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-04 18:38+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 1999-11-02 20:54+0100\n"
-"Last-Translator: K�stutis Kru�ikas <DrKestas@takas.lt>\n"
+"Last-Translator: Mykolas Norvai�as <Myka@centras.lt>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:116 ../../Xconfigurator.pm_.c:236
-msgid "Generic"
-msgstr "Paprasta"
-
-#: ../../Xconfigurator.pm_.c:172
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Video plok�t�"
 
-#: ../../Xconfigurator.pm_.c:172
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Pasirinkite vaizdo plok�t�"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Pasirinkite X server�"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X serveris"
 
-#: ../../Xconfigurator.pm_.c:198
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree  %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Kuri� XFree konfiguracij� j�s norite tur�ti?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"J�s� korta palaiko 3D �renginio akseleracija tik su XFree %s.\n"
+"J�s� korta dirba su XFree %s kuris galb�t geriau palaiko 2D."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr "J�s� korta palaiko 3D akseleracija su XFree %s."
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s su 3D �renginio ekseleracija"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"J�s� korta palaiko 3D �renginio akseleracija tik su XFree %s,\n"
+"ATMINKITE, KAD TAI YRA EKSPERIMENTINIS PALIKYMAS IR GALI PAKABINTI "
+"KOMPIUTER�.\n"
+"J�s� korta dirba su XFree %s kuris galb�t geriau palaiko 2D."
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"J�s� korta palaiko 3D akseleracija su XFree %s.ATMINKITE, KAD TAI YRA "
+"EKSPERIMENTINIS PALIKYMAS IR GALI PAKABINTI KOMPIUTER�."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s su EKSPERIMENTINE 3D �renginio akseleracija"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "XFree konfiguracija"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Pasirinkite savo vaizdo plok�t�s atminties dyd�"
 
-#: ../../Xconfigurator.pm_.c:225
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Pasirinkite serverio nustatymus"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Pasirinkite monitori�"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitorius"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -70,39 +124,39 @@ msgstr ""
 "negu monitorius gali �vykdyti, nes galite j� sugadinti. Jeigu abejojate\n"
 "pasirinkite bendrus nustatymus."
 
-#: ../../Xconfigurator.pm_.c:246
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Horizontalaus atnaujinimo da�nis"
 
-#: ../../Xconfigurator.pm_.c:246
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Vertikalaus atnaujinimo da�nis"
 
-#: ../../Xconfigurator.pm_.c:285
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Monitorius nenurodytas"
 
-#: ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Vaizdo plok�t� dar nenurodyta"
 
-#: ../../Xconfigurator.pm_.c:291
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Dar nepasirinkta skiriamoji geba"
 
-#: ../../Xconfigurator.pm_.c:304
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Ar J�s norite i�bandyti savo nustatymus"
 
-#: ../../Xconfigurator.pm_.c:308
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr "Persp�jimas: su �ia korta bandyti pavojinga"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr "Persp�jimas: �ios kortos bandymas gali pakabinti kompiuter�"
 
-#: ../../Xconfigurator.pm_.c:311
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Patikrinti nustatymus"
 
-#: ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -110,185 +164,173 @@ msgstr ""
 "\n"
 "pabandykite pakeisti kai kuriuos nustatymus"
 
-#: ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "�vyko klaida:"
 
-#: ../../Xconfigurator.pm_.c:373
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Baigiame per %d sekund�i� (-es)"
 
-#: ../../Xconfigurator.pm_.c:377
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "Ar toks nustatymas Jus tenkina?"
 
-#: ../../Xconfigurator.pm_.c:385
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "�vyko klaida, pabandykite pakeisti kai kuriuos nustatymus"
 
-#: ../../Xconfigurator.pm_.c:393 ../../Xconfigurator.pm_.c:574
-msgid "Automatic resolutions"
-msgstr "Automatin� skiriamoji geba"
-
-#: ../../Xconfigurator.pm_.c:394
-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"
-msgstr ""
-"A� pabandysiu �vairias galimas skiriamasias gebas.\n"
-"J�s� ekranas mirg�s...\n"
-"Jeigu norite, galite j� i�jungti, J�s i�girsite pyptel�jim�, kai bus baigta"
-
-#: ../../Xconfigurator.pm_.c:452 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Skiriamoji geba"
 
-#: ../../Xconfigurator.pm_.c:487
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Pasirinkite skiriam�j� geb� ir spalv� skai�i�"
 
-#: ../../Xconfigurator.pm_.c:489
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Video plok�t�: %s"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 serveris: %s"
 
-#: ../../Xconfigurator.pm_.c:499
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Rodyti visk�"
 
-#: ../../Xconfigurator.pm_.c:523
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Skiriamosios gebos"
 
-#: ../../Xconfigurator.pm_.c:575
-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?"
-msgstr ""
-"A� galiu pabandyti surasti prieinam� skiriam�j� geb� (pvz.: 800x600).\n"
-"Bet kompiuteris gali \"pakibti\"\n"
-"Ar J�s norite pabandyti?"
-
-#: ../../Xconfigurator.pm_.c:580
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Nerasta galim� variant�\n"
-"Pabandykite kit� video plok�t� arba monitori�"
-
 # c-format
-#: ../../Xconfigurator.pm_.c:920
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klaviat�ros i�d�stymas: %s\n"
 
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Pel�s r��is: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Pel�s �renginys: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitorius: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitoriaus Horiz. skleistin�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitoriaus Vert. skleistin�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Video plok�t�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Video atmintis: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "Spalv� skai�ius: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Skiriamoji geba: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 serveris: %s\n"
 
-#: ../../Xconfigurator.pm_.c:943
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 tvarkykl�: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Ruo�iami X-Window nustatymai"
 
-#: ../../Xconfigurator.pm_.c:957
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Pakeisti monitori�"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Pakeisti video plok�t�"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Pakeisti serverio nustatymus"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Pakeisti skiriam�j� geb�"
 
-#: ../../Xconfigurator.pm_.c:961
-msgid "Automatical resolutions search"
-msgstr "Automatin� skiriamosios gebos paie�ka"
-
-#: ../../Xconfigurator.pm_.c:965
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Rodyti informacij�"
 
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Patikrinti v�l"
 
-#: ../../Xconfigurator.pm_.c:967 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "I�eiti"
 
-#: ../../Xconfigurator.pm_.c:971 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "K� J�s norite pakeisti"
 
-#: ../../Xconfigurator.pm_.c:978
-msgid "Forget the changes?"
-msgstr "Ar pamir�ti pakeitimus?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"I�laikyti pakeitimus?\n"
+"Dabartin� konfiguracija yra:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:996
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Pra�au perleisti %s kad pakeitimai b�t� i�saugoti"
 
-#: ../../Xconfigurator.pm_.c:1012
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Pra�au atsisveikinti ir paskui paspausti Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1015
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X aut. paleidimas"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -296,228 +338,223 @@ msgstr ""
 "J�s galite nustatyti, kad X startuot� automati�kai.\n"
 "Ar J�s norite, kad X startuot� po kompiuterio perkrovimo?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Automatinis pasisveikinimas"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"A� galiu nustatyti taip kad vienas vartotojas pasisveikint� automati�kai.\n"
+"Jei nenorite to naudoti paspauskite Nutraukti."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Pasirinkite vartotoj� pagal nutyl�jim�"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "Pasirinkite kur� lang� program� naudosite"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 spalvos (8 bitai)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 t�kst. spalv� (15 bit�)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 t�kst. spalv� (16 bit�)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 milijonai spalv� (24 bitai)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 milijardai spalv� (32 bitai)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB ar daugiau"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standartinis VGA 640x480 prie 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA 800x600 prie 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 suderinamas, 1024x768 prie 87 Hz kry�minis (n�ra 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 prie 87 Hz kry�minis, 800x600 prie 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "Nekry�minis SVGA, 1024x768 prie 60 Hz, 800x600 prie 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Auk�to da�nio SVGA, 1024x768 prie 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Daugiada�nis, galintis 1280x1024 prie 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Daugiada�nis, galintis 1280x1024 prie 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Daugiada�nis, galintis 1280 prie 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitorius, galintis 1600x1200 prie 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitorius, galintis 1600x1200 prie 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "curly"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "Pagrindinis"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "tie"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "brunet�"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "mergina"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "blondin�"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "Automagic"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Pirmasis startavimo srities sektorius"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Pirmasis kaupiklio sektorius (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "LILO/grub �diegimas"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "SILO �diegimas"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Kur norite �diegti startavimo program�"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub �diegimas"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Nieko"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Koki� �krovos tvarkykl� (-es) J�s nor�tum�te naudoti?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "�krovos programos �diegimas"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Pakrovimo �renginys"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (nedirba su senu BIOSu)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Kompakti�kas"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "kompakti�kas"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Palaukti prie� pakraunant atvaizd� pagal nutyl�jim�"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Video re�imas"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Palaukti prie� pakraunant atvaizd� pagal nutyl�jim�"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Slapta�odis"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Slapta�odis (v�l)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Grie�tos komandin�s eilut�s nustatymai"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "grie�tas"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Bendri �krovos tvarkykl�s nustatymai"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Nustatymas ''Grie�tos komandin�s eilut�s nustatymai'' yra naudojama tik su "
 "slapta�od�iu"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Pra�au bandyti v�l"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Slapta�od�iai neatitinka"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -525,225 +562,414 @@ msgstr ""
 "�ia yra skirtingi �ra�ai.\n"
 "J�s galite pakeisti esamus arba prijungti naujus."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Prid�ti"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Baigta"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Kokio tipo �ra�� j�s norite prid�ti"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Kitos OS (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Kitos OS (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Kokio tipo �ra�� j�s norite prid�ti"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Atvaizdas"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "�akninis"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Prid�ti"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Skaitymui-Ra�ymui"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Lentel�"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Nesaugu"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "�ym�"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Pagal nutyl�jim�"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Gerai"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "I�mesti �ra��"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Tu��ia �ym� neled�iama"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "�is �yminys jau naudojamas"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Rastas %s %s interfeisai"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Ar turite dar vien�?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Ar j�s turite kok� nors %s interfeis�?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Ne"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Taip"
+
+#: ../../any.pm_.c:505
+msgid "See hardware info"
+msgstr "Pa�i�r�kite �rangos informacij�"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "%s tvarkykl� �diegiama plo�tei %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(modulis %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Koki� %s tvarkykl� tur��iau i�bandyti?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"Kartai %s tvarkykl� turi tur�ti informacijos kad gerai dirbt�, nors\n"
+"normaliai turi veikti ir be jos. Ar j�s norite jai nustatyti ekstra\n"
+"nustatymus ar leisite pabandyti nusistatyti pa�iai. Bandymai gali\n"
+"pakabinti kompiuter�, bet tai netur�t� padaryti �alos."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Atomatinis bandymas"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Nurodykite nustatymus"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Dabar j�s galite nurodyti modulio %s nustatymus."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"Dabar j�s galite nustatyti %s modulio nustatymus.\n"
+"Opcij� formatas yra toks : ''vardas=reik�m� vardas2=reik�m�2 ...''.\n"
+"Pvz, ''io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Modulio parinktys:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Modulio %s i�kvietimas nepavyko.\n"
+"Ar norite bandyti su kitais nustatymais?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Sveiki, besinaudojantys %s, operaciniu sistemu ikrovos tvarkykle!\n"
+"\n"
+"Noredami suzinoti pasirinkimu sarasa, spauskite <TAB>.\n"
+"\n"
+"Noredami ijungti viena is ju, irasykite jo pavadinima ir spauskite <ENTER>\n"
+"arba laukite %d sekundziu ijungimo pagal nutylejima.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Sveiki, besinaudojantys GRUB, opercainiu sistemu ikrovos tvarkykle!"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "Pasirinkimui naudokite %c ir %c klavi�us."
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Spauskite enter, noredami ikrauti pasirinkta OS, 'e', noredami keisti"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "komandas pries ikrova, arba 'c', komandinei eilutei iskviesti "
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "Pasirinktas ivadas bus ikrautas automatiskai per %d sekundziu."
+
+#: ../../bootloader.pm_.c:604
+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
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Darbastalis"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Paleidimo meniu"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d minut�s"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 minut�"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekund�s"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Sukurti"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Atjungti"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "I�trinti"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Su�ym�ti"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:590
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Pakeisti dyd�"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "R��is"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Prijungimo vieta"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "�ra�yti /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Pakeisti � eksperto re�im�"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Pakeisti � normal� re�im�"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Atstatyti i� bylos"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "I�saugoti � byl�"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Atstatyti i� diskelio"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "I�saugoti � diskel�"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "I�valyti visk�"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Su�ym�ti visus skirsnius"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Automatinis nustatymas"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Visos pirminiai skirsniai yra naudojami"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "A� negaliu prid�ti n� vieno skirsnio"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr "Nor�dami sukurti papildom� skirsn� pra�om i�trinti bent vien� esam�"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "I�gelb�ti skirsni� pasiskirstymo lentel�"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Atmesti"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "�ra�yti skirsni� pasiskirstymo lentel�"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Perkrauti"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
-msgstr ""
+msgstr "gr��tamasis ciklas"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Tu��ias"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
-msgstr ""
+msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Kita"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Tu��ias"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Kita"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Byl� sistemos r��ys:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Detal�s"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -755,17 +981,17 @@ msgstr ""
 "Patariu jums pakeisti jo dyd�\n"
 "(spragtel�kite ant jo o paskui paspauskite \"Pakeisti dyd�\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Prad�iai padarykite atsargin� savo duomen� kopij�"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
 #: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Perskaitykite �d�miai!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -775,77 +1001,77 @@ msgstr ""
 "(2048 sektori� pakankama)\n"
 "kaupiklio prad�ioje"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "B�kite atsarg�s: �i operacija yra pavojinga."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Klaida"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:680
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Prijungimo vieta:"
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "�renginys"
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS kaupiklio raid�: %s (lyg ir)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "R��is: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Pradinis: sektorius %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Dydis: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektoriai (-i�)"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Nuo cilinfro %d iki cilindro %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Su�ym�ta\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Nesu�ym�ta\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Prijungta\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
-msgstr ""
+msgstr "Gr��tamojo ciklo byla (os): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -853,79 +1079,79 @@ msgstr ""
 "Skirsnis, �kraunamas pagal nutyl�jim�\n"
 "     (MS-DOS u�krovimui, ne lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Lygis %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Gabalo dydis %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-kaupikliaii %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Pra�au spragtel�ti ant skirsnio"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Dydis: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometrija: %s cilindr�(-ai), %s galv�(-os), %s sektori�(-iai)\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Skirnsi� lentel�s r��is: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "prie magistral�s %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Prijungimas"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Aktyvus"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Prijungti prie RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Pa�alinti i� RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Keisti RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
-msgstr ""
+msgstr "Naudojamas ciklui"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Pasirinkite operacij�"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -937,7 +1163,7 @@ msgstr ""
 "Arba naudokite LILO ir tai nedirbs arba nenaudokite LILO ir jums nereik�s "
 "/boot"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -948,100 +1174,104 @@ msgstr ""
 "disko kaupiklio cilindro ir j�s neturite /boot srities. Jeigu planuojate\n"
 "naudoti LILO valdymo program� atsargiai prid�kite /boot srit�"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
-"J�s pasirinkote programin� RAID skirsn� kaip root (/).\n"
+"J�s pasirinkote programin� RAID skirsn� kaip �aknin� (/).\n"
 "Jokia �krovos tvarkykl� negali su ja dirbti be /boot skirsnio.\n"
-"Taigi, b�kite atsarg�s, kurdami /boot skirsn�, jeigu norite naudotis lilo ar "
-"grub"
+"Taigi, b�kite atsarg�s, kurdami /boot skirsn�"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Vietoj to naudokite ``%s''"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Pirmiau naudokite ``Unmount''"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "Po r��ies pakeitimo skirsnyje %s, visi duomenys jame bus prarasti"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Ar vistiek t�sti ?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "I�eiti nei�saugojus"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "I�eiti nei�saugojus sri�i� pasiskirstymo lentel�s?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Pakeisti skirsnio tip�"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Kokio tipo skirsn� norite tur�ti?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "Kokios kalbos J�s norite"
+
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:483
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Kur norite prijungti atjungimo byl�� %s?"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Kur norite prijungti �rengin� %s?"
 
-#: ../../diskdrake.pm_.c:489
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:508
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Po skirsnio %s su�ym�jimo, visi duomenys jame bus prarasti"
 
-#: ../../diskdrake.pm_.c:510
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Su�ymima"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Su�ym�jima atjungimo byla %s"
 
-#: ../../diskdrake.pm_.c:512 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Su�ymimas skirsnis %s"
 
-#: ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Po vis� skirsni� su�ym�jimo,"
 
-#: ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "visi esantys �iuose skirsniuose duomenys bus prarasti"
 
-#: ../../diskdrake.pm_.c:527
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Perkelti"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Kur� disk� j�s norite perkelti"
 
@@ -1070,78 +1300,83 @@ msgstr "Disko %s skirsni� pasiskirstymo lentel� bus �ra�yta!"
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Jums reikia perstartuoti kad pakeitimai b�t� i�saugoti"
 
-#: ../../diskdrake.pm_.c:569 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Skai�iuojami FAT byl� sistemos r��iai"
 
-#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:618
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Kei�iamas dydis"
 
-#: ../../diskdrake.pm_.c:585
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Kurio skirsnio dyd� j�s norite pakeisti?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "Pasidarykite atsargin� duomen� �iame skirsnyje kopij�"
 
-#: ../../diskdrake.pm_.c:587
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "Po skirsnio %s dyd�io pakeitimo, visi duomenys jame bus prarasti"
 
-#: ../../diskdrake.pm_.c:597
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Pasirinkite nauj� dyd�"
 
-#: ../../diskdrake.pm_.c:597 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:652
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Sukurti nauj� skirsn�"
 
-#: ../../diskdrake.pm_.c:672
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Prad�ios sektorius: "
 
-#: ../../diskdrake.pm_.c:676 ../../diskdrake.pm_.c:750
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Dydis (MB): "
 
-#: ../../diskdrake.pm_.c:679 ../../diskdrake.pm_.c:753
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Byl� sistemos r��ysi: "
 
-#: ../../diskdrake.pm_.c:682
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Pirmenyb�: "
 
-#: ../../diskdrake.pm_.c:729 ../../install_steps.pm_.c:132
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:739
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:749
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:775
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:776
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "�i byla jau yra.Naudoti j�?"
 
-#: ../../diskdrake.pm_.c:798 ../../diskdrake.pm_.c:814
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Pasirinkite byl�"
 
-#: ../../diskdrake.pm_.c:807
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1149,11 +1384,11 @@ msgstr ""
 "Atsargin� skirsnio lentel� n�ra tokio pa�io dyd�io\n"
 "Vis tiek t�sti?"
 
-#: ../../diskdrake.pm_.c:815
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "D�mesio"
 
-#: ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1161,77 +1396,77 @@ msgstr ""
 "�d�kite diskel� � kaupikl�\n"
 "Visi duomenys esantys diskelyje bus prarasti"
 
-#: ../../diskdrake.pm_.c:830
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Bandome atstatyti skirsni� lentel�"
 
-#: ../../diskdrake.pm_.c:841
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "�renginys"
 
-#: ../../diskdrake.pm_.c:842
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "lygis"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "gabalo dydis"
 
-#: ../../diskdrake.pm_.c:855
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Pasirinkite jau esant� RAID prijungimui"
 
-#: ../../diskdrake.pm_.c:856
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "naujas"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s su�ym�jimas %s nepavyko"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Neai�ku, kaip su�ym�ti %s r��imi %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "nfs prijungimas nepavyko"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "prijungimas nepavyko: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "klaida, atjungiant %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Prijungimo vieta turi prasid�ti /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Sritis su prijungimo vieta %s jau yra\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Klaida, bandant atidaryti %s, kad �ra�yti: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1239,73 +1474,82 @@ msgstr ""
 "�vyko klaida-nerasta tinkam� �rengini�, kur b�t� galima sukurti naujus "
 "skirsnius. Pra�ome pasitikrinti savo �rang� d�l galimo gedimo"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "J�s neturite joki� skirsni�!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "Pasirinkite kalb� �diegimui ir sisteminiam vartojimui"
 
-#: ../../help.pm_.c:10
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Pasirinkite norim� klaviat�ros i�d�stym� i� s�ra�o auk��iau"
-
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "Pasirinkite 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\"."
+msgstr ""
+
+#: ../../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"
-"  - 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"
-msgstr ""
-"Pasirinkite \"�diegti\" jeigu nebuvo �diegta ankstesni� Linux versij� arba\n"
-"j�s norite tur�ti j� kelet�.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Pasirinkite \"Atnaujinti\" jeigu norite atnaujinti ankstesnes Mandrake\n"
-"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000 arba 7.0 (Air).\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"
-"Pasirinkite:\n"
+"\t* Recommanded: 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"
-" - Rekomenduojama: Jeigu jums ans�iau n�ra tek� �diegti Linux.\n"
 "\n"
-" - Vartotoji�ka: Jeigu jau tur�jote reikal� su Linux. Gal�site pasirinkti\n"
-"\"Normali\" bendros reik�m�s sistemos �diegimui, \"K�rimo\" jeigu naudojate\n"
-"savo kompiuter� kurti programoms ir \"Serverin�\" jeigu norite tur�ti "
-"bendros paskirties (pvz. pa�to, spausdintuvo...) server�.\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-" - Eksperto: Jeigu j�s puikiai sekasi su GNU/Linux i�spr�sti rimtas "
-"u�duotis.\n"
-"Kaip ir konfiguracijoje \"Vartotoji�ka\" j�s gal�site pasirinkti koks bus\n"
-"�ios sistemos panaudojimas.\n"
-"   Bet Pra�ome, Pra�ome NESIRINKITE TAI, APIE KA JUS NIEKO NEZINOTE!\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
+#, fuzzy
 msgid ""
 "Select:\n"
 "\n"
@@ -1313,12 +1557,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Pasirinkite:\n"
 "\n"
@@ -1334,330 +1579,552 @@ msgstr ""
 "Kaip ir konfiguracijoje \"Vartotoji�ka\" j�s gal�site pasirinkti koks bus\n"
 "�ios sistemos panaudojimas.\n"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 ""
-"Pirmiausia DrakX pabandys paie�koti PCI ir SCSI �rengini�. Jeigu jis suras\n"
-"ir �inos kokias tvarkykles jam (jiems) naudoti jis automati�kai jas �d�s.\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"
+"\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"
-"Jeigu j�s� SCSI �renginys yra ISA plok�t� arba DrakX ne�inos kaip j� "
-"valdyti\n"
-"arba j�s i�vis jo neturite jums bus prane�ta. Jeigu j�s neturite, "
-"atsakykite\n"
-"\"Ne\". Jeigu turite vienq arba daugiau atsakykite \"Taip\" ir tvarkykli� "
-"s�ra�as\n"
-"bus jums parodytas\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"
-"Kai j�s pasirinksite tvarkykl�, DrakX papra�ys nurodyti jos nustatymus.\n"
-"Pirmiausia leiskite �rangai pa�iai nusistatyti. Da�nai tai puikiai suveikia\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"
-"Jeigu jums nepavyks, nepamir�kite, kad informacijos apie j�s� �rang� gali\n"
-"suteikti dokumentacija arba Windows (jeigu j�s turite �i� sistem�).\n"
-"Tai tuos nustatymus j�s turite perduoti tvarkyklei."
+"\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 ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:160
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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"
 "\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"
-"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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+"   * Undo: you can use this option to cancel your changes.\n"
 "\n"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\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"
 msgstr ""
-"Dabar j�s galite pasirinkti � kuri�(-ias) srit�(-is) �diegsime\n"
-"Linux-Mandrake\n"
-"sistem�, jeigu tai dar nebuvo nustatyta anks�iau (nuo buvusio Linux\n"
-"�diegimo\n"
-"arba su kokia nors skirsni� skirstymo programa). �i operacija susideda i�\n"
-"loginio\n"
-"kompiuterio kieto disko padalinimo � kelius skirsnius.\n"
+
+#: ../../help.pm_.c:218
+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"
-"Jeigu jums reikia sukurti naujus skirsnius, naudokite \"Automatinis\n"
-"nustatymas\", norint\n"
-"automati�kai sukurti Linux skirsnius. Norint skirsni� suk�rimui pasirinkti "
-"kaupikl�,\n"
-"spauskite \"hda\", jeigu tai pirmasis IDE diskas ant kanalo, \"hdb\" jeigu\n"
-"antras ant pirmo IDE kanalo, \"sda\" jeigu pirmas SCSI diskas ir t.t\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"
-"Du pagrindiniai skirsniai yra: root skirsnis (/), kuris yra sistemos "
-"pradinis\n"
-"ta�kas ir /boot, kuris susideda i� byl�, kuri� reikia sistemos u�krovimui,\n"
-" kada kompiuteris pirm� kart� �jungiamas\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"
-"Kadangi �io proceso rezultatas yra negr��tamas, t� daryti nepatyrusiam\n"
-"vartotojui\n"
-"gali b�ti sunku. Vis� proced�r� supaprastina DiskDrake. Prie�\n"
-"prad�dami,\n"
-"pasi�i�r�kite dokumentacij�.\n"
+"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"J�s galite tai daryti klaviat�ros pagalba: eikite per skirsnius klavi�� Tab\n"
-"ir Up/Down klavi�� pagalba\n"
-". Kada skirnis pasirinktas, J�s galite naudoti:\n"
+"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"- Ctrl-c, nor�dami sukurti nauj� skirsn� (kada b�na pasirinktas tu��ias "
-"skirsnis)\n"
+"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"- Ctrl-d, nor�dami i�trinti skirsn�\n"
 "\n"
-"- Ctrl-m, nor�dami nurodyti prijungimo viet�\n"
+"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
+"\"secondary hard drive\", etc..."
+msgstr ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:252
 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."
+"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 ""
-"Visos naujai nustatytos sritys norint jas naudoti turi b�ti suformatuotos\n"
-"(formatavimas rei�ia falin�s sistemos suk�rim�). Dabar j�s gal b�t norite\n"
-"i�naujo suformatuoti jau formatuotas sritis, kad i�trinti jose esan�ius\n"
-"duomenis. Atminkite kad i�naujo formatuoti jau formatuotas sitis n�ra\n"
-"b�tina, nes jose gali b�ti reikalinga informacija."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:257
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"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"
-"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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"\n"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:267
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
-"Jeigu J�s turite visus CD s�ra�e auk��iau, spauskite Gerai.\n"
-" Jeigu J�s neturite n� vieno i� �i� CD, spauskite Nutraukti.\n"
-"Jeigu n�ra tik kai kuri� CD, nuimkite jo pasirinkim� ir po spauskite Gerai."
 
-#: ../../help.pm_.c:155
-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."
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
-"Dabar yra �diegiami paketai, kuriuos j�s pasirinkote. Tai tur�t�\n"
-"kelet� minu�i� u�trukti, ta�iau jeigu j�s pasirinkote atnaujinti\n"
-"tai tur�t� u�trukti kiek ilgiau."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:303
 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"
+"Any partitions that have been newly defined must be\n"
+"formatted for use (formatting meaning creating a filesystem).\n"
 "\n"
 "\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\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"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
-msgstr ""
-"Jeigu DrakX nepavyko surasti j�s� pel�s arba j�s pats norite j�\n"
-"nurodyti; jums bus parodytas s�ra�as\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"
-"Jeigu j�s sutinkate su DrakX' nustatymais tiesiog per�okite � t� sekcij�\n"
-"kuri� norite paspausdami ant meniu kair�je. Kitokiu atveju pasirinkite\n"
-"pel� kuri jums labiausiai tinka.\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"
-"Jeigu pas jus yra pel� su serijine jungtimi jums taip pat reik�s nurodyti\n"
-"prie kokios jungties ji yra prijungta."
+"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 ""
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:329
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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 ""
-"Pra�au pasirinkti teising� jungt�. Pavyzd�iui COM1 pagal MS Windows\n"
-"Linux'e yra ttyS0."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:341
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"You can now choose individually all the packages you\n"
+"wish to install.\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"
+"You can expand or collapse the tree by clicking on options in the left "
+"corner of\n"
+"the packages window.\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"
+"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
+"\"Toggle flat and group sorted\".\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"
 "\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."
+"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:358
+#, 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 sekcija yra skirta vietinio tinklo (LAN) nustatymui.\n"
+"Jeigu J�s turite visus CD s�ra�e auk��iau, spauskite Gerai.\n"
+" Jeigu J�s neturite n� vieno i� �i� CD, spauskite Nutraukti.\n"
+"Jeigu n�ra tik kai kuri� CD, nuimkite jo pasirinkim� ir po spauskite Gerai."
+
+#: ../../help.pm_.c:363
+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"
-"Jeigu j�s pasakyrite \"Taip\" DrakX pabandys pats surasti tinklo kort�.\n"
-"PCI �renginys tur�t� b�ti surastas ir prijungtas automati�kai. Ta�iau\n"
-"jeigu j�s� turite ISA �rengin� automatinis aptikimas nesuveiks ir j�s\n"
-"tur�site nurodyti tvarkykl� i� s�ra�o, kuris tada pasirodys.\n"
 "\n"
+"Please be patient."
+msgstr ""
+
+#: ../../help.pm_.c:371
+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:376
+#, fuzzy
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
+msgstr ""
+"Pra�au pasirinkti teising� jungt�. Pavyzd�iui COM1 pagal MS Windows\n"
+"GNU/Linux'e yra ttyS0."
+
+#: ../../help.pm_.c:380
+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"
-"D�l SCSI �rengini�, leiskite tvarkyklei pirmiau pa�iai pabandyti �rengin�,\n"
-"nes kitokio atveju jums teks nurodyti nustatymus i� Windows Control Panel\n"
-"konfiguracijos\n"
+"\n"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\n"
 "\n"
 "\n"
-"Jeigu j�s �diegiate Linux-Mandrake � 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"
-"reik�s pasirinkti pa�iam."
+"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:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"Dabar j�s galite �vesti prisiskambinimo nustatymus. Jeigu ne�inote k�\n"
+"�ra�yti tiksli� informacij� galite gauti i� j�s� ISP."
+
+#: ../../help.pm_.c:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
 "Nurodykite:\n"
 "\n"
 "   - IP adresas; jeigu jo ne�inote paklauskite tinklo administratoriaus "
 "arba\n"
-"ISP.\n"
+"IPT.\n"
 "  - Tinklo Kauk�: \"255.255.255.0\" pagrinde yra neblogas pasirinkimas. "
 "Jeigu\n"
-"j�s ne�inote pasiklauskite tinklo administratoriaus arba ISP.\n"
+"j�s ne�inote pasiklauskite tinklo administratoriaus arba IPT.\n"
 "\n"
 "\n"
-"  - Atomatinis IP: Jeigu j�s� tinkle yra naudojamas bootp arba dhcp "
+"  - Atomatinis IP: Jeigu j�s� tinkle yra naudojamas BOOTP arba DHCP "
 "protokolas\n"
 "pasirinkite �� nustatym�. Jeigu j� pasirinksite nereik�s nustatin�ti\n"
 "\"IP adreso\". Jeigu j�s ne�inote pasiklauskite tinklo administratoriaus\n"
-"arba ISP.\n"
+"arba IPT.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"Jeigu j�s� tinklas naudoja NIS, tada pasirinkite \"Naudoti NIS\". Jeigu\n"
+"ne�inote paklauskite tinklo administratoriaus."
+
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1665,7 +2132,7 @@ msgstr ""
 "Dabar j�s galite �vesti prisiskambinimo nustatymus. Jeigu ne�inote k�\n"
 "�ra�yti tiksli� informacij� galite gauti i� j�s� ISP."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1673,13 +2140,15 @@ msgstr ""
 "Jeigu j�s naudosite proxy, pra�au dabar tai nustatyti. Jeigu to dar\n"
 "ne�inote, pasiklauskite tinklo administratoriaus arba ISP."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1692,29 +2161,42 @@ msgstr ""
 "Atminkite kad jums reikia pasirinkti kriptografijos paketus, atitinkan�ius "
 "m�s� �statym� reikalavimus."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "Dabar j�s pagal gyvenam�j� viet� galite pasirinkti laiko juost�.\n"
 "\n"
 "\n"
-"Linux dirba su GMT \"Greenwich Mean Time\" laiko juosta ir paver�ia �\n"
+"GNU/Linux dirba su GMT \"Greenwich Mean Time\" laiko juosta ir paver�ia �\n"
 "vietin� laik� pagal laiko juost� kuri� j�s pasirenkate."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 ""
 "Dabar J�s galite pasirinkti, kurias tarnybas J�s norite paleisti �krovos "
 "metu.\n"
@@ -1727,53 +2209,159 @@ msgstr ""
 "serveriu: J�s grei�iausiai nenor�site naudotis tomis tarnybomis, kuri� J�s\n"
 "nenorite."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
+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:490
+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:505
+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 ""
+
+#: ../../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"
+"\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 ""
+
+#: ../../help.pm_.c:542
 msgid ""
-"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"
+"You need to enter some informations here.\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"
+"   * 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"
-"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"
 "\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"
-"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."
+"\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:286
+#: ../../help.pm_.c:567
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"Your printer has not been detected. Please enter the name of the device on\n"
+"which it is connected.\n"
 "\n"
 "\n"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"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:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
+"\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 j�s galite �vesti savo Linux-Mandrake sistemos root slapta�od�.\n"
 "Slapta�odis turi b�ti �vestas du kartus kad patikrinti kad �vestas "
@@ -1791,7 +2379,7 @@ msgstr ""
 "b�ti\n"
 "prisimenamas be ypating� pastang�."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1800,7 +2388,7 @@ msgstr ""
 "ir\n"
 " \"Naudoti MD5 slapta�od�ius\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1808,7 +2396,7 @@ msgstr ""
 "Jeigu j�s� tinklas naudoja NIS, tada pasirinkite \"Naudoti NIS\". Jeigu\n"
 "ne�inote paklauskite tinklo administratoriaus."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1845,35 +2433,31 @@ msgstr ""
 "administravimo\n"
 "darbams."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Labai rekomenduojama �ia pasirinkti \"Taip\". Jeigu j�s v�liau \n"
-"�diegin�site Microsoft Windows ji naujai u�ra�ys startavimo sektori�.\n"
-"Tada nepadar� startavimo diskelio kaip mes patar�je nebegal�site\n"
-"startuoti Linux."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 reikia nurodyti, kur �ra�yti LILO paleidimui reikaling� informacij�\n"
+"Jums reikia nurodyti, kur �ra�yti GNU/Linux paleidimui reikaling� "
+"informacij�\n"
 "\n"
 "\n"
 "\n"
 "Jeigu ne�inote kaip elgtis, pasirinkite \"Pirmasis kaupiklio sektorius "
 "(MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1883,10 +2467,10 @@ msgstr ""
 "(tai yra pirminis master kaupiklis) arba \"/dev/sda\" (pirmas SCSI "
 "kaupiklis)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1897,7 +2481,8 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1914,7 +2499,9 @@ msgid ""
 "\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."
 msgstr ""
 "pagrindiniai LILO nustatymai yra �ie:\n"
@@ -1937,10 +2524,60 @@ msgstr ""
 "    * normal: pasirinkite standartin� 80x25 tekstin� re�im�.\n"
 "    * <skai�ius>: naudoti atitinkam� tekstin� re�im�."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 ""
+
+#: ../../help.pm_.c:692
+#, 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 ""
+"pagrindiniai LILO nustatymai yra �ie:\n"
+"  - Paleidimo �renginys: Nurodo �rengin� (pvz. disko skirsnio), kuriame\n"
+"yra paleid�iamasis sektorius. jeigu �inote, tada nurodykite, jeigu ne, "
+"ra�ykite\n"
+"\"/dev/hda\".\n"
+"\n"
+"\n"
+"  - Pauz� prie� startuojant atvaizd� pagal nutyl�jim�: Nustato kiek� "
+"de�imt�j�\n"
+" sekund�s dali�, kuri� reikia palaukti, prie� paleid�iant pirm� vaizd�. Tai "
+"naudinga sistemoms, kurios paleid�iamos i�kart po klaviat�ros �jungimo. "
+"�krovos tvarkykl� nelaukia, jeigu \"pauz�\" yra nenurodyta arba lygi "
+"nuliui.\n"
+"\n"
+"\n"
+"  - Video re�imas: Tai nurodo kok� paleid�iant pasirinkti VGA re�im�. Yra "
+"prieinamos �ios reik�m�s:\n"
+"    * normal: pasirinkite standartin� 80x25 tekstin� re�im�.\n"
+"    * <skai�ius>: naudoti atitinkam� tekstin� re�im�."
+
+#: ../../help.pm_.c:705
+#, fuzzy
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -1951,7 +2588,7 @@ msgid ""
 "settings suit you. If they don't, you can come back and\n"
 "change them, as many times as necessary."
 msgstr ""
-"Dabar reikia sukonfiguruoti X Windows sistem�, kuri yra Linux GUI\n"
+"Dabar reikia sukonfiguruoti X Windows sistem�, kuri yra GNU/Linux GUI\n"
 "(Grafinio vartotojo interfeiso pagrindas). Kad tai padaryti jums\n"
 "reikia sukonfiguruoti monitori� ir vaizdo plok�t�. Dauguma �ingsni�\n"
 "yra automatizuoti ir j�s� darbas bus tik patikrinti ar nustatymai\n"
@@ -1963,7 +2600,7 @@ msgstr ""
 "jums netiks j�s gal�site gr��ti ir pakeisti konfiguracij� kiek\n"
 "norite kart�."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -1971,7 +2608,7 @@ msgstr ""
 "Jeigu kas nors su X konfiguracija yra netvarkoje pasirinkite �iuos\n"
 "nustatymus kad teisingai nustatyti X Windows Sistem�."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -1979,42 +2616,47 @@ msgstr ""
 "Jeigu j�s norite pasisveikinti grafiniam re�ime pasirinkite \"Taip\". Kitu\n"
 "atveju pasirinkite \"Ne\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\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"
+"\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"\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."
 msgstr ""
 "Dabar j�s galite pasirinkti �vairias savo sistemos opcijas.\n"
 "\n"
@@ -2027,7 +2669,8 @@ msgstr ""
 "Pla�iau apie tai skaitykite pateiktuose apra�ymuose\n"
 "\n"
 "\n"
-" - Reikalingas apytikris RAM atminties kiekis: kai kuriais atvejais Linux\n"
+" - Reikalingas apytikris RAM atminties kiekis: kai kuriais atvejais "
+"GNU/Linux\n"
 "negali nustatyti kiek j�s� sistema turi atminities. Tokiu atveju jums "
 "reikia\n"
 "nurodyti jos kiek�. Atminkite kad 2 arba 4 Mb netikslumas b�t� normalus.\n"
@@ -2041,7 +2684,7 @@ msgstr ""
 " - Startuojant �jungti Num Lock: Jeigu reikia kad startavus b�t� �jungtas\n"
 "Num Lock pasirinkite �i� opcij� (Pastaba: Num Lock vistiek nedirbs po X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2055,96 +2698,116 @@ msgstr ""
 "automati�kai. Jeigu norite pakrauti kit� operacin� sistem� pra�om\n"
 "perskaityti prid�tas instrukcijas."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Pasirinkite kalb�"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Parinkite �diegimo klas�"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Diskinio kaupiklio suradimas"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Pel�s nustatymas"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Pasirinkite klaviat�r�"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "�vair�s"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Nustatyti byl� sistemas"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Su�ym�ti skirsnius"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Kuriuos paketus �diegti"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "�diegti sistem�"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Nustatyti tinkl�"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Kriptografija"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Nurodyti laiko juost�"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Nustatyti tarnybas"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Nustatyti spausdintuv�"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Nurodyti root slapta�od�"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Naujas vartotojas"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Sukurti �krovos diskel�"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "�diegti �krovos tvarkykl�"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Nustatyti X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Auto �diegimo diskelis"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "I�eiti i� �diegimo"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "�vyko klaida, nuskaitant byl� $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "Pra�ome patikrinti pel�"
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Pra�ome patikrinti pel�"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2154,231 +2817,238 @@ msgstr ""
 "Tam j�s turite sukurti skirsn� (arba spragtel�ti ant jau esamo).\n"
 "ir ``Mount point'' nurodyti `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"A� negaliu perskaityti j�s� skirsni� lentel�s, ji man per daug sugadinta :(\n"
-"Pabandysiu nuimti blogus skirsnius"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "J�s privalote tur�ti swap skirsn�"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake nagali korekti�kai perskaityti skirsni� lentel�s.\n"
-"T�skite savo paties rizika!"
+"J�s neturite swap skirsnio\n"
+"\n"
+"vistiek t�sti?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Ie�komas pagrindinis skirsnis."
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Naudoti laisv� viet�"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Informacija"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "Naujiems skirsniams nepakanka laisvos vietos"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: Tai ne pagrindinis skirsnis, pra�om pasirinkti kit�"
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "Naudoti esamus skirsnius"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Nerastas pagrindinis skirsnis"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "n�ra esam� naudotin� skirsni�"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Negalima naudoti transliavimo be NIS domeno"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Naudoti Windows skirsn� gr��tamajam ciklui"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "�vyko klaida, nuskaitant byl� $f"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Kuri skirsn� J�s norite naudoti Linux4Win �diegimui?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"�vyko klaida, su kuria negaliu gra�iai susitvarkyti.\n"
-"T�skite darb� savo paties rizika."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Pasirinkite dyd�ius"
 
-#: ../../install_steps.pm_.c:174
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Egzistuoja ne viena %s prijungimo vieta"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Pagrindinio skirsnio dydis, MB: "
 
-#: ../../install_steps.pm_.c:321
-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"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Swap skirsnio dydis, MB: "
+
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
 msgstr ""
 
-# \, c-format
-#: ../../install_steps.pm_.c:388
-#, c-format
-msgid "Welcome to %s"
-msgstr "Sveiki atvyk� � %s"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Kurio skirsnio dyd� j�s norite pakeisti?"
 
-#: ../../install_steps.pm_.c:740
-msgid "No floppy drive available"
-msgstr "Neprieinamas n� vienas diskeli� kaupiklis"
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "Skai�iuojami Windows byl� sistemos r��iai"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "Bandoma vykdyti �ingsn� `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "J�s privalote tur�ti swap skirsn�"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"J�s neturite swap skirsnio\n"
+"PERSP�JIMAS!\n"
 "\n"
-"vistiek t�sti?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Pasirinkite kokio norite �diegti dyd�io"
+"DrakX dabar reikia pakeisti Windows skirsnio dyd�. B�kit atsargus �i "
+"operacija\n"
+"yra pavojinga. Jeigu dar nepaleidote ScanDisk, tai jau laikas tai padaryti.\n"
+"Taip pat galima paleisti ir Defrag, bei padaryti �io skirsnio duomen� "
+"kopij�.\n"
+"Kada b�site tikras, spauskite Gerai."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Bendras dydis: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "Kur� dyd� j�s norite naudoti d�l windows ant"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "Versija: %s\n"
+msgid "partition %s"
+msgstr "skirsnis %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "Dydis: %d KB\n"
+msgid "FAT resizing failed: %s"
+msgstr "FAT dyd�io nustatymas nepavyko: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Pasirinkite paketus, kuriuos J�s norite instaliuoti"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "I�trinti vis� disk�"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "�diegti"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "I�mesti Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "�diegiama"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr "J�s turite daugiau negu vien� disk�. � kur� norite �diegti Linux?"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Pra�ome palaukti, "
+#: ../../install_interactive.pm_.c:156
+#, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "Visi duomenys jame bus prarasti diske %s"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Liko laiko"
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "Eksperto re�imas"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Bendra trukm� "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "Naudoti DiskDrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Ruo�iamas �diegimas"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "Naudoti fdisk"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "�diegiamas paketas %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "T�sti vistiek?"
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "J�s neturite joki� windows skirsni�!"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "�vyko klaida, bandant sutvarkyti paketus:"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "A� negaliu prid�ti n� vieno skirsnio"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Naudoti esamus X11 nustatymus ?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Pra�au pasirinkti vien� i� �i� �diegimo klasi�:"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Skirnsi� skirstymas nepavyko: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "J�s neturite joki� windows skirsni�!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Pajungti tinkl�"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Jums neu�tenka vietos Lnx4win"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Bandoma atjungti tinkl�"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"PERSP�JIMAS!\n"
-"\n"
-"DrakX dabar reikia pakeisti Windows skirsnio dyd�. B�kit atsargus �i "
-"operacija\n"
-"yra pavojinga. Jeigu dar nepaleidote ScanDisk, tai jau laikas tai padaryti.\n"
-"Taip pat galima paleisti ir Defrag, bei padaryti �io skirsnio duomen� "
-"kopij�.\n"
-"Kada b�site tikras, spauskite Gerai."
+"�vyko klaida, su kuria negaliu gra�iai susitvarkyti.\n"
+"T�skite darb� savo paties rizika."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Automatinis dyd�io nustatymas nepavyko"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Egzistuoja ne viena %s prijungimo vieta"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Kuri skirsn� J�s norite naudoti Linux4Win �diegimui?"
+#: ../../install_steps.pm_.c:375
+msgid ""
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Pasirinkite dyd�ius"
+# \, c-format
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Sveiki atvyk� � %s"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Pagrindinio skirsnio dydis, MB: "
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Neprieinamas n� vienas diskeli� kaupiklis"
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Swap skirsnio dydis, MB: "
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Bandoma vykdyti �ingsn� `%s'\n"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Pra�au pasirinkti vien� i� �i� �diegimo klasi�:"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "Grupi�, kurias J�s pasirinkote bendras dydis yra apie %d MB. \n"
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2387,7 +3057,7 @@ msgid ""
 "a percentage of 100%% will install all selected packages."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2397,58 +3067,99 @@ msgid ""
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "Sekan�iam �ingsnyje juos j�s gal�site pasirinkti tiksliau"
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Instaliojam� paket� procentuot�"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Pasirinkite paketus, kuriuos J�s norite instaliuoti"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "�diegti"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Atomatin� priklausomyb�"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "I�pl�sti med�"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Sutraukti med�"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Perjungti tarp paprasto ir grupi� sur��iavimo"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Blogas paketas"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Pavadinimas: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versija: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Dydis: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Svarba: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Bendras dydis: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+#, fuzzy
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr "J�s negalite pasirinkti �io paketo pasirinkimo, nes  n�ra vietos"
+
+#: ../../install_steps_gtk.pm_.c:386
+msgid "The following packages are going to be installed"
+msgstr "Sekanti paketai bus �diegti"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "�ie paketai bus pa�alinti"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "J�s negalite pasirinkti/nepasirinkti �io paketo"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Tai yra pagrindinis paketas, jis negali b�ti nnepasirinktas"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "J�s negalite nuimti �io paketo pasirinkimo. Jis jau �diegtas"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2456,45 +3167,88 @@ msgstr ""
 "�is paketas turi b�ti atnaujintas\n"
 "Ar J�s tikri, kad norite nuimti pasirinkim�?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:493
-#, fuzzy
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr "J�s negalite nuimti �io paketo pasirinkimo. Jis jau �diegtas"
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "�ie paketai bus �diegti/pa�alinti"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "J�s negalite pasirinkti/nepasirinkti �io paketo"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "�diegiama"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Skai�iuojama"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Pra�ome palaukti, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Liko laiko"
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Bendra trukm� "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Ruo�iamas �diegimas"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d paketai"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "�diegiamas paketas %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "Priimti"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2504,194 +3258,403 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "Atmesti"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "T�sti vistiek?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "�vyko klaida, bandant sutvarkyti paketus:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "�vyko klaida, bandant �diegti paketus:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "�vyko klaida"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Pra�ome pasirinkti kalb�, kuri� J�s naudosite."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Klaviat�ra"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Pra�ome pasirinkti klaviat�ros i�d�stym�."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr "J�s galite pasirinkti kitas kalbas, kurios bus prieinamos po �diegimo"
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Pagrindinis skirsnis"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Kur yra pagrindinis (/) j�s� sistemos skirsnis"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "�diegimo klas�"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Kurios �diegimo klas�s J�s norite?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "�diegti/atnaujinti"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr "J�s �diegiate ar atnaujinate?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
+msgstr "J�s �diegiate ar bandote i�gelb�ti?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Automatinis"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Rekomenduojama"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Nustatoma"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Ekspertas"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
+#, fuzzy
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "Ar J�s tikri, kad esate ekspertas? \n"
-"Jums bus leid�iama daryti galingus, bet ir pavojingus dalykus �ia."
+"Jums bus leid�iama daryti galingus, bet ir pavojingus dalykus �ia.\n"
+"\n"
+"J�s� bus klausiama pvz: ``Naudoti �e��lini� byl� slapta�od�iams?'',\n"
+"ar pasiruo�� atsakyti � tokius klausimus?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Atnaujinimas"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Normali"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "Darbo vieta"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "K�rimo"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Serverin�"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
-msgstr "Kam bus naudojama J�s� sistema? "
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
+msgstr "Kam bus naudojama J�s� sistema?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Pra�ome pasirinkti savo pel�s r���."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Pel�s Jungtis"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr ""
 "Pra�ome pasirinkti, prie kurios serijin�s jungties prijungta J�s� pel�."
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Nustatome PCMCIA kortas..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "Nustatome IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "n�ra prieinam� skirsni�"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Pra�ome pasirinkti skirsn�, kur� J�s naudosite kaip pagrindin�."
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Pasirinkite prijungimo vietas"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, fuzzy, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"A� negaliu perskaityti j�s� skirsni� lentel�s, ji man per daug sugadinta :(\n"
+"Galiu pabandyti stvarkyti (bus prarasti visi duomenys.\n"
+")Kitas variantas b�t� neleisti DrakX modifikuoti skirsni�.\n"
+"(klaida %s)\n"
+"\n"
+"Ar sutinkate prarasti tuos skirsnius?\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake nagali korekti�kai perskaityti skirsni� lentel�s.\n"
+"T�skite savo paties rizika!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Pagrindinis skirsnis"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Kur yra pagrindinis (/) j�s� sistemos skirsnis"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Jums reikia perkrauti kompiuter�, norint i�saugoti skirsni� lentel�"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Pasirinkite kur� skirsn� J�s norite su�ym�ti"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Tikrinti d�l blog� sektori�?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Su�ymimi skirsniai"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Sukuriama ir su�ymima byla %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Nepakanka swap atminties �diegimo vykdymui, pra�au prapl�sti"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Ie�komi galimi paketai"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Ie�koma atnaujintin� paket�"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr "J�s� sistemoje neu�tenka vietos �diegimui arba atnaujinimui"
+#: ../../install_steps_interactive.pm_.c:433
+#, fuzzy, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
+msgstr "J�s� sistemoje neu�tenka vietos �diegimui arba atnaujinimui (%d > %d)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "Pilnai (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "Minimaliai (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Rekomenduojama (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "Nustatoma"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "Pasirinkite kokio norite �diegti dyd�io"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Paket� Grup�s Pasirinkimas"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Atskir� paket� pasirinkimas"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 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 ""
+"Jeigu J�s turite visus CD s�ra�e �emiaiu, spauskite Gerai.\n"
+"Jeigu J�s neturite n� vieno i� �i� CD, spauskite Nutraukti.\n"
+"Jeigu n�ra tik kai kuri� CD, nuimkite jo pasirinkim� ir po spauskite Gerai."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr ""
+msgstr "Cd-Rom su u�ra�u \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2699,174 +3662,11 @@ msgstr ""
 "�diegiamas paketas %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Konfiguracija po �diegimo"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "I�laikyti dabartin� IP konfiguracij�"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Perkonfiguruoti tinkl� dabar"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Nekonfiguruoti tinklo pasijungim�"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Tinklo konfiguravimas"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Loalaus tinklo pasijungimai jau sukonfiguruoti. Ar norite :"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Ar J�s norite nustatyti savo sistemos vietin� tinkl�?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "tinklo korta nerasta"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Modemo Nustatymai"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "Ar J�s norite nustatyti savo modemo dialup prisijungim�?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Konfiguruojamas tiklo �renginys %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Pra�au �ra�yti �io kompiuterio IP konfiguracij�.\n"
-"Kiekvienas laukas turi b�ti �ra�ytas kaip IP adresas\n"
-"(pvz. 1.2.3.4)"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Automatinis IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP adresas:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Tinklo kauk�:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP adresas tur�t� b�ti 1.2.3.4  formato"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Konfiguruojamas tinklas"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Pra�au �vesti j�s� kompiuterio vard�.\n"
-"Tai turi b�ti pilnas vardas (pvz ``mybox.mylab.myco.com'').\n"
-"Taip pat galite �vesti IP ir tinkl� s�sajos adresus jeigu juos turite"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS serveris:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Tinkl� s�sajos �renginys"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Tinkl� s�saja:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Kompiuterio vardas:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Ar bandyti surasti modem�?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr ""
-"Pra�ome pasirinkti, prie kurios serijin�s jungties yra prijungtas J�s� "
-"modemas."
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Prisiskambinimo nustatymai"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Pasijungimo pavadinimas"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Telefono numeris"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Pasisveikinimo ID"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Autentifikacija"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Scenarinis"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Terminalinis"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Domeno vardas"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Pirmasis DNS serveris"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Antrasis DNS serveris"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2921,88 +3721,92 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Pasirinkite server� i� kurio imsite paketus"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "I�komas serveris i� kurio bus gauti galimi paketai"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Pasirinkite paketus, kuriuos J�s norite �diegti."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
 msgstr "Kokia j�s� laiko juosta?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Ar j�s� aparat�ros laikrodis GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "Koki� spausdinimo sitem� norite naudoti?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Slapta�od�io n�ra"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Naudoti �e��lin� fail�"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "�e��linis"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Naudoti MD5 slapta�od�ius"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Naudoti NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "geltonieji puslapiai"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Autentifikacijos NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS domenas"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS serveris"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Priimti vartotoj�"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Prid�ti vartotoj�"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s jau prid�tas)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3012,37 +3816,37 @@ msgstr ""
 "�veskite vartotoj�\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Tikras vardas"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Vartotojo vardas"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Aplinka"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "�is slapta�odis yra perdaug paprastas"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Pra�om suteikti vartotojo vard�"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -3050,24 +3854,50 @@ msgstr ""
 "Vartotojo vardas turi susidaryti i� ma��j� raid�i�, skai�i� ir simboli� `-' "
 "arba `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "�is vartotojo vardas jau prid�tas"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+#, fuzzy
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Startinis diskelis leid�ia pakrauti Linux sistem� be normalaus sistemos "
+"�krov�jo.\n"
+"Tai gali b�ti naudinga jeigu kita operacin� sistema i�meta LILO arba jei \n"
+"LILO nedirba su j�s� aparatine dalimi. Startinis diskelis taip pat gali "
+"b�ti\n"
+"naudingas, norint apsisaugoti nuo kai kuri� sistemos gedim�.\n"
+"Ar J�s norite sukurti startin� diskel�?"
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Pirmasis diskelis"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Antrasis diskelis"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Praleisti"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3088,184 +3918,144 @@ msgstr ""
 "naudingas, norint apsisaugoti nuo kai kuri� sistemos gedim�.\n"
 "Ar J�s norite sukurti startin� diskel�?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Atleiskite, bet n�ra galim� diskeli� kaupikli�"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Pasirinkite kuriuo kaupikliu kursite startavimo diskel�"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "�d�kite diskel� � kaupikl� %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Kuriamas startavimo diskelis"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "LILO �diegimas nepavyko. �vyko sekanti klaida:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Ar norite naudoti SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "Bendri SILO nustatymai"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"SILO turi sekan�ius �ra�us.\n"
-"J�s galite pakeisti esamus arba prid�ti nauj�."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Skirsnis"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "�i �ym� jau naudojama"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "SILO �diegimas nepavyko. �vyko sekanti klaida:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Ruo�iama �krovos tvarkykl�"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "Ar norite naudoti aboot?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Proxy nustatymai"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "�krovos programos �diegimas nepavyko. �vyko sekanti klaida:"
 
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy tur�t� b�ti http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy tur�t� b�ti ftp://..."
-
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Sveiki atvyk� � Crackers"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Menkas"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "�emas"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Vidutinis"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Auk�tas"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoi�kas"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "�vair�s klausimai"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(gali sugadinti duomenis)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Ar naudoti kieto disko optimizavim�?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Pasirinkite saugumo lyg�"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Tikslus RAM atminties dydis (rasta %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "I�imam� laikmenu automatinis montavimas"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Startuojant �jungti Num-Lock"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Nurodykite ram atminties dyd� Mb"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Ne�manoma naudoti supermount auk��iausiame saugumo lygyje"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Ar bandyti surasti PCI �renginius"
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Naudoti esamus X11 nustatymus ?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "�d�kite tu��i� diskel� � kaupikl� %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Kuriamas automatinio �diegimo diskelis"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3275,7 +4065,7 @@ msgstr ""
 "\n"
 "Ar j�s norite i�eiti?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3296,150 +4086,18 @@ msgstr ""
 "Informacija apie j�s� sistemos konfiguravima yra oficialioje\n"
 "Linux-Mandrake User's Guide knygoje."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Bandoma i�jungti"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "%s tvarkykl� �diegiama plo�tei %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(modulis %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Koki� %s tvarkykl� tur��iau i�bandyti?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"Kartai %s tvarkykl� turi tur�ti informacijos kad gerai dirbt�, nors\n"
-"normaliai turi veikti ir be jos. Ar j�s norite jai nustatyti ekstra\n"
-"nustatymus ar leisite pabandyti nusistatyti pa�iai. Bandymai gali\n"
-"pakabinti kompiuter�, bet tai netur�t� padaryti �alos."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Atomatinis bandymas"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Nurodykite nustatymus"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Dabar j�s galite nurodyti modulio %s nustatymus."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Dabar j�s galite nustatyti %s modulio nustatymus.\n"
-"Opcij� formatas yra toks : ''vardas=reik�m� vardas2=reik�m�2 ...''.\n"
-"Pvz, ''io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Modulio parinktys:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Modulio %s i�kvietimas nepavyko.\n"
-"Ar norite bandyti su kitais nustatymais?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Ar pabandyti surasti PCMCIA kortas?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Nustatome PCMCIA kortas..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Ar bandyti surasti %s �renginius"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Rastas %s %s interfeisai"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Ar turite dar vien�?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Ar j�s turite kok� nors %s interfeis�?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Ne"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Taip"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Pa�i�r�kite �rangos informacij�"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Pajungti tinkl�"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Bandoma atjungti tinkl�"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake �diegimas %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> tarp element�  | <Space> pasirenkti | <F12> kitas langas "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Pra�ome palaukti"
 
@@ -3449,7 +4107,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Dviprasmi�kumas (%s), b�kite tikslesnis\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Blogas pasirinkimas, pabandykite dar kart�\n"
 
@@ -3463,452 +4121,942 @@ msgstr " ? (pagal nutyl�jim� %s) "
 msgid "Your choice? (default %s) "
 msgstr "J�s� pasirinkimas? (pagal nutyl�jim� %s)"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr ""
 "J�s� pasirinkimas? (pagal nutyl�jim� %s �veskite `none' jeigu nenorite)"
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "�ek�"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Vokie�i�"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorako"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Ispan�"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Suomi�"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Pranc�z�"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norveg�"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Lenk�"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Rus�"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Did�iosios Britanijos klaviat�ra"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "JAV klaviat�ra"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Arm�n� (senoji)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Arm�n� (spausd. ma�in�l�s)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Arm�n� (fonetin�)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belg�"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulgar�"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazil�"
 
-#: ../../keyboard.pm_.c:115
-#, fuzzy
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
-msgstr "Bulgar�"
+msgstr "Baltarus�"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "�veicar� (Voki�k. i�d�stymas)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "�veicar. (Pranc. i�d�stymas)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Vokie�i� (be atjungt� klavi��)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Dan�"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorako (US)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorako (Norveg�)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Est�"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gruzin� (\"Rusi�kas\" i�d�stymas)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gruzin� (\"Latin\" i�d�stymas)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Graik�"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Vengr�"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Chorvat�"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "�yd�"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "�yd� (Fonetin�)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Iranie�i�"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islandijos"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Ital�"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Lotyn� Amerikie�i�"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Dan�"
 
-#: ../../keyboard.pm_.c:140
-#, fuzzy
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
-msgstr "Lietuvi� (azerty)"
+msgstr "Lietuvi� AZERTY (sena)"
 
-#: ../../keyboard.pm_.c:142
-#, fuzzy
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
-msgstr "Lietuvi� (azerty)"
+msgstr "Lietuvi� AZERTY (nauja)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
-msgstr "Lietuvi� (balticrim) QWERTY"
+msgstr "Lietuvi� \"skai�i� eil�\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
-msgstr "Lietuvi� (fonetin�) QWERTY"
+msgstr "Lietuvi� \"fonetin�\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Lenk� (qverty i�d�stymas)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Lenk� (qwertz i�d�stymas)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugal�"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanadie�i� (Kvebeko)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Rusi�k� (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "�ved�"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Slov�n�"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slovak�"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Tai klaviat�ra"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turk� (paprastas \"F\" modelis)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turk� (�iuolaik. \"Q\" modelis)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukrainie�i�"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "JAV klaviat�ra (tarptautin�)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vietnamie��i� \"skai�i� eil�\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Jugoslav� (lotuni�kas i�d�stymas)"
 
-# 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.
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - pel�"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse (PS/2 "
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Paprasta"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "Ratas"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "serijin�"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Paprasta 2 klavi�� pel�"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Paprasta 3 klavi�� pel�"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Pel�s tipo sistema (serijin�)"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Serijos (serijin�)"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech pel� (serijin�, seno C7 tipo)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Pel�s n�ra"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "nieko"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Pel�s n�ra"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Ar taip gerai?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Internet konfiguracija"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Ar J�s norite pabandyti pasijungti � internet?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Nustatyti tinkl�"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Kur� disk� j�s norite perkelti"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Pasijungimo pavadinimas"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "ISDN Konfiguracija"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+
+#: ../../netconnect.pm_.c:158
+msgid "Connection Configuration"
+msgstr "Pasijungimo Konfiguracija"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "Korto IRQ"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "Kortos mem (DMA)"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "Kortos IO"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "Kortos IO_0"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "Kortos IO_1"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "J�s� asmeninis tel numeris"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Tiek�jo telefono numeris"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "Tiek�jo dns 1"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "Tiek�jo dns 2"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "Prisiskambinimas re�imas"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "Pasisveikinimas (vartotojo vardas)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Slapta�odis"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Patvirtinti Slapta�od�"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "Europa"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Europa (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "Lik�s pasaulis"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "Lik�s pasaulis - be D-Channel (nuomojamos linijos)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "Kokur� protokol� norite naudoti?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "Ne�inau"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "Kokio tipo kort� j�s turite?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "T�sti"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "Atmesti"
+
+#: ../../netconnect.pm_.c:245
 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"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:257
+#, fuzzy
+msgid "Which is your ISDN card ?"
+msgstr "Kokia j�s� laiko juosta?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:287
+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 ""
-"Sveiki, besinaudojantys LILO, operaciniu sistemu ikrovos tvarkykle!\n"
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr ""
+
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Pasirinkite tinklo interfeis�"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Pra�ome pasirinkti, prie kurios serijin�s jungties prijungta J�s� pel�."
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
-"Noredami suzinoti pasirinkimu sarasa, spauskite <TAB>.\n"
+"Do you agree?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Ar J�s norite i�bandyti savo nustatymus"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "Nustatymai"
+
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "Ar norite naudoti aboot?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Ar bandyti surasti modem�?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr ""
+"Pra�ome pasirinkti, prie kurios serijin�s jungties yra prijungtas J�s� "
+"modemas."
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Prisiskambinimo nustatymai"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Pasijungimo pavadinimas"
+
+#: ../../netconnect.pm_.c:546
+#, fuzzy
+msgid "Phone number"
+msgstr "Telefono numeris"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Pasisveikinimo ID"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Autentifikacija"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Scenarinis"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Terminalinis"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Domeno vardas"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Pirmasis DNS serveris"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Antrasis DNS serveris"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
 "\n"
-"Noredami ijungti viena is ju, irasykite jo pavadinima ir spauskite <ENTER>\n"
-"arba laukite %d sekundziu ijungimo pagal nutylejima.\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Pasijungimo pavadinimas"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
 "\n"
+"You can reconfigure your connection."
+msgstr "Nustatyti tinkl�"
 
-# 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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Sveiki, besinaudojantys GRUB, opercainiu sistemu ikrovos tvarkykle!"
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Kur� disk� j�s norite perkelti"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
 msgstr ""
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Spauskite enter, noredami ikrauti pasirinkta OS, 'e', noredami keisti"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Kur� disk� j�s norite perkelti"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "komandas pries ikrova, arba 'c', komandinei eilutei iskviesti "
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Pasijungimo pavadinimas"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Pasirinktas ivadas bus ikrautas automatiskai per %d sekundziu."
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Pasijungimo pavadinimas"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Nustatyti tinkl�"
+
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "Spausdintuvo prijungimas"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Darbastalis"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Nustatyti tinkl�"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Paleidimo meniu"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Nustatyti tinkl�"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - pel�"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr ""
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB pel�"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Eksperto re�imas"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB pel� (2 klavi�ai)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+#, fuzzy
+msgid "Connect to the Internet"
+msgstr "Pasijungimo pavadinimas"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB pel� (3+ klavi�ai)"
+#: ../../netconnect.pm_.c:672
+#, fuzzy
+msgid "What kind is your ISDN connection?"
+msgstr "Prie kurios ser. jungties prijungta J�s� pel�?"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB pel�"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Nustatyti tinkl�"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB pel� (2 klavi�ai)"
+#: ../../netconnect.pm_.c:700
+#, fuzzy
+msgid "France"
+msgstr "Nutraukti"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB pel� (3+ klavi�ai)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr ""
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Paprasta pel� (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr ""
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Paprasta 3 klavi�� pel� (PS/2)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "Eksperto re�imas"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2 "
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Nustatyti tinkl�"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Kokio tipo skirsn� norite tur�ti?"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Nustatyti tinkl�"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "Nustatyti tinkl�"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI pel�"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Tinklo konfiguravimas"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft pel�"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Ar J�s norite i�bandyti savo nustatymus"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech pel�"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "Nustatyti tinkl�"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB pel�"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Pasijungimo pavadinimas"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB pel� (su 3 arba daugiau klavi��)"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "Loalaus tinklo pasijungimai jau sukonfiguruoti. Ar norite :"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Pel�s n�ra"
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "Kur� disk� j�s norite perkelti"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft 2.1A arba v�lesn�s Rev (serijin�)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Tinklo konfiguravimas"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Serijos (serijin�)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (serijin�)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "tinklo korta nerasta"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (serijin�)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Konfiguruojamas tinklas"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (serijin�)"
+#: ../../network.pm_.c:274
+#, fuzzy
+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�au �vesti j�s� kompiuterio vard�.\n"
+"Tai turi b�ti pilnas vardas (pvz ``mybox.mylab.myco.com'').\n"
+"Taip pat galite �vesti IP ir tinkl� s�sajos adresus jeigu juos turite"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (serijin�)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "Kompiuterio vardas:"
+
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (serijin�)"
+#: ../../network.pm_.c:302
+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 ""
+"Pra�au �ra�yti �io kompiuterio IP konfiguracij�.\n"
+"Kiekvienas laukas turi b�ti �ra�ytas kaip IP adresas\n"
+"(pvz. 1.2.3.4)"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (serijin�)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Konfiguruojamas tiklo �renginys %s"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech pel� (serijin�, seno C7 tipo)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Automatinis IP"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (serijin�)"
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "IP adresas"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Paprasta pel� (serijin�)"
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "Tinklo kauk�"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Suderinama su Microsoft (serijin�)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Paprasta 3 klavi�� pel� (serijin�)"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP adresas tur�t� b�ti 1.2.3.4  formato"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Pel�s tipo sistema (serijin�)"
+#: ../../network.pm_.c:341
+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 ""
+"Pra�au �vesti j�s� kompiuterio vard�.\n"
+"Tai turi b�ti pilnas vardas (pvz ``mybox.mylab.myco.com'').\n"
+"Taip pat galite �vesti IP ir tinkl� s�sajos adresus jeigu juos turite"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Ar taip gerai?"
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "DNS serveris"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "Tinkl� s�saja"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "Tinkl� s�sajos �renginys"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "Sto�i� konfiguracija"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy tur�t� b�ti http://..."
 
-#: ../../partition_table.pm_.c:527
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy tur�t� b�ti ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: ../../partition_table.pm_.c:545
+#: ../../partition_table.pm_.c:558
 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 "
@@ -3918,21 +5066,21 @@ msgstr ""
 "Vienintelis sprendimas yra perkelti pirminius skirsnius taip, kad tu��ia "
 "vieta b�t� �alia i�pl�stini� skirsni�"
 
-#: ../../partition_table.pm_.c:634
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Klaida, nuskaitant %s byl�"
 
-#: ../../partition_table.pm_.c:641
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Atstatymas i� %s bylos nepavyko: %s"
 
-#: ../../partition_table.pm_.c:643
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Bloga atsargin� byla"
 
-#: ../../partition_table.pm_.c:664
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Klaida, �ra�ant � byl� %s"
@@ -3966,42 +5114,53 @@ msgstr "�domu"
 msgid "maybe"
 msgstr "gal b�t"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (svarbu)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (labai gerai)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (nuostabu)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Rodyti ma�iau"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Rodyti daugiau"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Vietinis spausdintuvas"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "Nutolintas lpd"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "Nutolintas spausdintuvas"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "Nuotolintas CUPS serveris"
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "Nutolintas lpd serveris"
+
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "NetWare Spausdintuvo Nustatymai"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Spausdintuvo �renginys"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Ie�koma �ranga"
@@ -4015,11 +5174,11 @@ msgstr "Patikrinti jungtis"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "\"%s\" modelio spausdintuvas buvo aptiktas prie "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Vietinio spausdintuvo jungtis"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4027,15 +5186,15 @@ msgstr ""
 "Prie kurio �renginio yra prijungtas j�s� spausdintuvas\n"
 "(atminkite kad /dev/lp0 yra LPT1 ekvivalentas)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Spausdintuvo �renginys"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Nutolinto lpd Spausdintuvo Nustatymai"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4045,19 +5204,19 @@ msgstr ""
 "nurodyti to serverio kompiuterio vard� ir eil�s vard�, kurioje\n"
 "bus talpinami darbai."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Nutolinto kompiuterio vardas"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Nuotolin� eil�"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) Spausdintuvo nustatymai"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4070,27 +5229,27 @@ msgstr ""
 "jo TCP/IP kompiuterio vardo), spausdintuvo serverio IP adres�, spausdintuvo\n"
 "dalinimo vard�, vartotojo vard�, slapta�od� ir darbo grup�s vard�"
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "SMB serverio pavadinimas"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "SMB serverio IP"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Dalinimo vardas"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Darbo grup�"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "NetWare Spausdintuvo Nustatymai"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4102,121 +5261,146 @@ msgstr ""
 "jo TCP/IP kompiuterio vardo), spausdintuvo eil�s vard� spausdintuvui, bei\n"
 "atitinkam� vartotojo vard� ir slapta�od�"
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Spausdintuvo Serveris"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Spausdinimo eil�s pavadinimas"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "Vietinio spausdintuvo nustatymai"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "Spausdintuvo nustatymai"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "Menkas"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Koks yra j�s� spausdintuvo r��is?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Ar J�s norite i�bandyti spausdinim�?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Spausdinamas (-i) bandomasis puslapis (-iai)..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Taip. Atspausdinti ASCII bandom�j� puslap�"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Taip. Atspausdinti PostScript bandom�j� puslap�"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Taip. Atspausdinti abu bandomuosius puslapius"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Nustatyti spausdintuv�"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Koks yra j�s� spausdintuvo r��is?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Spausdintuvo nustatymai"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Lapo dydis"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Ar i�stumti lap� po darbo?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Uniprint tvarkykl�s nustatymai"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Spalv� skai�iaus nustatymai"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Spausdinti tekst� kaip PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Atbulin� puslapi� seka"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Taisyti stair-stepping tekst�?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Puslapi� skai�ius i�vedimo lapuose "
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Kairysis/De�inysis kra�tai ta�kais (1/72 in�io)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Vir�utinis/Apatinis kra�tas ta�kais (1/72 in�io)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Ekstra ghostScript nustatymai"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Ekstra teksto nustatymai"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Ar J�s norite i�bandyti spausdinim�?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Spausdinamas (-i) bandomasis puslapis (-iai)..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Spausdintuvas"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Ar norite nustatyti spausdintuv�?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4224,19 +5408,64 @@ msgstr ""
 "�ia yra �ios spausdinimo eil�s.\n"
 "J�s galite �ia prijungti daugiau arba pakeisti esamus darbus."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "CUPS startuoja"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Pasirinkite spausdintuvo jungt�"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Kur yra prijungtas j�s� spausdinuvas?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "Pasirinkite Nutolinto Spausdintuvo Jungt�"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Pa�alinti darb� eil�"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+#, fuzzy
+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� (� kuri� yra paskiriami darbai) turi\n"
+"tur�ti vard� (da�niausiai lp) ir su ja suri�t� laikmenos katalog�.\n"
+"Koks vardas ir koks katalogas tur�t� b�ti naudojami �iai eilei?"
+
+#: ../../printerdrake.pm_.c:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "Spausdintuvo vardas"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "Apra�ymas"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "Vieta"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4247,45 +5476,45 @@ msgstr ""
 "tur�ti vard� (da�niausiai lp) ir su ja suri�t� laikmenos katalog�.\n"
 "Koks vardas ir koks katalogas tur�t� b�ti naudojami �iai eilei?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Darb� eil�s pavadinimas"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Kaupimo katalogas"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Spausdintuvo prijungimas"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Negaliu prid�ti skirsnio prie _formated_ RAID md%d"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Negaliu �ra�yti bylos $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid nepavyko"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid nepavyko (gal b�t n�ra raidtools?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "%d lygio RAID nepakanka sri�i�\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron yr periodinis komand� tvarkiklis."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4294,13 +5523,13 @@ msgstr ""
 "jis taip pat gali b�ti naudojamas kompiuterio i�jungimui prie �emo akum. "
 "lygio."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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:19
+#: ../../services.pm_.c:20
 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 "
@@ -4308,7 +5537,7 @@ msgid ""
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4316,13 +5545,13 @@ msgid ""
 "and includes support for pop-up menus on the console."
 msgstr ""
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
 msgstr ""
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4332,7 +5561,7 @@ msgid ""
 "all of the services it is responsible for."
 msgstr ""
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4342,19 +5571,19 @@ msgstr ""
 "nurodytas /etc/sysconfig/keyboard byloje. Jis gali b�ti pasirinktas su\n"
 "kbdconfig ut�le. Daugumoje kompiuteri� ji turi b�ti prieinama."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4362,7 +5591,7 @@ msgstr ""
 "Prijungia ir Atjungia visas Tinklo Byl� Sistemas (NFS), SMB (Lan\n"
 "Tvarkykl�/Windows), ir NCP (NetWare) prijungimo vietas."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4370,20 +5599,20 @@ msgstr ""
 "�jungia/I�jungia visas tinklo jungtis, nustatytas paleisti\n"
 "�krovos metu."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP networks.\n"
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4391,7 +5620,7 @@ msgid ""
 "it installed on machines that don't need it."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4399,7 +5628,7 @@ msgid ""
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4407,32 +5636,32 @@ msgstr ""
 "Postfix yra Pa�to perk�limo agentas, naudojamas pa�tui\n"
 "perkelti i� vieno kompiuterio � kit�."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4440,7 +5669,7 @@ msgstr ""
 "�is rwho protokolas leid�ia nutolusiems vartotojams gauti\n"
 "vis� prisijungusi� prie rwho domeno vartotoj� s�ra�� (pana�iai kaip finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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."
@@ -4448,53 +5677,198 @@ msgstr ""
 "Syslog yra jungiamoji vieta, kuri� daugelis domen� naudoja log byl�\n"
 "i�saugojimui. Visada yra gera mintis paleisti syslog."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr "�is paleidimo skriptas pabandys paleisti J�s� usb pel�s modulius."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "Paleid�ia ir sustabdo X �rift� server� pakrovimo metu ir i�jungiant."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Pasirinkite kokias tarnybas po perkrovimo paleisti automati�kai"
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Sveiki, besinaudojantys SILO, operaciniu sistemu ikrovos tvarkykle!\n"
-"\n"
-"Noredami suzinoti pasirinkimu sarasa, spauskite <TAB>.\n"
-"\n"
-"Noredami ijungti viena is ju, irasykite jo pavadinima ir spauskite <ENTER>\n"
-"arba laukite %d sekundziu ijungimo pagal nutylejima.\n"
-"\n"
+"A� negaliu perskaityti j�s� skirsni� lentel�s, ji man per daug sugadinta :(\n"
+"Pabandysiu nuimti blogus skirsnius"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Nustatyti LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Sukurti �krovos diskel�"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Su�ym�ti diskel�"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Pasirinkimas"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "LILO �diegimas nepavyko. �vyko sekanti klaida:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Lentel�"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Nustatyti X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Lentel�"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "Internet pasijungimo dalinimas"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Prisiskambinimas re�imas"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "Aptikta firewall konfiguracija!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Nustatome IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Sveikiname!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4555,23 +5929,30 @@ msgstr "Nustatomas saugumo lygis"
 msgid "Choose the tool you want to use"
 msgstr "Pasirinkite kur� �rank� naudosite"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Koks J�s� klaviat�ros i�d�stymas"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Pakeisti skiriam�j� geb�"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Kokia J�s� pel�s r��is?"
+#: ../../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 ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
+
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "serial_usb nerasta\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Ar emuliuoti tre�i� klavi��?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Prie kurios ser. jungties prijungta J�s� pel�?"
 
@@ -4784,15 +6165,756 @@ msgstr "Ie�koma lap�"
 msgid "Finding leaves takes some time"
 msgstr "Lap� ie�kojimas �iek tiek u�truks"
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Internet konfiguracija"
+
+#, fuzzy
+msgid "Internet"
+msgstr "�domu"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Biuras"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multimedija"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multimedija"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multimedija"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multimedija"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multimedija"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Pasirinkite kokio norite �diegti dyd�io"
+
+#~ msgid "Total size: "
+#~ msgstr "Bendras dydis: "
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "Perkonfiguruoti tinkl� dabar"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "Viskas sukonfiguruota.\n"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Pasijungimo pavadinimas"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Pasijungimo pavadinimas"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Pasijungimo pavadinimas"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Pasijungimo pavadinimas"
+
+#~ msgid "Germany"
+#~ msgstr "Vokie�i�"
+
+#, fuzzy
+#~ msgid "Germany (1TR6)"
+#~ msgstr "Vokie�i� (1TR6)"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "K� J�s norite pakeisti"
+
+#~ msgid "Install/Rescue"
+#~ msgstr "�diegti/I�gelb�ti"
+
+#~ msgid "Rescue"
+#~ msgstr "I�gelb�ti"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Kokio tipo skirsn� norite tur�ti?"
+
+#~ 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Pasirinkite \"�diegti\" jeigu nebuvo �diegta ankstesni� GNU/Linux 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"
+#~ "\n"
+#~ "\n"
+#~ "Pasirinkite:\n"
+#~ "\n"
+#~ " - Rekomenduojama: Jeigu jums ans�iau n�ra tek� �diegti GNU/Linux.\n"
+#~ "\n"
+#~ " - Vartotoji�ka: Jeigu jau tur�jote reikal� su GNU/Linux. Gal�site "
+#~ "pasirinkti\n"
+#~ "pirmin� kompiuterio funkcij�\n"
+#~ "\n"
+#~ " - Eksperto: Jeigu j�s puikiai sekasi su GNU/Linux i�spr�sti rimtas "
+#~ "u�duotis.\n"
+#~ "Kaip ir konfiguracijoje \"Vartotoji�ka\" j�s gal�site pasirinkti koks bus\n"
+#~ "�ios sistemos panaudojimas.\n"
+#~ "   Bet Pra�ome, Pra�ome NESIRINKITE TAI, APIE K� J�S NIEKO NE�INOTE!\n"
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "Dabar j�s galite pasirinkti � kuri�(-ias) srit�(-is) �diegsime\n"
+#~ "Linux-Mandrake\n"
+#~ "sistem�, jeigu tai dar nebuvo nustatyta anks�iau (nuo buvusio Linux\n"
+#~ "�diegimo\n"
+#~ "arba su kokia nors skirsni� skirstymo programa). �i operacija susideda i�\n"
+#~ "loginio\n"
+#~ "kompiuterio kieto disko padalinimo � kelius skirsnius.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jeigu jums reikia sukurti naujus skirsnius, naudokite \"Automatinis\n"
+#~ "nustatymas\", norint\n"
+#~ "automati�kai sukurti Linux skirsnius. Norint skirsni� suk�rimui pasirinkti "
+#~ "kaupikl�,\n"
+#~ "spauskite \"hda\", jeigu tai pirmasis IDE diskas ant kanalo, \"hdb\" jeigu\n"
+#~ "antras ant pirmo IDE kanalo, \"sda\" jeigu pirmas SCSI diskas ir t.t\n"
+#~ "\n"
+#~ "\n"
+#~ "Du pagrindiniai skirsniai yra: root skirsnis (/), kuris yra sistemos "
+#~ "pradinis\n"
+#~ "ta�kas ir /boot, kuris susideda i� byl�, kuri� reikia sistemos u�krovimui,\n"
+#~ " kada kompiuteris pirm� kart� �jungiamas\n"
+#~ "\n"
+#~ "\n"
+#~ "Kadangi �io proceso rezultatas yra negr��tamas, t� daryti nepatyrusiam\n"
+#~ "vartotojui\n"
+#~ "gali b�ti sunku. Vis� proced�r� supaprastina DiskDrake. Prie�\n"
+#~ "prad�dami,\n"
+#~ "pasi�i�r�kite dokumentacij�.\n"
+#~ "\n"
+#~ "J�s galite tai daryti klaviat�ros pagalba: eikite per skirsnius klavi�� Tab\n"
+#~ "ir Up/Down klavi�� pagalba\n"
+#~ ". Kada skirnis pasirinktas, J�s galite naudoti:\n"
+#~ "\n"
+#~ "- Ctrl-c, nor�dami sukurti nauj� skirsn� (kada b�na pasirinktas tu��ias "
+#~ "skirsnis)\n"
+#~ "\n"
+#~ "- Ctrl-d, nor�dami i�trinti skirsn�\n"
+#~ "\n"
+#~ "- Ctrl-m, nor�dami nurodyti prijungimo viet�\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."
+#~ msgstr ""
+#~ "Visos naujai nustatytos sritys norint jas naudoti turi b�ti suformatuotos\n"
+#~ "(formatavimas rei�ia falin�s sistemos suk�rim�). Dabar j�s gal b�t norite\n"
+#~ "i�naujo suformatuoti jau formatuotas sritis, kad i�trinti jose esan�ius\n"
+#~ "duomenis. Atminkite kad i�naujo formatuoti jau formatuotas sitis n�ra\n"
+#~ "b�tina, nes jose gali b�ti reikalinga informacija."
+
+#~ 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."
+#~ msgstr ""
+#~ "Dabar yra �diegiami paketai, kuriuos j�s pasirinkote. Tai tur�t�\n"
+#~ "kelet� minu�i� u�trukti, ta�iau jeigu j�s pasirinkote atnaujinti\n"
+#~ "tai tur�t� u�trukti kiek ilgiau."
+
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Jeigu DrakX nepavyko surasti j�s� pel�s arba j�s pats norite j�\n"
+#~ "nurodyti; jums bus parodytas s�ra�as\n"
+#~ "\n"
+#~ "\n"
+#~ "Jeigu j�s sutinkate su DrakX nustatymais tiesiog paspauskite OK.\n"
+#~ "Kitokiu atveju pasirinkite pel� kuri jums labiausiai tinka.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jeigu pas jus yra pel� su serijine jungtimi jums taip pat reik�s nurodyti\n"
+#~ "prie kokios jungties ji yra prijungta."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "�i sekcija yra skirta vietinio tinklo (LAN) nustatymui.\n"
+#~ "\n"
+#~ "Jeigu j�s pasakyrite \"Taip\" DrakX pabandys pats surasti tinklo kort�.\n"
+#~ "PCI �renginys tur�t� b�ti surastas ir prijungtas automati�kai. Ta�iau\n"
+#~ "jeigu j�s� turite ISA �rengin� automatinis aptikimas nesuveiks ir j�s\n"
+#~ "tur�site nurodyti tvarkykl� i� s�ra�o, kuris tada pasirodys.\n"
+#~ "\n"
+#~ "\n"
+#~ "D�l SCSI �rengini�, leiskite tvarkyklei pirmiau pa�iai pabandyti �rengin�,\n"
+#~ "nes kitokio atveju jums teks nurodyti nustatymus i� Windows Control Panel\n"
+#~ "konfiguracijos\n"
+#~ "\n"
+#~ "\n"
+#~ "Jeigu j�s �diegiate Linux-Mandrake � 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"
+#~ "reik�s pasirinkti pa�iam."
+
+#~ 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."
+#~ msgstr ""
+#~ "Labai rekomenduojama �ia pasirinkti \"Taip\". Jeigu j�s v�liau \n"
+#~ "�diegin�site Microsoft Windows ji naujai u�ra�ys startavimo sektori�.\n"
+#~ "Tada nepadar� startavimo diskelio kaip mes patar�je nebegal�site\n"
+#~ "startuoti GNU/Linux."
+
+#~ msgid "Move your wheel!"
+#~ msgstr "Pajudinkite ratuk�!"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Ar pamir�ti pakeitimus?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "Spausdintuvo prijungimas"
+
+#~ msgid "Host name:"
+#~ msgstr "Kompiuterio vardas:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Kokia J�s� pel�s r��is?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Automatin� skiriamoji geba"
+
+#~ 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"
+#~ msgstr ""
+#~ "A� pabandysiu �vairias galimas skiriamasias gebas.\n"
+#~ "J�s� ekranas mirg�s...\n"
+#~ "Jeigu norite, galite j� i�jungti, J�s i�girsite pyptel�jim�, kai bus baigta"
+
+#~ 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?"
+#~ msgstr ""
+#~ "A� galiu pabandyti surasti prieinam� skiriam�j� geb� (pvz.: 800x600).\n"
+#~ "Bet kompiuteris gali \"pakibti\"\n"
+#~ "Ar J�s norite pabandyti?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Nerasta galim� variant�\n"
+#~ "Pabandykite kit� video plok�t� arba monitori�"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Automatin� skiriamosios gebos paie�ka"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB pel�"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB pel� (2 klavi�ai)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB pel� (3+ klavi�ai)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB pel�"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB pel� (2 klavi�ai)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB pel� (3+ klavi�ai)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Paprasta pel�"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI pel�"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft pel�"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech pel�"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB pel�"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB pel� (su 3 arba daugiau klavi��)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft 2.1A arba v�lesn�s Rev (serijin�)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (serijin�)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (serijin�)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (serijin�)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Paprasta pel� (serijin�)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Suderinama su Microsoft (serijin�)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Paprasta 3 klavi�� pel� (serijin�)"
+
+#, fuzzy
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "nfs prijungimas nepavyko"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Kriptografija"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "Ar J�s norite nustatyti savo sistemos vietin� tinkl�?"
+
+#~ msgid "Show less"
+#~ msgstr "Rodyti ma�iau"
+
+#~ msgid "Show more"
+#~ msgstr "Rodyti daugiau"
+
+#~ msgid "curly"
+#~ msgstr "curly"
+
+#~ msgid "default"
+#~ msgstr "Pagrindinis"
+
+#~ msgid "tie"
+#~ msgstr "tie"
+
+#~ msgid "brunette"
+#~ msgstr "brunet�"
+
+#~ msgid "girl"
+#~ msgstr "mergina"
+
+#~ msgid "woman-blond"
+#~ msgstr "blondin�"
+
+#~ msgid "automagic"
+#~ msgstr "Automagic"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Koks J�s� klaviat�ros i�d�stymas"
+
+#~ msgid "Normal"
+#~ msgstr "Normali"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Ar pabandyti surasti PCMCIA kortas?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "Ar bandyti surasti %s �renginius"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "Modemo Nustatymai"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "Ar J�s norite nustatyti savo modemo dialup prisijungim�?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "Ar bandyti surasti PCI �renginius"
+
+#~ msgid "Searching root partition."
+#~ msgstr "Ie�komas pagrindinis skirsnis."
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: Tai ne pagrindinis skirsnis, pra�om pasirinkti kit�"
+
+#~ msgid "No root partition found"
+#~ msgstr "Nerastas pagrindinis skirsnis"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "Negalima naudoti transliavimo be NIS domeno"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "Pra�ome pasirinkti skirsn�, kur� J�s naudosite kaip pagrindin�."
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "Jums neu�tenka vietos Lnx4win"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "Automatinis"
+
+# 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.
+#
+#~ 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 ""
+#~ "Sveiki, besinaudojantys LILO, operaciniu sistemu ikrovos tvarkykle!\n"
+#~ "\n"
+#~ "Noredami suzinoti pasirinkimu sarasa, spauskite <TAB>.\n"
+#~ "\n"
+#~ "Noredami ijungti viena is ju, irasykite jo pavadinima ir spauskite <ENTER>\n"
+#~ "arba laukite %d sekundziu ijungimo pagal nutylejima.\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
+#
+#~ 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 ""
+#~ "Sveiki, besinaudojantys SILO, operaciniu sistemu ikrovos tvarkykle!\n"
+#~ "\n"
+#~ "Noredami suzinoti pasirinkimu sarasa, spauskite <TAB>.\n"
+#~ "\n"
+#~ "Noredami ijungti viena is ju, irasykite jo pavadinima ir spauskite <ENTER>\n"
+#~ "arba laukite %d sekundziu ijungimo pagal nutylejima.\n"
+#~ "\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "Bendri SILO nustatymai"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "SILO turi sekan�ius �ra�us.\n"
+#~ "J�s galite pakeisti esamus arba prid�ti nauj�."
+
+#~ msgid "This label is already in use"
+#~ msgstr "�i �ym� jau naudojama"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "SILO �diegimas nepavyko. �vyko sekanti klaida:"
+
+#~ 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."
+#~ msgstr ""
+#~ "Pirmiausia DrakX pabandys paie�koti PCI ir SCSI �rengini�. Jeigu jis suras\n"
+#~ "ir �inos kokias tvarkykles jam (jiems) naudoti jis automati�kai jas �d�s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jeigu j�s� SCSI �renginys yra ISA plok�t� arba DrakX ne�inos kaip j� "
+#~ "valdyti\n"
+#~ "arba j�s i�vis jo neturite jums bus prane�ta. Jeigu j�s neturite, "
+#~ "atsakykite\n"
+#~ "\"Ne\". Jeigu turite vienq arba daugiau atsakykite \"Taip\" ir tvarkykli� "
+#~ "s�ra�as\n"
+#~ "bus jums parodytas\n"
+#~ "\n"
+#~ "\n"
+#~ "Kai j�s pasirinksite tvarkykl�, DrakX papra�ys nurodyti jos nustatymus.\n"
+#~ "Pirmiausia leiskite �rangai pa�iai nusistatyti. Da�nai tai puikiai suveikia\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "Jeigu jums nepavyks, nepamir�kite, kad informacijos apie j�s� �rang� gali\n"
+#~ "suteikti dokumentacija arba Windows (jeigu j�s turite �i� sistem�).\n"
+#~ "Tai tuos nustatymus j�s turite perduoti tvarkyklei."
+
+#~ msgid "Shutting down"
+#~ msgstr "Bandoma i�jungti"
+
 #~ msgid "useless"
 #~ msgstr "nenaudinga"
 
 #~ msgid "garbage"
 #~ msgstr "i�kraipymai"
 
-#~ msgid "Recommended"
-#~ msgstr "Rekomenduojama"
-
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
@@ -4906,21 +7028,12 @@ msgstr "Lap� ie�kojimas �iek tiek u�truks"
 #~ msgid "Setup SCSI"
 #~ msgstr "Nustatyti SCSI"
 
-#~ msgid "Which language do you want?"
-#~ msgstr "Kokios kalbos J�s norite"
-
 #~ msgid "Which packages do you want to install"
 #~ msgstr "Kokius j�s norite �diegti paketus"
 
 #~ msgid "Local LAN"
 #~ msgstr "Lokalus LAN"
 
-#~ msgid "Dialup with modem"
-#~ msgstr "Prisiskambinimas modemu"
-
-#~ msgid "Local Printer Options"
-#~ msgstr "Vietinio spausdintuvo nustatymai"
-
 #~ msgid "server"
 #~ msgstr "serveris"
 
diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po
index 87ac01e15..d40767e10 100644
--- a/perl-install/share/po/lv.po
+++ b/perl-install/share/po/lv.po
@@ -6,51 +6,104 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-04 18:38+0200\n"
-"PO-Revision-Date: 1999-12-22 15:33+0100\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
+"PO-Revision-Date: 2000-10-01 21:05+0200\n"
 "Last-Translator: Vitauts Stochka <vit@dpu.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:116 ../../Xconfigurator.pm_.c:236
-msgid "Generic"
-msgstr "Visp�r�ja"
-
-#: ../../Xconfigurator.pm_.c:172
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Grafisk� karte"
 
-#: ../../Xconfigurator.pm_.c:172
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Izv�lieties grafisko karti"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Izv�lieties X serveri"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X serveris"
 
-#: ../../Xconfigurator.pm_.c:198
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Kuru XFree konfigur�ciju j�s izv�laties?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"J�su kartei ir iesp�jama aparat�ras 3D akseler�cija, bet tikai ar XFree %s.\n"
+"J�su karti uztur XFree %s, kam var b�t lab�ks 2D atbalsts."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr "J�su kartei ir iesp�jama aparat�ras 3D akseler�cija ar XFree %s."
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s ar aparat�ras 3D akseler�ciju"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"J�su karte nodro�ina aparat�ras 3D akseler�ciju, bet tikai ar XFree %s,\n"
+"�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:248
+#, 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 ""
+"J�su kartei ir iesp�jama aparat�ras 3D akseler�cija ar XFree %s.\n"
+"�EMIET V�R�, KA TAS IR EKSPERIMENT�LS ATBALSTS, KAS VAR UZK�RT DATORU."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s ar EKSPERIMENT�LU aparat�ras 3D akseler�ciju"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "XFree konfigur�cija"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Izv�lieties grafisk�s kartes atmi�as apjomu"
 
-#: ../../Xconfigurator.pm_.c:225
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Izv�lieties servera opcijas"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Izv�lieties monitoru"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitors"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -70,41 +123,41 @@ msgstr ""
 "Ir �OTI SVAR�GI, lai j�s nenor�d�tu monitora tipu, kura sinhroniz�cijas\n"
 "frekvence p�rsniedz j�su monitora iesp�jas: j�s varat saboj�t savu "
 "monitoru.\n"
-" Ja j�s �aub�ties, izv�lieties konservat�v�ko variantu."
+" Ja �aubaties, izv�lieties konservat�v�ko variantu."
 
-#: ../../Xconfigurator.pm_.c:246
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Horizont�l� frekvence"
 
-#: ../../Xconfigurator.pm_.c:246
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Vertik�l� frekvence"
 
-#: ../../Xconfigurator.pm_.c:285
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Monitors nav konfigur�ts"
 
-#: ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Grafisk� karte pagaid�m nav konfigur�ta"
 
-#: ../../Xconfigurator.pm_.c:291
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Iz��irtsp�jas pagaid�m nav izv�l�tas"
 
-#: ../../Xconfigurator.pm_.c:304
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Vai v�laties izm��in�t �o konfigur�ciju?"
 
-#: ../../Xconfigurator.pm_.c:308
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr "Br�din�jums: ��s grafisk�s kartes test��ana ir b�stama"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr "Br�din�jums: ��s grafisk�s kartes test��ana var uzk�rt datoru"
 
-#: ../../Xconfigurator.pm_.c:311
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Test�t konfigur�ciju"
 
-#: ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -112,185 +165,172 @@ msgstr ""
 "\n"
 "m��iniet izmain�t da�us parametrus"
 
-#: ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Atkl�ta k��da:"
 
-#: ../../Xconfigurator.pm_.c:373
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
-msgstr "P�rtrauk�u p�c %d sekund�m"
+msgstr "Atliek %d sekundes"
 
-#: ../../Xconfigurator.pm_.c:377
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
-msgstr "Vai t� ir pareizi?"
+msgstr "Vai viss ir pareizi?"
 
-#: ../../Xconfigurator.pm_.c:385
+#: ../../Xconfigurator.pm_.c:513
 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:393 ../../Xconfigurator.pm_.c:574
-msgid "Automatic resolutions"
-msgstr "Autom�tiskas iz��irtsp�jas"
-
-#: ../../Xconfigurator.pm_.c:394
-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"
-msgstr ""
-"Lai samekl�tu pieejam�s iz��irtsp�jas, tiks izm��in�ti da��di\n"
-"varianti. Att�ls uz ekr�na var pazust...\n"
-"Ja v�laties, varat to izsl�gt. Kad p�rbaude beigsies, j�s dzird�sit\n"
-"ska�as sign�lu"
-
-#: ../../Xconfigurator.pm_.c:452 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Iz��irtsp�ja"
 
-#: ../../Xconfigurator.pm_.c:487
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Izv�lieties iz��irtsp�ju un kr�su dzi�umu"
 
-#: ../../Xconfigurator.pm_.c:489
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafisk� karte: %s"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 serveris: %s"
 
-#: ../../Xconfigurator.pm_.c:499
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Par�d�t visu"
 
-#: ../../Xconfigurator.pm_.c:523
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Iz��irtsp�jas"
 
-#: ../../Xconfigurator.pm_.c:575
-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?"
-msgstr ""
-"Es varu m��in�t samekl�t pieejam�s iz��irtsp�jas (piem.: 800x600).\n"
-"Tom�r reiz�m tas var uzk�rt j�su datoru.\n"
-"Vai v�laties pam��in�t?"
-
-#: ../../Xconfigurator.pm_.c:580
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Nav atrasts neviens der�gs re��ms\n"
-"Pam��iniet ar citu video karti vai monitoru"
-
-#: ../../Xconfigurator.pm_.c:920
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastat�ras izk�rtojums: %s\n"
 
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Peles tips: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Peles ier�ce: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitors: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitora horizont�l� frekv.: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitora vertik�l� frekv.: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafisk� karte: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Grafisk� atmi�a: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "Kr�su dzi�ums: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Iz��irtsp�ja: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 serveris: %s\n"
 
-#: ../../Xconfigurator.pm_.c:943
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 draiveris: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Gatavoju X-Window konfigur�ciju"
 
-#: ../../Xconfigurator.pm_.c:957
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Monitora mai�a"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Grafisk�s kartes mai�a"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Servera opciju mai�a"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Iz��irtsp�jas mai�a"
 
-#: ../../Xconfigurator.pm_.c:961
-msgid "Automatical resolutions search"
-msgstr "Autom�tiska iz��irtsp�ju mekl��ana"
-
-#: ../../Xconfigurator.pm_.c:965
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Par�d�t inform�ciju"
 
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "M��in�t v�lreiz"
 
-#: ../../Xconfigurator.pm_.c:967 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Iziet"
 
-#: ../../Xconfigurator.pm_.c:971 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Ko j�s v�laties dar�t?"
 
-#: ../../Xconfigurator.pm_.c:978
-msgid "Forget the changes?"
-msgstr "Vai aizmirst izmai�as?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"Saglab�t izmai�as?\n"
+"Pa�reiz�j� konfigur�cija ir:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:996
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
-msgstr "L�dzu atk�rtoti iere�istr�jieties %s, lai aktiviz�tu izmai�as"
+msgstr "Lai aktiviz�tu izmai�as, l�dzu aizveriet un atveriet %s sesiju"
 
-#: ../../Xconfigurator.pm_.c:1012
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "L�dzu izre�istr�jieties un tad nospiediet Ctrl-Alt-BackSpace"
+msgstr "L�dzu aizveriet sesiju un nospiediet Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1015
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X p�c start��anas"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -298,226 +338,222 @@ msgstr ""
 "Datoru var konfigur�t, lai p�c sist�mas iel�des autom�tiski start�tu X.\n"
 "Vai v�laties, lai p�c p�rstart��anas tiktu start�ts X?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Autologin"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"Varat konfigur�t sist�mu 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 atsauk�anas pogu."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Izv�lieties noklus�to lietot�ju:"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "Nor�diet palai�amo logu mened�eri:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 kr�sas (8 biti)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 t�ksto�i kr�su (15 biti)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 t�ksto�i kr�su (16 biti)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 miljoni kr�su (24 biti)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 miljardi kr�su (32 biti)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB vai vair�k"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Parasts VGA, 640x480 pie 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 pie 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 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:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Augstas frekvences SVGA, 1024x768 pie 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frekven�u, kas uztur 1280x1024 pie 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frekcen�u, kas uztur 1280x1024 pie 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frekven�u, kas uztur 1280x1024 pie 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitors, kas uztur 1600x1200 pie 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitors, kas uztur 1600x1200 pie 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "sprogains"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "noklus�ts"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "ar kaklasaiti"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "brunete"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "meitene"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "blond�ne"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "automa�isks"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "S�kn�jam�s sada�as pirmais sektors"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Diska iek�rtas pirmais sektors (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "LILO/grub instal��ana"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "SILO instal��ana"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Kur v�laties instal�t s�kn�t�ju?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub instal��ana"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Neviens"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Kuru(s) s�kn�t�ju(s) v�laties izmantot?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "S�kn�t�ja instal��ana"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "S�kn�jam� ier�ce"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (nedarbojas ar veciem BIOSiem)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Kompakts"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "kompakts"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Pauze pirms noklus�t� att�la iel�des"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Video re��ms"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Pauze pirms noklus�t� att�la iel�des"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Parole"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Parole (atk�rtoti)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Ierobe�ot komandrindas opcijas"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "ierobe�ot"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "S�kn�t�ja galven�s opcijas"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "L�dzu m��iniet v�lreiz"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Paroles nesakr�t"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -525,167 +561,383 @@ msgstr ""
 "�eit ir da��di s�kn��anas ieraksti.\n"
 "J�s varat pievienot jaunus vai izmain�t eso�os."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Pievienot"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Izdar�ts"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "K�da veida ierakstu gribat pievienot"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Cita OS (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Cita OS (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "K�da veida ierakstu gribat pievienot"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Att�ls"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Sakne"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Papildin�t"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Las�t-rakst�t"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Tabula"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Nedro�s"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Nosaukums"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Noklus�ts"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Izdz�st ierakstu"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Tuk�s nosaukums nav at�auts"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "�is nosaukums jau ir izmantots"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Atrasti %s %s interfeisi"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Vai dator� ir v�l k�ds?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Vai dator� ir k�ds %s interfeiss?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "N�"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "J�"
+
+#: ../../any.pm_.c:505
+msgid "See hardware info"
+msgstr "Apskat�t aparat�ras inform�ciju"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Instal�ju draiveri %s kartei %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(modulis %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Kuru %s draiveri pam��in�t?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"Da�os gad�jumos %s draiverim ir j�nor�da papildus inform�cija, lai tas\n"
+"darbotos pareizi, tom�r parasti t� nav vajadz�ga. Vai v�laties nor�d�t\n"
+"papildus parametrus, vai ar� �ausiet draiverim aptauj�t datoru un sav�kt\n"
+"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:547
+msgid "Autoprobe"
+msgstr "Aptauj�t"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Nor�d�t opcijas"
+
+#: ../../any.pm_.c:551
+#, 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:557
+#, 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 ""
+"Tagad j�s varat nor�d�t modu�a %s opcijas.\n"
+"Opcijas j�nor�da form�t� ``nosaukums=v�rt�ba nosaukums2=v�rt�ba2 ...''.\n"
+"Piem�ram, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Modu�a opcijas:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Modu�a %s iel�de bija neveiksm�ga.\n"
+"Vai v�laties pam��in�t ar citiem parametriem?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Juus sveicina %s, opereetaajsisteemu paarsleedzeejs!\n"
+"\n"
+"Sarakstaa izveelieties vajadziigo sisteemu vai gaidiet %d sekundes, liidz "
+"tiks ielaadeeta nokluseetaa sisteema.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Juus sveic GRUB, opereetaajsisteemu izveeles programma!"
+
+# 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
+#
+#: ../../bootloader.pm_.c:597
+#, 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."
+
+# 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
+#
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Nospiediet ievadu, lai saakneetu izveeleeto OS, 'e', lai redigeetu"
+
+# 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
+#
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "komandas pirms saakneesanas, vai 'c', lai izsauktu komandrindu."
+
+# 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
+#
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "Izdaliitais ieraksts tiks saakneets peec %d sekundeem."
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr "nepietiek vietas sada�� /boot"
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Darbagalds"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Starta izv�lne"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d min�tes"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 min�te"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekundes"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Izveidot"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Nomont�t"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Izdz�st"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Format�t"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:590
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Main�t izm�ru"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Tips"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Mont��anas punkts"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Ierakst�t /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "P�rsl�gties uz eksperta re��mu"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "P�rsl�gties uz norm�lu re��mu"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Atjaunot no faila"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Saglab�t fail�"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "Meistars"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Atjanot no disketes"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Saglab�t disket�"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Izt�r�t visu"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Format�t visu"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Izvietot autom�tiski"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Visas prim�r�s sada�as ir izmantotas"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Vairs nevaru pievienot nevienu sada�u"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -693,59 +945,63 @@ msgstr ""
 "Ja v�laties vair�k sada�as, l�dzu izdz�siet vienu sada�u, lai var�tu "
 "izveidot papla�in�tu sada�u"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Izgl�bt sada�u tabulu"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Atcelt"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Ierakst�t sada�u tabulu"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "P�rl�d�t"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Tuk�s"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
-msgstr ""
+msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Cits"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Tuk�s"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Cits"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Failu sist�mu tipi:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Deta�as"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -757,17 +1013,17 @@ msgstr ""
 "Iesaku vispirms izmain�t ��s sada�as izm�ru\n"
 "(uzklik��iniet uz t�s, tad uz \"Main�t izm�ru\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "L�dzu vispirms izveidojiet datu rezerves kopiju"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
 #: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Lasiet uzman�gi!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -776,77 +1032,77 @@ msgstr ""
 "Ja gatavojaties izmantot aboot, neaizmirstiet atst�t br�vu vietu diska\n"
 "s�kum� (2048 sektori ir pietieko�i)"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Esiet uzman�gi: �� oper�cija ir b�stama."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "K��da"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:680
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Mont��anas punkts: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Ier�ce: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS iek�rtas burts: %s (tikai min�jums)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Tips: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "S�kums: sektors %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Izm�rs: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektori"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "No cilindra %d l�dz cilindram %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Format�ts\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Neformat�ts\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Mont�ts\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Loopback fails(i): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -854,79 +1110,79 @@ msgstr ""
 "Noklus�ti s�kn�jam� sada�a\n"
 "    (lai s�kn�tu MS-DOS, nevis lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "L�menis %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Gabala izm�rs %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID diski %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Loopback faila nosaukums: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "L�dzu uzklik��iniet uz sada�as"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Izm�rs: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "�eometrija: %s cilindri, %s galvas, %s sektori\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Sada�u tabulas tips: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "uz �inas %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Mont�ta"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Akt�va"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Pievienot pie RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Izsl�gt no RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Izmain�t RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Izmantot priek� loopback"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Izv�lieties darb�bu"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -938,7 +1194,7 @@ msgstr ""
 "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:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -949,63 +1205,67 @@ msgstr ""
 "�� 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:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "J�s esat izv�l�jies programmisku 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, ja v�laties izmantot lilo vai grub"
+"T�p�c neaizmirstiet izveidot /boot sada�u."
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "T� viet� izmantojiet ``%s''"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Vispirms izmantojiet ``Nomont�t''"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, 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.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Tom�r turpin�t?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Iziet bez saglab��anas"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Iziet bez sada�u tabulas ierakst��anas?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Nomain�t sada�as tipu"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "K�du sada�as tipu j�s v�laties?"
+#: ../../diskdrake.pm_.c:471
+msgid "Which filesystem do you want?"
+msgstr "Kuru failsist�mu v�laties izmantot?"
+
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
+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.pm_.c:483
+#: ../../diskdrake.pm_.c:490
 #, 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:484
+#: ../../diskdrake.pm_.c:491
 #, 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:489
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1013,39 +1273,39 @@ msgstr ""
 "Nevaru no�emt mont��anas punktu, jo �� sada�a tiek izmantota ka loopback.\n"
 "Vispirms nodz�siet loopback"
 
-#: ../../diskdrake.pm_.c:508
+#: ../../diskdrake.pm_.c:515
 #, 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.pm_.c:510
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Format�ju"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Format�ju loopback failu %s"
 
-#: ../../diskdrake.pm_.c:512 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Format�ju sada�u %s"
 
-#: ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "P�c visu sada�u format��anas"
 
-#: ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "visi ��j�s sada��s eso�ie dati tiks pazaud�ti"
 
-#: ../../diskdrake.pm_.c:527
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "P�rvietot"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Uz kuru disku v�laties p�rvietot?"
 
@@ -1074,79 +1334,83 @@ msgstr "Iek�rtas %s sada�u tabula tiks ierakst�ta uz diska!"
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Lai izmai�as s�ktu darboties, jums b�s j�p�rstart� dators"
 
-#: ../../diskdrake.pm_.c:569 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Izskait�oju fat failu sist�mas robe�as"
 
-#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:618
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Mainu izm�ru"
 
-#: ../../diskdrake.pm_.c:585
+#: ../../diskdrake.pm_.c:592
+msgid "This partition is not resizeable"
+msgstr "�is sada�as izm�ru nevar izmain�t"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "Visiem �aj� sada�� eso�ajiem datiem j�izveido rezerves kopijas"
 
-#: ../../diskdrake.pm_.c:587
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "P�c sada�as %s izm�ra mai�as visi �aja sada�� eso�ie dati tiks pazaud�ti"
 
-#: ../../diskdrake.pm_.c:597
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Izv�lieties jauno izm�ru"
 
-#: ../../diskdrake.pm_.c:597 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:652
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Izveidot jaunu sada�u"
 
-#: ../../diskdrake.pm_.c:672
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "S�kuma sektors: "
 
-#: ../../diskdrake.pm_.c:676 ../../diskdrake.pm_.c:750
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Izm�rs MB: "
 
-#: ../../diskdrake.pm_.c:679 ../../diskdrake.pm_.c:753
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Failu sist�mas tips: "
 
-#: ../../diskdrake.pm_.c:682
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Priek�roka: "
 
-#: ../../diskdrake.pm_.c:729 ../../install_steps.pm_.c:132
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "�o sada�u nevar izmantot priek� loopback"
 
-#: ../../diskdrake.pm_.c:739
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:749
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Loopback faila nosaukums: "
 
-#: ../../diskdrake.pm_.c:775
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "Fails jau tiek izmantots citam loopback, izv�lieties citu failu"
 
-#: ../../diskdrake.pm_.c:776
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "Fails jau eksist�. Vai to izmantot?"
 
-#: ../../diskdrake.pm_.c:798 ../../diskdrake.pm_.c:814
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Izv�lieties failu"
 
-#: ../../diskdrake.pm_.c:807
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1154,11 +1418,11 @@ msgstr ""
 "Sada�u tabulas rezerves kopijai ir cits izm�rs\n"
 "Vai tom�r turpin�t?"
 
-#: ../../diskdrake.pm_.c:815
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Uzman�bu"
 
-#: ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1166,77 +1430,78 @@ msgstr ""
 "Ielieciet disketi\n"
 "Visi uz disketes eso�ie dati tiks pazaud�ti"
 
-#: ../../diskdrake.pm_.c:830
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "M��inu izgl�bt sada�u tabulu"
 
-#: ../../diskdrake.pm_.c:841
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "ier�ce"
 
-#: ../../diskdrake.pm_.c:842
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "l�menis"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "gabala izm�rs"
 
-#: ../../diskdrake.pm_.c:855
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Izv�lieties eso�u RAID, kam pievienot"
 
-#: ../../diskdrake.pm_.c:856
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "jauns"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s format��ana %s neizdev�s"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, 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:186
-msgid "nfs mount failed"
-msgstr "nfs mont��ana neizdev�s"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "mont��ana neizdev�s: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "k��da nomont�jot %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Mont��anas punktiem j�s�kas ar /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, 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:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Cikliski mont��anas punkti %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr "�im katalogam ir j�paliek saknes failsist�m�"
+
+#: ../../fsedit.pm_.c:259
 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:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "K��da atverot %s ierakst��anai: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1244,76 +1509,127 @@ msgstr ""
 "Atkl�ta k��da - nav atrasta neviena ier�ce, kas der�tu jaunu failu sist�mu "
 "veido�anai. L�dzu p�rbaudiet aparat�ru, lai noskaidrotu probl�mas iemeslu"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Jums nav nevienas sada�as!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
-msgstr "Izv�lieties v�lamo instal��anas un sist�mas izmanto�anas valodu."
+#: ../../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
+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�apstiprina augst�k eso��s licences "
+"nosac�jumi.\n"
+"\n"
+"\n"
+"L�dzu izv�lieties \"Pie�emt\", ja piekr�tat nosac�jumiem.\n"
+"\n"
+"\n"
+"L�dzu izv�lieties \"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:10
+#: ../../help.pm_.c:22
 msgid "Choose the layout corresponding to your keyboard from the list above"
 msgstr "No saraksta izv�lieties j�su tastat�rai atbilsto�o izk�rtojumu"
 
-#: ../../help.pm_.c:13
+#: ../../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 izv�l�ties visas, nospiediet \"Viss\"."
+
+#: ../../help.pm_.c:30
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"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"
-"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).\n"
 "\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
-"  - 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"
+"\t* Recommanded: 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"
-"  - 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"
+"\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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 ""
-"Izv�lieties \"Instal�t\", ja nav instal�ta agr�ka Linux versija,\n"
-"vai ar� j�s v�laties vienlaic�gi izmantot vair�kus distribut�vus\n"
-"vai versijas.\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"
-"Izv�lieties \"Uzlabot\", ja j�s v�laties atjaunin�t vec�ku Mandrake\n"
-"Linux versiju: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000 vai 7.0 (Air).\n"
 "\n"
+"L�dzu izv�lieties \"Atjaunin�t\", ja j�s v�laties atjaunin�t jau instal�tu\n"
+"Linux-Mandrake versiju.\n"
 "\n"
-"Izv�lieties:\n"
 "\n"
-"  - Autom�tiska (ieteicama): Izv�lieties �o, ja j�s l�dz �im ne reizi\n"
-"    neesat instal�jis Linux. PIEZ�ME: instal��anas laik� netiks konfigur�ts\n"
-"    t�kls. Lai to konfigur�tu, p�c instal��anas pabeig�anas izmantojiet\n"
-"    \"LinuxConf\".\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"
 "\n"
-"  - Piel�gota: Ja pietiekami labi p�rzinat GNU/Linux, jums tiks dota\n"
-"    iesp�ja izv�l�ties sist�mu pielietojumu. S�k�ka inform�cija b�s\n"
-"    pieejam v�l�k.\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"
-"  - 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 izv�l�ties sist�mas pielietojumu.\n"
-"    Tom�r l�dzu, l�dzu, NEIZV�LIETIES �O, JA J�S NEESAT P�RLIECIN�TS PAR\n"
-"    SAVU R�C�BU!\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"
+"\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:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1321,12 +1637,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Izv�lieties:\n"
 "\n"
@@ -1334,364 +1651,684 @@ msgstr ""
 "    iesp�ja izv�l�ties 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 izv�l�ties sist�mas pielietojumu.\n"
 "    Tom�r l�dzu, l�dzu, NEIZV�LIETIES �O, JA J�S NEESAT P�RLIECIN�TS PAR\n"
-"    SAVU R�C�BU!\n"
+"    SAVU R�C�BU!"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
+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"
+"\n"
+"\n"
+"\t* Izstr�dei: ja pl�nojat sist�mu izmantot galvenok�rt programmat�ras "
+"izstr�dei, �� ir laba izv�le. Jums\n"
+"\t �aj� gad�jum� tiks instal�ts pilns programmu komplekts, lai var�tu "
+"kompil�t, atk��dot un format�t s�kumkodu vai\n"
+"\t veidot programmat�ras pakotnes.\n"
+"\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 serverus (NIS),\n"
+"\t datub�zu serveris utt. �aj� gad�jum� neceriet, ka tiks instal�ti k�di "
+"izskaistin�jumi (KDE, GNOME, un tml."
+
+#: ../../help.pm_.c:84
+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 ""
-"Da��di varinati j�su datora pielietojumam (pie�emot, ka j�s esat\n"
-"izv�l�jies instal��anas klasi \"Piel�gota\" vai \"Eksperta\") ir:\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, no kura\n"
+"varat izv�l�ties vajadz�go adapteri.\n"
 "\n"
-"  - Norm�ls: izv�l�ties �o, ja j�s pl�nojat savu datoru galvenok�rt\n"
-"    izmantot ikdienas vajadz�b�m (biroj�, grafikas apstr�dei un tml.).\n"
-"    Neceriet, ka tiks instal�ts kaut viens kompilators vai izstr�des\n"
-"    programma.\n"
 "\n"
-"  - Izstr�dei: k� nor�da nosaukums. Izv�lieties �o, ja j�s pl�nojat\n"
-"    savu datoru galvenok�rt izmantot programmat�ras izstr�dei. Tad jums\n"
-"    b�s pieejams piln�gs programmat�ras komplekts s�kumkoda kompil��anai,\n"
-"    atk��do�anai un format��anai, k� ar� programmu paku veido�anai.\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"
+"aparat�tu un noskaidrot opcijas. Parasti tas izdodas.\n"
 "\n"
-"  - Serveris: izv�lieties �o, ja datoru, uz kura j�s instal�jat\n"
-"    Linux-Mandrake, ir paredz�ts izmantot k� serveri. Tas var b�t failu\n"
-"    serveris (NFS vai SMB), drukas serveris (Unix lp (Line Printer)\n"
-"    protokola vai Windows stila SMB druk��anai), autentific��anas serveris\n"
-"    (NIS), datu b�zu servers un tml. Neceriet, ka tiks instal�ti jebk�di\n"
-"    izskaistin�jumi (KDE, GNOME...).\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 aparat�tu\"), lai uzzin�tu, k� ieg�t �o\n"
+"inform�ciju no aparat�ras dokument�cijas, ra�ot�ja t�kla lapas\n"
+"(ja jums ir pieejams Internets) vai no Windows (ja t� ir uzst�d�ta j�su "
+"sist�m�)."
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:108
 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"
+"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"
-"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"
+"\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"
-"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"
+"\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"
-"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."
+"\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 ""
-"DrakX vispirms m��in�s atrast vienu vai vair�kus PCI\n"
-"SCSI adapterus. Ja izdosies to(s) atrast un piemekl�t draiveri(us),\n"
-"adapteri tiks pievienoti autom�tiski.\n"
+"Pa�laik jums ir j�izv�las, kur uz ciet� diska instal�t Linux-Mandrake\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-Mandrak sist�mas instal��anai.\n"
+"\n"
+"\n"
+"Sakar� ar to, ka diska sadal��anas process parasti ir neatgriezenisks,\n"
+"nepieredz�ju�am lietot�jam tas var b�t nepat�kams un stresa pilns process.\n"
+"�is meistars vienk�r�o procesu. Pirms uzs�kat, izlasiet rokasgr�matu un\n"
+"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 ar� par 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"
+"instal�t Linux sist�mu.\n"
 "\n"
 "\n"
-"Ja j�su SCSI adapteris atrodas uz ISA plates vai PCI plates, kurai\n"
-"DrakX neprot piemekl�t draiveri, vai ar� jums visp�r nav SCSI adapteru,\n"
-"jums tiks uzdots atbilsto�s jaut�jums. Ja j�su dator� nav SCSI adapteru,\n"
-"izv�lieties \"N�\". Ja ir vismaz viens adapteris, izv�lieties \"J�\".\n"
-"Tad jums tiks pied�v�ts draiveru saraksts, no kura jums b�s j�izv�las\n"
-"atbilsto�s draiveris.\n"
+"Ja sada�as 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"
 "\n"
-"Kad b�s izv�l�ts draiveris, DrakX pajaut�s, vai v�laties tam\n"
-"nor�d�t parametrus. Vispirms �aujiet draiverim aptauj�t ier�ci:\n"
-"parasti tas darbojas bez probl�m�m.\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, "
+"izv�loties �o risin�jumu, jo p�c\n"
+"\t  apstiprin��anas j�s vairs nevar�sit atteikties no ��s izv�les.\n"
 "\n"
-"Ja tas neizdodas, izmantojiet inform�ciju par savu adapteri, ko\n"
-"var atrast dokument�cij� vai no Windows (ja tas ir uzst�d�ts j�su\n"
-"dator�), k� tas ieteikts instal�cijas rokasgr�mat�. �ie parametri\n"
-"b�s j�nor�da draiverim."
+"\n"
+"\t* Izmanto br�vo vietu Windows sada��: 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 "
+"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� ir\n"
+"\t  pa�laik. Tas noz�m�, ka jums b�s maz�k vietas Microsoft Windows sist�m� "
+"datiem vai programmu instal��anai.\n"
+"\n"
+"\n"
+"\t* Eksperta re��ms: ja j�s v�laties past�v�gi veidot diska sada��s, varat "
+"izv�l�ties �o variantu. Esiet\n"
+"\t  uzman�gi pirms �� risin�juma izv�les. Tas ir ar pla��m iesp�j�m, bet "
+"b�stams. J�s nejau�i varat zaud�t\n"
+"\t  visus datus, t�p�c izv�lieties tikai tad, ja zinat, ko dar�t."
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:160
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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"
 "\n"
+"   * Auto allocate:: this option allows you to automatically create Ext2 and "
+"swap partitions in free space of your\n"
+"     hard drive.\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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
-"- Ctrl-d  to delete a partition\n"
+"For information, you can reach any option using the keyboard: navigate "
+"trough the partitions using Tab and Up/Down arrows.\n"
 "\n"
-"- Ctrl-m  to set the mount point\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"
 msgstr ""
-"Pa�laik j�s varat izv�l�ties, kur�(s) diska sada��(s) instal�t\n"
-"Linux-Mandrake sist�mu, ja t�s jau ir izveidotas (agr�kas Linux\n"
-"instal��anas laik� vai ar citu sada�u veido�anas r�ku pal�dz�bu). Citos\n"
-"gad�jumos vispirms j�izveido diska sada�as. �� oper�cija noz�m�\n"
-"datora ciet� diska apjomu lo�iski sadal�t atsevi��i izmantojam�s da��s.\n"
+
+#: ../../help.pm_.c:218
+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"
-"Ja jums ir j�veido jaunas sada�as, izmantojiet \"Izvietot autom�tiski\",\n"
-"lai autom�tiski izveidotu Linux sada�as. J�s varat izv�l�ties disku,\n"
-"uzklik��inot uz \"hda\", ja t� ir pirm� IDE iek�rta, \"hdb\", ja t� ir\n"
-"otr� iak�rta, vai \"sda\", ja t� ir pirm� SCSI iek�rta, utt.\n"
 "\n"
+"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"Divas svar�gas sada�as ir saknes sada�a (/), kas ir failu sist�mas\n"
-"katalogu hierarhijas s�kumpunkts, un /boot, kas satur visus\n"
-"oper�tajsist�mas start��anai nepiecie�amos failus.\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"
-"Sakar� ar to, ka �� procesa rezult�tus parasti nevar atcelt,\n"
-"nepieredz�ju�iem lietot�jiem tas var b�t bied�jo�s un stresa pilns\n"
-"process. Lai t� neb�tu, DiskDrake vienk�r�o �o procesu. Pirms turpin�t,\n"
-"p�rlasiet dokument�ciju un visu labi apdom�jiet.\n"
 "\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
+"hard drives:\n"
 "\n"
-"Jebkurai opcijai j�s varat piek��t ar tausti�iem: p�rejiet no vienas\n"
-"sada�as uz citu ar Tab un bulti��m uz aug�u/leju. Kad sada�a ir\n"
-"izv�l�ta, j�s varat izmantot:\n"
+"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-c  lai izveidotu jaunu sada�u (kad ir izv�l�ta tuk�a sada�a)\n"
+"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-d  lai izdz�stu sada�u\n"
+"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"- Ctrl-m  lai nor�d�tu mont��anas punktu\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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:252
 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."
+"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 ""
-"Jebkuru jaunizveidoto sada�u pirms t�s izmanto�anas ir j�format�\n"
-"(format��ana noz�m� failu sist�mas izveido�anu). Tagad j�s ar� varat\n"
-"izv�l�ties p�rformat�t jau eksist�jo�as sada�as, lai izdz�stu tur\n"
-"eso�os datus. Piez�me: agr�k izveidotas sada�as nav oblig�ti\n"
-"j�p�rformat�, it sevi�ki, ja taj�s atrodas faili, ko j�s v�laties\n"
-"saglab�t. Parasti tiek saglab�tas /home un /usr/local."
+"Nor�diet cieto disku, ko v�laties izdz�st, lai izveidoti\n"
+"jaunu Linux-Mandrake sada�u. Esiet uzman�gs, visi uz t� eso�ie dati\n"
+"pazud�s un neb�s atjaunojami."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:257
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"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"
-"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\n"
-"the 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\n"
-"through more than 1000 packages..."
-msgstr ""
-"Tagad j�s varat izv�l�ties instal�jamo vai uzlabojamo paku grupas.\n"
-"\n"
-"P�c tam DrakX p�rbaud�s, vai jums ir pietieko�i daudz vietas to visu\n"
-"instal��anai. Ja nav vietas, j�s br�din�s par to. Ja j�s v�laties\n"
-"turpin�t neskatoties uz to, izv�l�to grupu instal��ana turpin�sies,\n"
-"ta�u tiks izlaistas da�as maz�k noder�gas pakas. Saraksta apak�� j�s\n"
-"varat izv�l�ties opciju \"Atsevi��u paku izv�le\"; �aj� gad�jum� jums\n"
-"vajadz�s caurskat�t vair�k nek� 1000 paku sarakstu..."
-
-#: ../../help.pm_.c:150
-msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"\n"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"Ja jums ir visi �aj� sarakst� nor�d�tie CD, nospiediet Ok.\n"
-"Ja jums nav neviena no nor�d�tajiem CD, nospiediet Cancel.\n"
-"Ja tr�kst tikai da�u CD, sarakst� atsl�dziet tos un nospiediet Ok."
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:267
 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."
+"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 ""
-"Izv�l�t�s pakas pa�laik tiek instal�tas. �� oper�cija ilgs vair�kas\n"
-"min�tes, ja vien j�s neizv�l�j�ties uzlabot jau eso�u sist�mu, jo �aj�\n"
-"gad�jum� tas notiks ilg�k pat pirms sist�mas uzlabo�anas uzs�k�anas."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:300
+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:303
 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"
+"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"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\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"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
-msgstr ""
-"Ja DrakX neizdev�s atrast j�su peli, vai ar� j�s v�laties p�rbaud�t,\n"
-"kas ir izdar�ts, aug�� tiks par�d�ts pe�u saraksts.\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"
-"Ja j�s piekr�tat DrakX izv�lei, vienk�r�i p�rejiet uz nepiecie�amo\n"
-"sekciju, uzklik��inot uz nosaukuma izv�ln� ekr�na kreisaj� pus�. Pret�j�\n"
-"gad�jum� sarakst� izv�lieties to peles tipu, kas p�c j�su dom�m lab�k\n"
-"atbilst j�su peles modelim.\n"
 "\n"
+"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
-"Ja jums ir seri�la pele, jums b�s j�pasaka DrakX, kuram seri�lajam portam\n"
-"t� ir piesl�gta."
+"\n"
+"Click on \"Cancel\" if you want to choose other partitions to install your "
+"new\n"
+"Linux-Mandrake operating system."
+msgstr ""
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:329
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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 ""
-"L�dzu izv�lieties pareizu portu. Piem�ram, MS Windows ports COM1 Linux\n"
-"vid� tiek saukts par ttyS0."
+"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:180
+#: ../../help.pm_.c:341
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
+"You can now choose individually all the packages you\n"
+"wish to install.\n"
 "\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"
+"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 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"
+"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
+"\"Toggle flat and group sorted\".\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."
+"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 ""
-"�� sekcija ir velt�ta lok�l� datort�kla (LAN) vai mod�ma konfigur��anai.\n"
+
+#: ../../help.pm_.c:358
+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 Ok.\n"
+"Ja jums nav neviena no nor�d�tajiem CD, nospiediet Atsaukt.\n"
+"Ja tr�kst tikai da�u CD, sarakst� atsl�dziet tos un nospiediet Ok."
+
+#: ../../help.pm_.c:363
+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"
-"Izv�lieties \"Lok�lais datort�kls\", un DrakX m��in�s j�su dator� samekl�t\n"
-"Ethernet adapteri. PCI adapterus vajadz�tu atrast un inicializ�t\n"
-"autom�tiski.\n"
-"Tom�r, ja j�su adapteris ir uz ISA �inas, autonoteik�ana nedarbosies,\n"
-"un jums b�s j�izv�las draiveris no v�l�k par�d�t� saraksta.\n"
+"\n"
+"Please be patient."
+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"
-"T�pat k� SCSI adapteriem, j�s vispirms varat �aut draiverim aptauj�t\n"
-"adapteri, cit�di jums b�s draiverim j�nor�da konkr�ti parametri,\n"
-"ko j�s esat uzzin�ju�i no savas aparat�ras dokument�cijas.\n"
+"L�dzu esiet paciet�gs."
+
+#: ../../help.pm_.c:371
+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"
+"\"Atsaukt\" un izv�l�ties citu draiveri."
+
+#: ../../help.pm_.c:376
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows 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:380
+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"
-"Ja j�s instal�jat Linux-Mandrake sist�mu dator�, kas ir piesl�gts jau\n"
-"eso�am datort�klam, t�kla administrators jums b�s nor�d�jis visu\n"
-"nepiecie�amo inform�ciju (IP adresi, apak�t�kla masku jeb vienk�r�i\n"
-"t�kla masku un datora nosaukumu). Ja j�s veidojat priv�tu datort�klu,\n"
-"piem�ram, m�j�s, jums pa�am j�izv�las adrese.\n"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\n"
 "\n"
 "\n"
-"Izv�lieties \"Iezvan��an�s ar mod�mu\", un tiks konfigur�ts Interneta\n"
-"piesl�gums darbam ar mod�mu. DrakX m��in�s samekl�t j�su mod�mu, bet, ja\n"
-"tas neizdosies, jums b�s j�nor�da ports, pie kura ir piesl�gts j�su\n"
-"mod�ms."
+"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:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
-"\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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"
-"  - Automatic IP: If your network uses bootp or dhcp protocol, select \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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:400
+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:407
+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:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr "L�dzu iesl�dziet j�su mod�mu un izv�lieties pareizo modeli."
+
+#: ../../help.pm_.c:413
+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:420
+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 ""
-"Ievadiet:\n"
+"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:425
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - IP adrese: ja to nezinat, pajaut�jiet t�kla administratoram vai ISP.\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"
-"  - T�kla maska: \"255.255.255.0\" parasti ir laba izv�le. Ja neesat\n"
-"p�rliecin�ts, pajaut�jiet t�kla administratoram vai ISP.\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"
-"  - Autom�tisks IP: Ja j�su datort�kls izmanto bootp vai dhcpd protokolu,\n"
-"izv�lieties �o opciju. Kad t� ir izv�l�ta, nav j�nor�da \"IP addrese\".\n"
-"Ja neesat p�rliecin�ts, pajaut�jiet t�kla administratoram vai ISP.\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:437
+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:441
+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:225
+#: ../../help.pm_.c:445
 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."
@@ -1699,7 +2336,7 @@ 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:229
+#: ../../help.pm_.c:449
 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."
@@ -1708,127 +2345,240 @@ msgstr ""
 "nezinat, vai izmantosit proxy, pajaut�jiet t�kla administratoram vai\n"
 "savam ISP."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
 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 pakas. Vispirms izv�lieties spogu�serveri, no kura iel�d�t\n"
-"pakas, tad izv�lieties instal�jam�s pakas.\n"
+"kriptogr�fijas pakotnes. Vispirms izv�lieties 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 pakas ir j�izv�las\n"
+"Atcerieties, ka spogu�serveris un kriptogr�fijas pakotnes ir j�izv�las\n"
 "atbilsto�i j�su valsts likumdo�anai."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+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:465
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
-"Tagad j�s varat izv�l�ties laika joslu, kur� j�s dz�vojat.\n"
+"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"
-"Linux laiku r��ina p�c GMT jeb \"Gr�ni�as Meridi�na Laika\" un p�rv�r� to\n"
-"par viet�jo laiku atbilsto�i j�su izv�l�tajai laika joslai."
+"Ja �aj� dator� izmantojat ar� Microsoft Windows, izv�lieties \"N�\"."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 j�s varat izv�l�ties servisus, kurus j�s v�laties start�t sist�mas\n"
-"s�kn��anas laik�. Kad pele p�rvietojas p�r saraksta elementu, par�d�s\n"
-"neliela balona pal�dz�bu, kas paskaidro servisa lomu.\n"
+"Tagad varat izv�l�ties servisus, kurus j�s v�laties start�t sist�mas\n"
+"s�kn��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."
+"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:257
+#: ../../help.pm_.c:486
+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:490
+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:505
+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 ""
+
+#: ../../help.pm_.c:521
 msgid ""
-"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"
+"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 ""
+
+#: ../../help.pm_.c:542
+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"
-"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"
 "\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"
-"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"
+"\n"
+"     If you want to acces a printer located on NetWare network, select "
+"\"NetWare\".\n"
+msgstr ""
+
+#: ../../help.pm_.c:567
+msgid ""
+"Your printer has not been detected. Please enter the name of the device on\n"
+"which it is connected.\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."
+"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 ""
-"Linux var izmantot daudzus printeru tipus. Katram printeru tipam\n"
-"nepiecie�ami at��ir�gi parametri. Tom�r �emiet v�r�, ka drukas spol�t�js\n"
-"izmanto 'lp' k� noklus�to printera nosaukumu, t�p�c ir j�b�t printerim\n"
-"ar ��du nosaukumu. Tom�r printerim var pie��irt vair�kus nosaukumus,\n"
-"atdalot tos ar simbolu '|'. T�d�j�di, ja j�s gribat saprotam�ku\n"
-"nosaukumu, lieciet to pirmo, piem., \"Mans printeris|lp\".\n"
-"Printeris, kura nosaukum� ir \"lp\", b�s noklus�tais printeris.\n"
+"J�su printeris nav atrasts. L�dzu ievadiet ier�ces nosaukumu, kurai tas ir\n"
+"piesl�gts.\n"
 "\n"
 "\n"
-"Ja printeris ir tie�i piesl�gts j�su datoram, izv�lieties\n"
-"\"Lok�ls printeris\". P�c tam jums b�s janor�da, kuram portam\n"
-"printeris ir piesl�gts, k� ar� j�izv�las atbilsto�s filtrs.\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:575
+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:578
+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"
-"Ja v�laties izmantot printeri, kas ir piesl�gts att�lam Unix serverim,\n"
-"jums ir j�izv�las \"Att�ls lpd\". Lai tas darbotos, nav nepiecie�ams\n"
-"lietotaja v�rds un parole, ta�u ir j�zina printera rindas nosaukums\n"
-"uz �� servera.\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"
-"Ja v�laties izmantot SMB printeri (kas noz�m�, ka printeris ir piesl�gts\n"
-"att�lam Windows 9x/NT datoram), jums b�s j�nor�da t� SMB v�rds\n"
-"(kas var nesakrist ar datora TCP/IP v�rdu) un, iesp�jams, IP adrese,\n"
-"k� ar� lietot�ja v�rds, darbagrupa un parole, lai var�tu piek��t �im\n"
-"printerim, un, protams, printera nosaukums. Tas pats attiecas ar� uz\n"
-"NetWare printeri, vien�gi nav nepiecie�ama darbagrupas inform�cija."
+"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:286
+#: ../../help.pm_.c:585
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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"
@@ -1837,14 +2587,18 @@ msgstr ""
 "\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 ne\n"
-"tikai j�s sist�mas integrit�tei un datiem, bet ar� cit�m tai\n"
-"piesl�gtaj�m sist�m�m. Parolei ir j�b�t vismaz 8 simbolus garai burtu\n"
-"un ciparu kombin�cijai. To NEKAD nevajag pierakst�t uz pap�ra.\n"
-"Tom�r neizv�lieties p�r�k garu vai sare���tu paroli: jums to ir\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:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1852,7 +2606,7 @@ msgstr ""
 "Lai palielin�tu sist�mas dro��bu, izv�lieties \"Izmantot shadow failu\"\n"
 "un \"Izmantot MD5 paroles\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1860,7 +2614,7 @@ 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:310
+#: ../../help.pm_.c:611
 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"
@@ -1885,8 +2639,8 @@ msgid ""
 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 v�laties at�aut piek��t\n"
-"j�su datoram. Atcerieties, ka katram lietot�ja kontam ir sava\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"
@@ -1901,35 +2655,32 @@ msgstr ""
 "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:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 �eit atbild�t \"J�\". Ja j�s v�l�k instal�sit\n"
-"Microsoft Windows, tas p�rrakst�s diska s�kn��anas sektoru.\n"
-"Ja j�s neb�sit izveidojis pied�v�to s�kn��anas disketi, j�s vairs\n"
-"nevar�sit iel�d�t Linux."
+"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:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
-"Linux s�kn��anai nepiecie�amo inform�ciju.\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:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1938,10 +2689,10 @@ msgstr ""
 "\"/dev/hda\" (prim�rais galven� kan�la IDE) vai \"/dev/sda\" (pirmais\n"
 "SCSI disks)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1951,7 +2702,7 @@ msgid ""
 "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) un Grub ir s�kn�t�ji: tie sp�j s�kn�t Linux\n"
+"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"
 "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"
@@ -1962,7 +2713,7 @@ 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:359
+#: ../../help.pm_.c:659
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1979,7 +2730,9 @@ msgid ""
 "\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."
 msgstr ""
 "LILO un grub galven�s opcijas ir:\n"
@@ -2000,10 +2753,60 @@ msgstr ""
 "    * norm�ls: izv�las norm�lu 80x25 teksta re��mu.\n"
 "    * <skaitlis>:  izmanto atbilsto�u teksta re��mu."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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!"
+
+#: ../../help.pm_.c:692
+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."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2014,7 +2817,7 @@ msgid ""
 "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 Linux GUI\n"
+"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"
@@ -2026,7 +2829,7 @@ msgstr ""
 "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:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2034,7 +2837,7 @@ 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:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2042,77 +2845,85 @@ msgstr ""
 "Ja dodat priek�roku darba uzs�k�anai grafisk� re��m�, izv�lietis \"J�\",\n"
 "cit�di izv�lieties \"N�\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\n"
-"\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
-"\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
-"\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
-msgstr ""
-"Tagad j�s varat izv�l�ties da��das j�su sist�mas opcijas.\n"
-"\n"
-"  - Izmantot ciet� diska optimiz�cijas: �� opcija var uzlabot ciet� diska\n"
-"    veiktsp�ju, ta�u t� ir paredz�ta tikai pieredz�ju�iem lietot�jiem:\n"
-"    da�as k��dainas mikrosh�mas var izn�cin�t j�su datus, t�p�c j�s esat\n"
-"    br�din�ts. Atcerieties, ka kodol� ir ieb�v�ts disku un mikrosh�mu\n"
-"    melnais saraksts, tom�r, ja v�laties iztikt bez nepat�kamiem\n"
-"    p�rsteigumiem, neizv�lieties �o opciju.\n"
-"\n"
-"  - Izv�lieties dro��bas l�meni: j�s varat izv�l�ties sist�mas dro��bas\n"
-"    l�meni. Piln�gu inform�ciju mekl�jiet rokasgr�mat�. �sum�: ja j�s\n"
-"    nezinat, izv�lieties \"Vid�js\"; ja v�laties patie��m dro�u sist�mu,\n"
-"    izv�lieties \"Paranoisks\", ta�u �emiet v�r�: �AJ� L�MEN� ROOT\n"
-"    IERE�ISTR��AN�S NO KONSOLES NAV AT�AUTA! Ja j�s v�laties b�t root,\n"
-"    jums ir j�iere�istr�jas k� lietot�jam un tad j�izmanto \"su\". V�rdu\n"
-"    sakot, neceriet, ka j�s var�sit izmantot savu sist�mu kam citam,\n"
-"    atskaitot servera uzdevumus. J�s esat br�din�ts.\n"
-"\n"
-"  - Prec�zs RAM apjoms, ja nepiecie�ams: diem��l m�sdienu datoru\n"
-"    pasaul� nav vienotas metodes, k� pajaut�t BIOSam par j�su dator�\n"
-"    uzst�d�t�s atmi�as apjomu. T� rezult�t� Linux var neizdoties pareizi\n"
-"    noteiktu j�su datora RAM apjomu. Ja t� notiek, j�s �eit varat\n"
-"    nor�d�t pareizu RAM apjomu. �emiet v�r�, ka 2 vai 4 MB at��ir�ba\n"
-"    ir norm�la.\n"
-"\n"
-"  - Nomain�mu datu nes�ju automont��ana: ja nev�laties katru reizi mont�t\n"
-"    nomain�mus datu nes�jus (CD-ROM, disketi, Zip), druk�jot \"mount\" un\n"
-"    \"umount\", izv�lieties �o opciju.\n"
-"\n"
-"  - Iesl�gt NumLock palai�anas laik�: ja v�laties, lai p�c s�kn��anas\n"
-"    b�tu iesl�gts NumLock, izv�lieties �o opciju (Piez�me: var gad�ties,\n"
-"    ka NumLock tom�r neb�s iesl�gts X vid�)."
-
-#: ../../help.pm_.c:428
+"* 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"
+"\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"
+"\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"
+"\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"
+"\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"
+"\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."
+msgstr ""
+"Tagad varat izv�l�ties da��das sist�mas opcijas.\n"
+"\n"
+"* Izmantot ciet� diska optimiz�cijas: �� opcija var uzlabot ciet� diska   "
+"veiktsp�ju, ta�u t� ir paredz�ta tikai pieredz�ju�iem lietot�jiem:\n"
+"  da�as k��dainas mikrosh�mas var izn�cin�t j�su datus, t�p�c j�s esat   "
+"br�din�ts. Atcerieties, ka kodol� ir ieb�v�ts disku un mikrosh�mu\n"
+"  melnais saraksts, tom�r, ja v�laties iztikt bez nepat�kamiem\n"
+"  p�rsteigumiem, neizv�lieties �o opciju.\n"
+"\n"
+"\n"
+"* Izv�lieties dro��bas l�meni: j�s varat izv�l�ties sist�mas dro��bas\n"
+"  l�meni. Piln�gu inform�ciju mekl�jiet rokasgr�mat�. Parasti, ja\n"
+"  nezinat, atst�jiet noklus�to v�rt�bu.\n"
+"\n"
+"\n"
+"* Prec�zs RAM apjoms, ja nepiecie�ams: diem��l m�sdienu datoru\n"
+"  pasaul� nav vienotas metodes, k� pajaut�t BIOSam par j�su dator�\n"
+"  uzst�d�t�s atmi�as apjomu. Rezult�t� Linux ne vienm�r pareizi\n"
+"  nosaka j�su datora RAM apjomu. Ja t� notiek, j�s �eit varat\n"
+"  nor�d�t pareizu RAM apjomu. �emiet v�r�, ka 2 vai 4 MB at��ir�ba\n"
+"  ir norm�la.\n"
+"\n"
+"* Nomain�mu datu nes�ju automont��ana: ja nev�laties katru reizi mont�t\n"
+"  nomain�mus datu nes�jus (CD-ROM, disketi, Zip u.c.), druk�jot \"mount\"   "
+"un \"umount\", izv�lieties �o opciju.\n"
+"\n"
+"\n"
+"* Izt�r�t \"/tmp\" katras s�kn��anas laik�: ja j�s v�laties sist�mas   "
+"s�kn��anas laik� izdz�st visus failus un\n"
+"  katalogus, kas atrodas \"/tmp\", izv�lieties �o opciju.\n"
+"\n"
+"\n"
+"* Iesl�gt NumLock palai�anas laik�: ja v�laties, lai p�c s�kn��anas   b�tu "
+"iesl�gts NumLock, izv�lieties �o\n"
+"  opciju. �emiet v�r�, ka to nevajadz�tu izv�l�ties kl�pjdatoriem, un ka   "
+"NumLock var str�d�t vai nestr�d�t X vid�."
+
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2126,96 +2937,118 @@ msgstr ""
 "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:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Valodas izv�le"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Instal��anas klases izv�le"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Ciet� diska noteik�ana"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Peles konfigur��ana"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Tastat�ras izv�le"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Da��di"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Failu sist�mu uzst�d��ana"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Diska format��ana"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
-msgstr "Instal�jamo paku izv�le"
+msgstr "Instal�jamo pakot�u izv�le"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Sist�mas instal��ana"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "T�kla konfigur��ana"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Kriptogr�fija"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
-msgstr "Laika joslas konfigur��ana"
+msgstr "Laika konfigur��ana"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Servisu konfigur��ana"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Printera konfigur��ana"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "root paroles izv�le"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
-msgstr "Lietot�ja pievieno�ana"
+msgstr "Lietot�ju pievieno�ana"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
-msgstr "S�kn��anas disketes rad��ana"
+msgstr "Sist�mdisketes rad��ana"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "S�kn�t�ja instal��ana"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "X konfigur��ana"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Auto instal��anas diskete"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Instal��anas beigas"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "K��da nolasot failu $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "L�dzu notest�jiet peli"
+
+#: ../../install_gtk.pm_.c:427
+msgid "To activate the mouse,"
+msgstr "Lai aktiviz�tu peli,"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr "PAKUSTINIET RITENI!"
+
+#: ../../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 ""
+"Da�u j�su dator� uzst�d�to ier��u darb�bai nepiecie�ami ``firmas'' "
+"draiveri.\n"
+"Papildus inform�ciju varat atrast �eit: %s"
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2225,229 +3058,247 @@ msgstr ""
 "�im nol�kam izveidojiet sada�u (vai uzklik��iniet uz jau eso�as).\n"
 "Tad izv�lieties darb�bu ``Mont��anas punkts'' un nor�diet, ka tas ir `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "Jums ir nepiecie�ama swap sada�a"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake neizdev�s pareizi nolas�t sada�u tabulu.\n"
-"Turpiniet, ja v�laties risk�t!"
+"Jums nav swap sada�as\n"
+"\n"
+"Vai tom�r turpin�t?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Mekl�ju saknes sada�u."
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Izmantot br�vo vietu"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Inform�cija"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "Nepietiek br�vas vietas, lai izvietotu jaunas sada�as"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: �� nav saknes sada�a, l�dzu izv�lieties citu."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "Izmantot jau eso�u sada�u"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Saknes sada�a nav atrasta"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "Nav nevienas sada�as, ko var�tu izmantot"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Nevar izmantot apraidi, ja nav nor�d�ts NIS dom�ns"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Izmantot Windows sada�u priek� loopback"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "K��da nolasot failu $f"
+#: ../../install_interactive.pm_.c:90
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Kuru sada�u v�laties izmantot priek� Linux4Win?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Atkl�ta k��da, bet es nezinu, k� ar to pareizi apieties.\n"
-"Turpiniet, ja v�laties risk�t."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Izv�lieties izm�rus"
 
-#: ../../install_steps.pm_.c:174
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Dubl�ts mont��anas punkts %s"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Saknes sada�as izm�rs (MB): "
 
-#: ../../install_steps.pm_.c:321
-msgid ""
-"Some important packages didn't get installed properly.\n"
-"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
-msgstr ""
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Swap sada�as izm�rs (MB): "
 
-#: ../../install_steps.pm_.c:388
-#, c-format
-msgid "Welcome to %s"
-msgstr "J�s sveic %s"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "Izmantot Windows sada�as br�vo vietu"
 
-#: ../../install_steps.pm_.c:740
-msgid "No floppy drive available"
-msgstr "Nav nevienas diske�u iek�rtas"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Kuras sada�as izm�ru v�laties izmain�t?"
+
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "Izskait�oju Windows failu sist�mas robe�as"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "Uzs�ku soli `%s'\n"
+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"
+"atkl�ta sekojo�a k��da: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "Jums ir nepiecie�ama swap sada�a"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr "Windows sada�a ir p�r�k fragment�ta, vispirms palaidiet ``defrag''"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"Jums nav swap sada�as\n"
+"BR�DIN�JUMS!\n"
 "\n"
-"Vai tom�r turpin�t?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Izv�lietis apjomu, ko v�laties instal�t"
+"Tagad DrakX izmain�s Windows sada�as 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, spiediet Ok."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Kop�jais apjoms: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "K�du apjomu v�laties atst�t priek� windows uz"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "Versija: %s\n"
+msgid "partition %s"
+msgstr "sada�a %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "Apjoms: %d KB\n"
+msgid "FAT resizing failed: %s"
+msgstr "FAT izm�ra mai�a neizdev�s: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Izv�lieties pakas, ko v�laties instal�t"
+#: ../../install_interactive.pm_.c:144
+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 "
+"nepietiek br�vas vietas)"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "Izdz�st visu disku"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Instal�t"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "No�emt Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Instal�ju"
+#: ../../install_interactive.pm_.c:153
+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_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "L�dzu uzgaidiet, "
+#: ../../install_interactive.pm_.c:156
+#, 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"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Atliku�ais laiks"
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "Eksperta re��ms"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Kop�jais laiks"
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "Imantot diskdrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Sagatavoju instal��anu"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "Izmantot fdisk"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "Instal�ju paku %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Tagad j�s varat sadal�t diska iek�rtu %s.\n"
+"Kad esat pabeigu�i, neaizmirstiet saglab�t, izmantojot `w'"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Tom�r turpin�t?"
+#: ../../install_interactive.pm_.c:195
+msgid "You don't have enough free space on your Windows partition"
+msgstr "J�su Windows sada�� nav pietieko�i daudz br�vas vietas"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Paku k�rto�anas laik� atkl�ta k��da:"
+#: ../../install_interactive.pm_.c:210
+msgid "I can't find any room for installing"
+msgstr "Nevaru atrast vietu instal��anai"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Vai izmantot jau eso�o X11 konfigur�ciju?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "DrakX sada�u veido�anas meistars atrada sekojo�us risin�jumus:"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "L�dzu izv�lieties vienu no sekojo��m instal��anas klas�m:"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Diska sadal��ana neizdev�s: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Jums nav nevienas windows sada�as!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Iedarbinu t�klu"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Jums nav pietieko�i daudz vietas priek� Lnx4win"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Atsl�dzu t�klu"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"UZMAN�BU!\n"
-"\n"
-"DrakX tagad ir j�izmaina Windows sada�as izm�rs. Esiet uzman�gs: ��\n"
-"oper�cija ir b�stama. Ja j�s to v�l neesat izdar�jis, vispirms no Windows\n"
-"�o sada�u p�rbaudiet ar scandisk (un papildus palaidiet ar� defrag), tad\n"
-"atk�rtoti s�ciet instal�ciju. Bez tam ir j�izveido datu rezerves kopija.\n"
-"Ja esat p�rliecin�ts, spiediet Ok."
+"Atkl�ta k��da, bet es nezinu, k� ar to pareizi apieties.\n"
+"Turpiniet, ja v�laties risk�t."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Autom�tiska izm�ra mai�a neizdev�s"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Dubl�ts mont��anas punkts %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Kuru sada�u v�laties izmantot Linux4Win novieto�anai?"
+#: ../../install_steps.pm_.c:375
+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 ""
+"Da�as svar�gas pakotnes neizdev�s pareizi instal�t.\n"
+"Ir boj�ta j�su kompaktdisku iek�rta vai instal�cijas disks.\n"
+"Parbaudiet disku uz instal�ta datora, izmantojot komandu \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Izv�lieties izm�rus"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "J�s sveic %s"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Saknes sada�as izm�rs (MB): "
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Nav nevienas diske�u iek�rtas"
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Swap sada�as izm�rs (MB): "
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Uzs�ku soli `%s'\n"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"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"
+"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:150
+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:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2456,12 +3307,12 @@ msgid ""
 "a percentage of 100%% will install all selected packages."
 msgstr ""
 "Ja j�s v�laties instal�t maz�k nek� �o izm�ru,\n"
-"procentu�li izv�lieties instal�jamo paku daudzumu.\n"
+"procentu�li izv�lieties instal�jamo pakot�u daudzumu.\n"
 "\n"
-"Zems procentu l�menis instal�s tikai vissvar�g�k�s pakas;\n"
-"100% l�men� tiks instal�tas visas izv�l�t�s pakas."
+"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:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2470,110 +3321,194 @@ msgid ""
 "A low percentage will install only the most important packages;\n"
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
-"Jums uz diska ir vieta tikai %d%% no ��m pak�m.\n"
+"Jums uz diska ir vieta tikai %d%% no ��m pakotn�m.\n"
 "\n"
-"Ja v�laties instal�t maz�k, procentu�li izv�lieties instal�jamo paku\n"
-"daudzumu. Zems procentu l�menis instal�s tikai vissvar�g�k�s pakas;\n"
-"%d%% l�menis instal�s tik daudz paku, cik ir iesp�jams."
+"Ja v�laties instal�t maz�k, procentu�li izv�lieties instal�jamo pakot�u\n"
+"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:333
+#: ../../install_steps_gtk.pm_.c:228
 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:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
-msgstr "Instal�jamo paku procentu�lais daudzums"
+msgstr "Instal�jamo pakot�u procentu�lais daudzums"
+
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Izv�lieties pakotnes, ko v�laties instal�t"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Instal�t"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Autom�tiskas atkar�bas"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Izv�rst koku"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Sak�aut koku"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "P�rsl�gties starp nesak�rtotu un sak�rtotu pa grup�m"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
-msgstr "Slikta paka"
+msgstr "Slikta pakotne"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nosaukums: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versija: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Apjoms: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Svar�gums: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Kop�jais izm�rs: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+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:386
+msgid "The following packages are going to be installed"
+msgstr "Tiks instal�tas sekojo�as pakotnes"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "Tiks no�emtas sekojo�as pakotnes"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "J�s varat izv�l�ties/atteikties no ��s pakotnes"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
-msgstr "�� ir oblig�ta paka, no t�s nevar atteikties"
+msgstr "�� ir oblig�ta pakotne, no t�s nevar atteikties"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
-msgstr "J�s nevarat atteikties no ��s pakas. T� jau ir instal�ta"
+msgstr "J�s nevarat atteikties no ��s pakotnes. T� jau ir instal�ta"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
-"�o paku ir nepiecie�ams uzlabot\n"
+"�o pakotni ir nepiecie�ams uzlabot\n"
 "Vai tie��m v�laties atteikties no t�s?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
-msgstr "J�s nevarat atteikties no ��s pakas. To ir nepiecie�ams uzlabot"
-
-#: ../../install_steps_gtk.pm_.c:493
-#, fuzzy
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr "J�s nevarat atteikties no ��s pakas. T� jau ir instal�ta"
+msgstr "J�s nevarat atteikties no ��s pakotnes. To ir nepiecie�ams uzlabot"
 
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Tiks instal�tas/no�emtas sekojo�as pakas"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "J�s varat izv�l�ties/atteikties no ��s pakas"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Instal�ju"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Apr��inu"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "L�dzu uzgaidiet, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Atliku�ais laiks"
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Kop�jais laiks"
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Atsaukt"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Sagatavoju instal��anu"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
-msgstr "%d pakas"
+msgstr "%d pakotnes"
+
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Instal�ju pakotni %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "Pie�emt"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2585,373 +3520,411 @@ msgstr ""
 "Nomainiet Cd-Rom!\n"
 "\n"
 "L�dzu ielieciet iek�rt� Cd-Rom \"%s\", kad tas ir izdar�ts, nospiediet Ok\n"
-"Ja jums nav �� diska, nospiediet Cancel, lai neinstal�tu no �� Cd-Rom."
+"Ja jums nav �� diska, nospiediet Atsaukt, lai neinstal�tu no �� Cd-Rom."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "Noraid�t"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Tom�r turpin�t?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Pakot�u k�rto�anas laik� atkl�ta k��da:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
-msgstr "Paku instal��anas laik� atkl�ta k��da:"
+msgstr "Pakot�u instal��anas laik� atkl�ta k��da:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Atkl�ta k��da"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "L�dzu izv�lieties izmantojamo valodu."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr "Licences l�gums"
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Tastat�ra"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "L�dzu izv�lieties j�su tastat�ras izk�rtojumu."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 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:91
-msgid "Root Partition"
-msgstr "Saknes sada�a"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "Viss"
 
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Kura ir j�su sist�mas saknes sada�a (/)?"
-
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Instal��anas klase"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Kuru instal��anas klasi v�laties?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
-msgstr "Instal�t/Uzlabot"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Install/Update"
+msgstr "Instal�t/Atjaunin�t"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
-msgstr "�� ir instal��ana vai uzlabo�ana?"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Is this an install or an update?"
+msgstr "�� ir instal��ana vai atjaunin��ana?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Autom�tisks"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Ieteicama"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Piel�gota"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Eksperta"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
-"Vai esam p�rliecin�ts, ka esat eksperts? \n"
-"�eit j�s var�sit veikt b�tiskas, bet b�stamas lietas."
+"Vai esat p�rliecin�ts, ka esat eksperts? \n"
+"�eit j�s var�sit veikt b�tiskas, bet b�stamas lietas.\n"
+"\n"
+"Jums tiks uzdoti ��da rakstura jaut�jumi: ``Vai parol�m izmantot shadow?'',\n"
+"vai esat gatavs atbild�t uz ��diem jaut�jumiem?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
-msgstr "Uzlabot"
+#: ../../install_steps_interactive.pm_.c:216
+msgid "Update"
+msgstr "Atjaunin�t"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Norm�ls"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "Darbastacija"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Izstr�dei"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Serveris"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
-msgstr "K�ds ir j�su sist�mas pielietojums ?"
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
+msgstr "Kam tiks izmantota j�su sist�ma?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "L�dzu izv�lieties j�su peles tipu."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Peles ports"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 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:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Konfigur�ju PCMCIA kartes..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "Konfigur�ju IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "nav pieejamu sada�u"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "L�dzu izv�lieties sada�u, ko izmantot k� saknes sada�u."
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr "P�rmekl�ju sada�as, lai atrastu mont��anas punktus"
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Izv�lieties mont��anas punktus"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\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"
+"(k��da ir %s)\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+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"
+"Turpiniet, ja v�laties risk�t!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Saknes sada�a"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Kura ir j�su sist�mas saknes sada�a (/)?"
+
+#: ../../install_steps_interactive.pm_.c:352
 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"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Izv�lieties sada�as, ko v�laties format�t"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "P�rbaud�t sliktos blokus?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Format�ju sada�as"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Veidoju un format�ju failu %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Instal��anas pabeig�anai nepietiek swap, palieliniet swap"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
-msgstr "Mekl�ju pieejam�s pakas"
+msgstr "Mekl�ju pieejam�s pakotnes"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
-msgstr "Mekl�ju uzlabojam�s pakas"
+msgstr "Mekl�ju uzlabojam�s pakotnes"
+
+#: ../../install_steps_interactive.pm_.c:433
+#, 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:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "Pilna (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "Minim�la (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr "J�su sist�m� nav pietieko�i daudz vietas instal��anai vai uzlabo�anai"
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Ieteicama (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "Piel�gota"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "Izv�lieties instal��anas apjomu"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
-msgstr "Paku grupu izv�le"
+msgstr "Pakot�u grupu izv�le"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
-msgstr "Atsevi��u paku izv�le"
+msgstr "Atsevi��u pakot�u izv�le"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 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 ""
 "Ja jums ir visi �aj� sarakst� nor�d�tie CD, nospiediet Ok.\n"
-"Ja jums nav neviena no nor�d�tajiem CD, nospiediet Cancel.\n"
+"Ja jums nav neviena no nor�d�tajiem CD, nospiediet Atsaukt.\n"
 "Ja tr�kst tikai da�u CD, sarakst� atsl�dziet tos un nospiediet Ok."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom ar nosaukumu \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
-"Instal�ju paku %s\n"
+"Instal�ju pakotni %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "P�cinstal��anas konfigur��ana"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Atst�t eso�o IP konfigur�ciju"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "T�l�t p�rkonfigur�t t�klu"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Neuzst�d�t t�klu"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "T�kla konfigur�cija"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Lok�lais t�kls jau konfigur�ts. Vai v�laties:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Vai v�laties konfigur�t lok�lo t�klu priek� j�su sist�mas?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "t�kla karte nav atrasta"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Mod�ma konfigur��ana"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr ""
-"Vai v�laties konfigur�t iezvan��anas t�klu un mod�mu priek� j�su sist�mas?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Konfigur�ju t�kla iek�rtu %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"L�dzu ievadiet �� datora IP konfigur�ciju.\n"
-"Visi dati j�ievada k� IP adreses ar punktiem atdal�tu decim�lu\n"
-"skait�u veid� (piem�ram, 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Autom�tisks IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP adrese:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "T�kla maska:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP adreses form�tam j�b�t 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Konfigur�ju t�klu"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"L�dzu ievadiet datora v�rdu.\n"
-"Datora v�rdam ir j�b�t piln�gi kvalific�tam datora v�rdam,\n"
-"piem�ram ``mybox.mylab.myco.com''.\n"
-"J�s varat ievad�t ar� v�rtejas IP adresi, ja t�da ir"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS serveris:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "V�rtejas iek�rta:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "V�rteja:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Datora v�rds:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Vai m��in�t atrast mod�mu?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "L�dzu izv�lieties, kuram seri�lajam portam ir piesl�gts mod�ms."
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Iezvan��an�s opcijas"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Piesl�guma nosaukums"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Telefona numurs"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Lietot�ja ID"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Autentifik�cija"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Izmantojot skriptu"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Izmantojot termin�li"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Dom�na v�rds"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Pirmais DNS serveris"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Otrais DNS serveris"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3018,88 +3991,92 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
-msgstr "Izv�lieties spogu�serveri, no kura �emt pakas"
+msgstr "Izv�lieties spogu�serveri, no kura �emt pakotnes"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
-msgstr "Piesl�dzos spogu�serverim, lai sa�emtu pieejamo paku sarakstu"
+msgstr "Piesl�dzos spogu�serverim, lai sa�emtu pieejamo pakot�u sarakstu"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
-msgstr "L�dzu izv�lieties pakas, ko v�laties instal�t"
+msgstr "L�dzu izv�lieties pakotnes, ko v�laties instal�t"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
 msgstr "K�da ir j�su laika josla?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Vai datora pulkstenis r�da GMT laiku?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "Kuru druk��anas sist�mu v�laties izmantot?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Bez paroles"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Izmantot shadow failu"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Izmantot MD5 paroles"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Izmantot NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "dzelten�s lapas"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, 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:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Autentifik�cijas NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS dom�ns"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS serveris"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Apstiprin�t lietot�ju"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Pievienot lietot�ju"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(jau pievienots %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3109,60 +4086,87 @@ msgstr ""
 "Ievadiet lietot�ju\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "V�rds un uzv�rds"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Lietot�ja v�rds"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "�aula"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "�� parole ir p�r�k vienk�r�a"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "L�dzu ievadiet lietot�ja v�rdu"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 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 `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "��ds lietot�ja v�rds jau ir pievienots"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Piel�got� s�kn��anas diskete pied�v� veidu, k� s�kn�t j�su Linux sist�mu\n"
+"neatkar�gi no parast� s�kn�t�ja. Tas ir noder�gi, ja j�s nev�laties sav�\n"
+"sist�m� uzst�d�t SILO, vai k�da cita oper�t�jsist�ma izdz�� SILO,\n"
+"vai ar� SILO nedarbojas ar j�su dzel�u konfigur�ciju. Piel�goto\n"
+"s�kn��anas disketi var izmantot ar� kop� ar Mandrake glab�anas att�lu,\n"
+"atvieglojot atjauno�anu p�c smagiem sist�mas boj�jumiem.\n"
+"\n"
+"Ja v�laties izveidot j�su sist�mai piel�gotu s�kn��anas disketi,\n"
+"ielieciet sisketi pirmaj� iek�rt� un nospiediet \"Ok\"."
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Pirm� diske�u iek�rta"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Otr� diske�u iek�rta"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Izlaist"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3183,64 +4187,32 @@ 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:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Diem��l nav pieejama neviena diske�u iek�rta"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 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:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Ielieciet disketi iek�rt� %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Gatavoju s�kn��anas disketi"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "LILO instal��ana neizdev�s. Atkl�ta ��da k��da:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Vai v�laties izmantot SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "SILO galven�s opcijas"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Ir izveidoti sekojo�i SILO ieraksti.\n"
-"J�s varat pievienot jaunus vai izmain�t eso�os."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Sada�a"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "�is nosaukums jau ir izmantots"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "SILO instal��ana neizdev�s. Atkl�ta ��da k��da:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Sagatavoju s�kn�t�ju"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "Vai v�laties izmantot aboot?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3248,136 +4220,127 @@ msgstr ""
 "K��da, instal�jot aboot, \n"
 "vai instal�t piespiedu k�rt� pat tad, ja tiks izn�cin�ta pirm� sada�a?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Proxy serveru konfigur�cija"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy b�tu j�b�t http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy b�tu j�b�t ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+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:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Sveiciens hakeriem"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "V�j�"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Zems"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Vid�js"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Augsts"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoisks"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Da��di jaut�jumi"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(var izrais�t datu boj�jumus)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Izmantot ciet� diska optimiz�cijas?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Izv�lieties dro��bas l�meni?"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Ja nepiecie�ams, preciz�jiet RAM apjomu (atrasti %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Nomain�mu datu nes�ju automont��ana"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Izt�r�t /tmp katras s�kn��anas laik�"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "At�aut multi profilus"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Iesl�gt num lock palai�anas laik�"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Nor�diet atmi�as apjomu Mb"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Nevar izmantot supermount augst� dro��bas l�men�"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX �ener�s konfigur�cijas failus gan priek� XFree 3.3, gan priek�\n"
-"XFree 4.0. Noklus�ti tiek izmantots 3.3 serveris, jo tas darbojas ar\n"
-"vair�k grafiskaj�m kart�m.\n"
-"\n"
-"Vai v�laties pam��in�t XFree 4.0?"
+"�emiet v�r�: PIE �� DRO��BAS L�ME�A ROOT SESIJAS ATV�R�ANA NO KONSOLES\n"
+"NAV AT�AUTA! Ja v�laties b�t root, jums vispirms ir j�atver parasta\n"
+"lietot�ja sesija un tad j�izmanto \"su\". Visp�r�gi run�jot, neceriet\n"
+"izmantot savu datoru kam citam k� vien servera uzdevumiem.\n"
+"J�s esat br�din�ts."
+
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"Esiet uzman�gs, numlock iesl�g�ana liek daudziem tausti�iem parasto\n"
+"burtu viet� r�d�t ciparus (piem�ram, `p' nospie�ana dod `6')"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Vai m��in�t atrast PCI ier�ces?"
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Vai izmantot jau eso�o X11 konfigur�ciju?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
+msgstr "Vai v�laties izveidot auto instal��anas disketi linux replik�cijai?"
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Ielieciet tuk�u disketi iek�rt� %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Sagatavoju auto instal��anas disketi"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
-"Da�i so�i v�l nav izpild�ti.\n"
-"\n"
-"Vai tie��m tagad v�laties iziet?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3389,162 +4352,19 @@ msgid ""
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
-"Apsveicam, instal��ana ir pabeigta.\n"
-"Iz�emiet instal��anas disku un nospiediet ievadu, lai p�rstart�tu.\n"
-"\n"
-"Lai uzzin�tu par k��du labojumiem, kas pieejami �ai Linux-Mandrake\n"
-"versijai, pa�emiet Errata failu no http://www.linux-mandrake.com/.\n"
-"\n"
-"Inform�ciju par j�su sist�mas konfigur��anu var atrast Ofici�l�s\n"
-"Linux-Mandrake Lietot�ja Rokasgr�matas p�cinstal��anas jaut�jumiem\n"
-"velt�taj� noda��."
-
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Sist�ma tiek aizv�rta"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Instal�ju draiveri %s kartei %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(modulis %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Kuru %s draiveri man izm��in�t?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"Da�os gad�jumos %s draiverim ir j�nor�da papildus inform�cija, lai tas\n"
-"darbotos pareizi, kaut gan parasti bez t� var iztikt. Vai j�s v�laties\n"
-"nor�d�t papildus opcijas, vai ar� �ausiet draiverim aptauj�t j�su datoru,\n"
-"lai samekl�tu nepiecie�amo inform�ciju? Da�os gad�jumos aptauj��ana var\n"
-"uzk�rt j�su datoru, bet nekad nevar to saboj�t."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Autom�tiska aptauj��ana"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Nor�d�t opcijas"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "J�s varat nor�d�t opcijas modulim %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Tagad j�s varat nor�d�t modulim %s nepiecie�am�s opcijas.\n"
-"Opciju form�ts ir ``nosaukums=v�rt�ba nosaukums2=v�rt�ba2 ...''.\n"
-"Piem�ram, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Modu�a opcijas:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Modu�a %s iel�de neizdev�s.\n"
-"Vai v�laties m��in�t v�lreiz ar citiem parametriem?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Vai m��in�t atrast PCMCIA kartes?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Konfigur�ju PCMCIA kartes..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Vai m��in�t atrast %s ier�ces?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Atradu %s %s interfeisus"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Vai dator� ir v�l k�ds?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Vai dator� ir k�ds %s interfeiss?"
 
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "N�"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "J�"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Apskat�t dzel�u inform�ciju"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Piesl�dzu t�klu"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Atsl�dzu t�klu"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake instal��ana %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 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"
-
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
 msgstr ""
-"Tagad j�s varat sadal�t diska iek�rtu %s\n"
-"Kad esat pabeigu�i, neaizmirstiet saglab�t, izmantojot `w'"
+"   <Tab>/<Alt-Tab> p�riet | <Space> izv�l�ties | <F12> uz n�kamo ekr�nu"
 
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "L�dzu uzgaidiet"
 
@@ -3554,7 +4374,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Nenoteikt�ba (%s), esiet prec�z�ks\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Slikta izv�le, pam��iniet v�lreiz\n"
 
@@ -3568,451 +4388,940 @@ msgstr " ? (noklus�ti %s) "
 msgid "Your choice? (default %s) "
 msgstr "J�su izv�le? (noklus�ti %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "J�su izv�le? (noklus�ti %s  ievadiet `none', ja nav) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "�ehijas"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "V�cijas"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvoraka"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Sp�nijas"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Somijas"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Francijas"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norv��ijas"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Polijas"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Krievijas"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Apvienot�s Karalistes"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "ASV tastat�ra"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Arm�nijas (vec�)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Arm�nijas (rakst�mma��na)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Arm�nijas (fon�tisk�)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "Azerbaid��nas (lat��u)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "Azerbaid��nas (kirilica)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Be��ijas"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulg�rijas"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Braz�lijas (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
-#, fuzzy
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
-msgstr "Bulg�rijas"
+msgstr "Baltkrievijas"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "�veices (v�cu izvietojums)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "�veices (fran�u izvietojums)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "V�cijas (bez m�majiem tausti�iem)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "D�nijas"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvoraka (US)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvoraka (Norv��ijas)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Igaunijas"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gruzijas (\"krievu\" izvietojums)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gruzijas (\"lat��u\" izvietojums)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Grie�ijas"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Ung�rijas"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Horv�tijas"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Izra�las"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Izra�las (fon�tisk�)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Ir�nas"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islandes"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "It�lijas"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "Jap�nas 106 taisti�i"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Lat��amerikas"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "D�nijas"
 
-#: ../../keyboard.pm_.c:140
-#, fuzzy
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
-msgstr "Lietuvas AZERTY"
+msgstr "Lietuvas AZERTY (vec�)"
 
-#: ../../keyboard.pm_.c:142
-#, fuzzy
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
-msgstr "Lietuvas AZERTY"
+msgstr "Lietuvas AZERTY (jaun�)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lietuvas \"numuru rinda\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lietuvas \"fon�tisk�\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Polijas (qwerty izvietojums)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Polijas (qwertz izvietojums)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portug�les"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kan�das (Kvebeka)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Krievijas (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Zviedrijas"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Slov�nijas"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slov�kijas"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Tai tastat�ra"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turcijas (tradicion�lais \"F\" modelis)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turcijas (modernais \"Q\" modelis)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukrainas"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "ASV tastat�ra (starptautisk�)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vjetnamas \"numuru rinda\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Dienvidsl�vijas (lat��u izvietojums)"
 
-# 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.
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - pele"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "Standarta"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Visp�r�ja"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "Ritenis"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "seri�la"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Parasta 2 pogu pele"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Parasta 3 pogu pele"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (seri�la, vecs C7 tips)"
+
+#: ../../mouse.pm_.c:64
+msgid "busmouse"
+msgstr "busmouse"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2 pogas"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3 pogas"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "neviens"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Nav peles"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "T�l�k ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Vai tas ir pareizi?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Interneta konfigur�cija"
+
+#: ../../netconnect.pm_.c:94
+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?"
+
+#: ../../netconnect.pm_.c:101
+msgid "Testing your connection..."
+msgstr "Izm��inu piesl�gumu..."
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Pa�laik j�s neesat piesl�dzies Internetam."
+
+#: ../../netconnect.pm_.c:107
+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."
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "ISDN konfigur�cija"
+
+#: ../../netconnect.pm_.c:141
+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:158
+msgid "Connection Configuration"
+msgstr "Savienojuma konfigur��ana"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "L�dzu aizpieldiet vai izv�lietis lauku"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "Kartes IRQ"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "Kartes mem (DMA)"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "Kartes IO"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "Kartes IO_0"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "Kartes IO_1"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "J�su priv�tais telefona numurs"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "Pakalpojumu sniedz�ja nosaukums (piem., provider.net)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Pakalpojumu sniedz�ja telefona numurs"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "Pakalpojumu sniedz�ja dns 1"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "Pakalpojumu sniedz�ja dns 2"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "Zvan��anas re��ms"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "Konta nosaukums (lietot�ja v�rds)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Konta parole"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Apstiprin�t paroli"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "Eiropa"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Eiropa (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "Citur pasaul�"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "Citur pasaul� - nav D-Channel (izdal�tas l�nijas)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "K�du protokolu v�laties izmantot?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "Nezinu"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "K�ds ir j�su kartes tips?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "Turpin�t"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "P�rtraukt"
+
+#: ../../netconnect.pm_.c:245
 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"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
-"Juus sveic LILO, opereetaajsisteemu izveeles programma!\n"
 "\n"
-"Lai redzeetu visas iespeejamaas izveeles, nospiediet <TAB>.\n"
+"Ja jums ir ISA karte, v�rt�b�m n�kamaj� ekr�n� j�b�t pareiz�m.\n"
 "\n"
-"Lai ielaadeetu vienu no taam, ierakstiet nosaukumu un nospiediet <ENTER> vai "
-"gaidiet %d sekundes, liidz saaksies nokluseetaa ielaade.\n"
+"Ja jums ir PCMCIA karte, jums ir j�zina kartes irq un io.\n"
+
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "Kura ir j�su ISDN karte ?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "Ir atrasta ISDN karte:\n"
+
+#: ../../netconnect.pm_.c:287
+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 ""
+"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:299
+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:331
+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:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Izv�lieties t�kla interfeisu"
+
+#: ../../netconnect.pm_.c:336
+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:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "T�kla interfeiss"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
+"Do you agree?"
+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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Juus sveic GRUB, opereetaajsisteemu izveeles programma!"
+#: ../../netconnect.pm_.c:352
+msgid "I'm about to restart the network device:\n"
+msgstr "Gatavojos p�rstart�t t�kla ier�ci:\n"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "Izmantojiet tausti�us %c un %c, lai izv�l�tos vajadz�go ierakstu."
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "ADSL konfigur�cija"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Nospiediet ievadu, lai s�kn�tu izv�l�to OS, 'e', lai redi��tu"
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "Vai v�laties start�t piesl�gumu palai�anas laik�?"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "komandas pirms s�kn��anas, vai 'c', lai izsauktu komandrindu."
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "M��in�t atrast mod�mu?"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Izdal�tais ieraksts tiks s�kn�ts p�c %d sekund�m."
+#: ../../netconnect.pm_.c:539
+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."
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Iezvanpieejas opcijas"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Savienojuma nosaukums"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "Telefona numurs"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Lietot�ja ID"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Autentifik�cija"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Ar skriptu"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Izmantojot termin�li"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Dom�na nosaukums"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Pirmais DNS serveris"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Otrais DNS serveris"
+
+#: ../../netconnect.pm_.c:582
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
 msgstr ""
+"\n"
+"Varat piesl�gties Internetam vai p�rkonfigur�ts piesl�gumu."
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Darba virsma"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr ""
+"\n"
+"Varat p�rkonfigur�t piesl�gumu."
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Start Menu"
+#: ../../netconnect.pm_.c:582
+msgid "You are not currently connected to Internet."
+msgstr "Pa�laik j�s neesat piesl�dzies Internetam."
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - pele"
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
+"\n"
+"Varat atsl�gties vai p�rkonfigur�t piesl�gumu."
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB pele"
+#: ../../netconnect.pm_.c:586
+msgid "You are currently connected to internet."
+msgstr "Pa�laik j�s esat piesl�dzies Internetam."
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB pele (2 pogas)"
+#: ../../netconnect.pm_.c:590
+msgid "Connect to Internet"
+msgstr "Piesl�gties Internetam"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB pele (3+ pogas)"
+#: ../../netconnect.pm_.c:592
+msgid "Disconnect from Internet"
+msgstr "Atsl�gties no Interneta"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB pele"
+#: ../../netconnect.pm_.c:594
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Konfigur�t t�kla piesl�gumu (LAN vai Interneta)"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB pele (2 pogas)"
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "Interneta piesl�gums un konfigur�cija"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB pele (3+ pogas)"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+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?"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Parasta pele (PS/2)"
+#: ../../netconnect.pm_.c:641
+msgid "Configure a normal modem connection"
+msgstr "Konfigur�t parasta mod�ma piesl�gumu"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (PS/2)"
+#: ../../netconnect.pm_.c:661
+msgid "Configure an ISDN connection"
+msgstr "Konfigur�t ISDN piesl�gumu"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Parasta 3 pogu pele (PS/2)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Iek��ja ISDN karte"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:668
+msgid "External ISDN modem"
+msgstr "�r�js ISDN mod�ms"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "Piesl�gties Internetam"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "K�ds ir j�su ISDN piesl�guma veids?"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:691
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Konfigur�t DSL (vai ADSL) piesl�gumu"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "Francija"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "Citas valstis"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "Kur� valst� j�s atrodaties ?"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "Alcatel mod�ms"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus pele"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "ECI mod�ms"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus pele"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "Ja jums ir Alcatel adsl mod�ms, izv�lieties Alcate. Cit�di - ECI."
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus pele"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "izmantot pppoe"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB pele"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "neizmantot pppoe"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB pele (3 vai vair�kas pogas)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"Parast�kais veids, k� piesl�gties ar adsl, ir dhcp + pppoe.\n"
+"Tom�r da�i piesl�gumi izmanto tikai dhcp.\n"
+"Ja j�s nezinat, izv�lieties 'izmantot pppoe'"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Nav peles"
+#: ../../netconnect.pm_.c:765
+msgid "Configure a cable connection"
+msgstr "Konfigur�t kabe�a piesl�gumu"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A vai jaun�ka (seri�la)"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"Kuru dhcp klientu v�laties izmantot?\n"
+"Noklus�ti ir dhcpd"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (seri�la)"
+#: ../../netconnect.pm_.c:800
+msgid "Disable Internet Connection"
+msgstr "Atsl�gt Interneta piesl�gumu"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (seri�la)"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "Konfigur�t lok�lo t�klu"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (seri�la)"
+#: ../../netconnect.pm_.c:815
+msgid "Network configuration"
+msgstr "T�kla konfigur�cija"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (seri�la)"
+#: ../../netconnect.pm_.c:816
+msgid "Do you want to restart the network"
+msgstr "Vai v�laties p�rstart�t t�klu"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (seri�la)"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "Atsl�gt t�klu"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (seri�la)"
+#: ../../netconnect.pm_.c:834
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Konfigur�t Interneta piesl�gumu / Konfigur�t lok�lo t�klu"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (seri�la)"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"Lok�lais t�kls jau ir konfigur�ts.\n"
+"Vai j�s v�laties:"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (seri�la, vecs C7 tips)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "K� j�s v�laties piesl�gties Internetam?"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (seri�la)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "T�kla konfigur�cija"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Parasta pele (seri�la)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
+"Tagad, kad ir konfigur�ts j�su Interneta piesl�gums,\n"
+"datoru var konfigur�t t�, lai kop�gi izmantotu Interneta piesl�gumu.\n"
+"Piez�me: jums ir nepiecie�ams atsevi��s t�kla adapteris, lai uzst�d�ti "
+"lok�lo datort�klu (LAN).\n"
+"\n"
+"Vai v�laties uzst�d�t Interneta piesl�guma koplieto�anu?\n"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft savietojama (seri�la)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "t�kla karte nav atrasta"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Parasta 3 pogu pele (seri�la)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Konfigur�ju t�klu"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (seri�la)"
+#: ../../network.pm_.c:274
+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''."
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Vai tas ir pareizi?"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "Resursa v�rds:"
 
-#: ../../partition_table.pm_.c:527
-msgid "Extended partition not supported on this platform"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+"BR�DIN�JUMS: �� ier�ce agr�k bija konfigur�ta, lai piesl�gtos Internetam.\n"
+"Vienk�r�i nospiediet Ok, ja v�laties atst�t ier�ces konfigur�ciju.\n"
+"T�l�ko lauku izmain��ana p�rrakst�s �o konfigur�ciju."
+
+#: ../../network.pm_.c:302
+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 ""
+"L�dzu ievadiet �� datora IP konfigur�ciju.\n"
+"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:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Konfigur�ju t�kla iek�rtu %s"
+
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Autom�tisks IP"
+
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "IP adrese"
+
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "T�kla maska"
+
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+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:341
+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 ""
+"L�dzu ievadiet resursa v�rdu.\n"
+"Resursa v�rdam ir j�b�t pilnam kvalific�tam resursa v�rdam,\n"
+"piem�ram, ``mybox.mylab.myco.com''.\n"
+"J�s varat ievad�t ar� v�rtejas IP adresi, ja t�da ir"
+
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "DNS serveris"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "V�rteja"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "V�rtejas ier�ce"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "Proxy serveru konfigur�cija"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
 
-#: ../../partition_table.pm_.c:545
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy b�tu j�b�t http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy b�tu j�b�t ftp://..."
+
+#: ../../partition_table.pm_.c:540
+msgid "Extended partition not supported on this platform"
+msgstr "�ai platformai papla�in�t� sada�a nav pieejama"
+
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4022,21 +5331,21 @@ msgstr ""
 "Vien�gais risin�jums ir p�rvietot prim�ras sada�as t�, lai caurums atrastos "
 "blakus papla�in�taj�m sada��m"
 
-#: ../../partition_table.pm_.c:634
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "K��da, nolasot failu %s"
 
-#: ../../partition_table.pm_.c:641
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Atjauno�ana no faila %s neizdev�s: %s"
 
-#: ../../partition_table.pm_.c:643
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Slikts rezerves kopijas fails"
 
-#: ../../partition_table.pm_.c:664
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "K��da, ierakstot fail� %s"
@@ -4070,42 +5379,51 @@ msgstr "interesanta"
 msgid "maybe"
 msgstr "varb�t"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (svar�ga)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (�oti der�ga)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (der�ga)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "R�d�t maz�k"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "R�d�t vair�k"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Lok�ls printeris"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "Att�ls lpd"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "Att�ls printeris"
+
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "Att�ls CUPS serveris"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "Att�ls lpd serveris"
+
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "T�kla printeris (socket)"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "Printera ier�ces URI"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Noskaidroju ier�ces..."
@@ -4119,11 +5437,11 @@ msgstr "P�rbaud�t portus"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Printeris, modelis \"%s\", atrasts pie "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Lok�l� printera ier�ce"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4131,37 +5449,37 @@ msgstr ""
 "Kurai ier�cei ir piesl�gts printeris\n"
 "(atcerieties, ka /dev/lp0 atbilst LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Printera ier�ce"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Att�la lpd printera opcijas"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 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."
 msgstr ""
 "Lai izmantotu att�lu lpd drukas rindu, jums j�nor�da\n"
-"printera servera v�rds un t�s servera rindas nosaukums,\n"
-"kurai j�adres� drukas uzdevumi."
+"printera servera resursa v�rds un t�s servera rindas\n"
+"nosaukums, kurai j�adres� drukas uzdevumi."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
-msgstr "Att�l� datora v�rds"
+msgstr "Att�l� resursa v�rds"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Att�l� rinda"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) printera opcijas"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4169,33 +5487,33 @@ msgid ""
 "well as the share name for the printer you wish to access and any\n"
 "applicable user name, password, and workgroup information."
 msgstr ""
-"Lai druk�tu ar SMB printeri, jums j�nor�da SMB servera v�rds\n"
+"Lai druk�tu ar SMB printeri, jums j�nor�da SMB resursa v�rds\n"
 "(Piez�me! Tas var at��irties no datora TCP/IP v�rda!)\n"
 "un, iesp�jams, �� servera IP adrese, k� ar� j�s interes�jo�� printera\n"
 "koplietojuma v�rds un atbilsto�s lietot�ja v�rds, parole un\n"
 "darba grupas inform�cija."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
-msgstr "SMB servera v�rds"
+msgstr "SMB servera resurss"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "SMB servera IP"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Koplietojuma v�rds"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Darba grupa"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "NetWare printera opcijas"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4204,134 +5522,158 @@ msgid ""
 msgstr ""
 "Lai druk�tu ar NetWare printeri, jums j�nor�da NetWare\n"
 "printera servera v�rds (Piez�me! tas var at��irties no servera\n"
-"TCP/IP v�rda!), k� ar� j�su izv�l�t� printera rindas nosaukums un\n"
-"jebkur� atbilsto�s lietot�ja v�rds un parole."
+"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:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Printera serveris"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Printera rindas nosaukums"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "Socket printera opcijas"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+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:141
+msgid "Printer Hostname"
+msgstr "Printera resursa v�rds"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "Ports"
+
+#: ../../printerdrake.pm_.c:155
+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:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "K�ds ir j�su printera tips?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Vai v�laties izm��in�t printeri?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Tiek druk�ta(s) izm��in�juma lapa(s)..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\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"
+"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:214 ../../printerdrake.pm_.c:330
+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?"
+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:230
 msgid "Yes, print ASCII test page"
 msgstr "J�, izdruk�t ASCII izm��in�juma lapu"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "J�, izdruk�t PostScript izm��in�juma lapu"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "J�, izdruk�t abas izm��in�juma lapas"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Konfigur�t printeri"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "K�ds ir j�su printera tips?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Printera opcijas"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Pap�ra izm�rs"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Vai izmest lapu p�c izdrukas?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Uniprint draivera opcijas"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Kr�su dzi�uma opcijas"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Druk�t tekstu k� PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "A�g�rna lappu�u sec�ba"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Vai labot teksta k�p�veida izdruku?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Lappu�u skaits vien� izdrukas lap�"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Lab�/Kreis� mala punktos (1/72 collas da��s)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 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:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Papildus GhostScript opcijas"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Papildus teksta opcijas"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Vai v�laties izm��in�t printeri?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Tiek druk�ta(s) izm��in�juma lapa(s)..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\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"
-"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:222
-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?"
-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:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Printeris"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Vai v�laties konfigur�t printeri?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4339,19 +5681,66 @@ msgstr ""
 "Eksist� sekojo�as drukas rindas.\n"
 "J�s varat pievienot jaunass vai izmain�t eso��s."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "CUPS start��ana"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr "Nolasu CUPS draiveru datub�zi..."
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Izv�lieties printera piesl�gumu"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "K� �is printeris ir piesl�gts?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "Izv�lieties att�la printera piesl�gumu"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+"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:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Izdz�st rindu"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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?"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "Printera nosaukums"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "Apraksts"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "Atra�an�s vieta"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4363,55 +5752,53 @@ msgstr ""
 "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:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Rindas nosaukums"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Spol��anas katalogs"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Printera piesl�gums"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Nevar pievienot sada�u _format�tam_ RAID md%d"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Neizdodas ierakst�t failu $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid neizdev�s"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid neizdev�s (varb�t nav uzst�d�ti raidtools?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Nepietiek diska sada�u RAID l�menim %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron ir periodisku komandu pl�not�js."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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 tiek izmantots baterijas st�vok�a nov�rt��anai un gr�mato�anai,\n"
-"izmantojor syslog.\n"
-" To var ar� izmanto datora aizv�r�anai, kad\n"
-"baterija ir izl�d�ta."
+"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:17
+#: ../../services.pm_.c:18
 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."
@@ -4420,7 +5807,7 @@ msgstr ""
 "k� ar� palai� komadu paketes, kad vid�j� sist�mas noslodze ir pietieko�i\n"
 "zema."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4432,7 +5819,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:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4444,7 +5831,7 @@ msgstr ""
 "izgriezt-un-iespraust oper�cijas, k� ar� pied�v� izleco�o izv�l�u\n"
 "atbalstu konsolei."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4452,7 +5839,7 @@ msgstr ""
 "Apache ir Vispasaules t�mek�a (WWW) serveris. Tas tiek izmantots HTML\n"
 "failu un CGI izplat��anai."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4466,17 +5853,17 @@ 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:31
+#: ../../services.pm_.c:32
 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 ""
-"�� paka iel�d� izv�l�to tastat�ras karti, kas nor�d�ta fail�\n"
+"�� pakotne iel�d� izv�l�to tastat�ras karti, kas nor�d�ta fail�\n"
 "/etc/sysconfig/keyboard. To var izv�l�ties, izmantojot programmu kbdconfig.\n"
-"Vairum� gad�jumu �o paku ir j�atst�j izv�l�tu."
+"Vairum� gad�jumu �o pakotni ir j�atst�j izv�l�tu."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4484,15 +5871,15 @@ 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:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
-"named (BIND) ir dom�nu v�rdu serveris (DNS), kas tiek izmantots datoru\n"
+"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:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4500,7 +5887,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:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4508,7 +5895,7 @@ msgstr ""
 "Aktiviz�/Deaktiviz� visus t�kla interfeisus, kas ir konfigur�ti\n"
 "start��anai sist�mas s�kn��anas laik�."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4518,7 +5905,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:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4526,7 +5913,7 @@ 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:47
+#: ../../services.pm_.c:48
 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 "
@@ -4537,7 +5924,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:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4548,7 +5935,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:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4556,7 +5943,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:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4564,7 +5951,7 @@ msgstr ""
 "Saglab� un atjauno sist�mas entropijas kr�tuvi, lai �ener�tu\n"
 "kvalitat�v�kus gad�jumskait�us."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4575,7 +5962,7 @@ msgstr ""
 "t�klos, sare���t�kiem t�kliem ir nepiecie�ami sare���t�ki mar�rutiz��anas\n"
 "protokoli."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4583,23 +5970,23 @@ msgstr ""
 "rstat protokols �auj t�kla lietot�jiem sa�emt veiktsp�jas\n"
 "inform�ciju par jebkuru �� t�kla datoru."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
-"rusers protokols �auj t�kla lietot�jiem noteik, kuri lietot�ji ir\n"
-"iere�istr�jies citos atbilsto�os datoros."
+"Protokols rusers t�kla lietot�jiem �auj noskaidrot, kuru lietot�ju\n"
+"sesijas ir atv�rtas citos atbildo�ajos datoros."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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 protokols �auj att�liem lietot�jiem sa�emt visu iere�istr�to\n"
-"lietot�ju sarakstu, ja �is dators izmanto rwho demonu (l�dz�gu finger)."
+"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:66
+#: ../../services.pm_.c:67
 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."
@@ -4607,59 +5994,222 @@ 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:68
+#: ../../services.pm_.c:69
 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."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "Start� un aptura X Fontu Serveri s�kn��anas un aizv�r�anas laik�."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 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�"
 
-# 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.
-#
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Jus sveicina SILO, operetajsistemu parsledzejs!\n"
-"\n"
-"Lai redzetu visas iespejamas izveles, nospiediet <TAB>.\n"
-"\n"
-"Lai ieladetu vienu no tam, ierakstiet nosaukumu un nospiediet <ENTER> vai "
-"gaidiet %d sekundes, lidz saksies nokluseta ielade.\n"
-"\n"
+"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"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "LILO/GRUB konfigur��ana"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "S�kn��anas disketes rad��ana"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Disketes format��ana"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Izv�le"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "LILO instal��ana neizdev�s. Atkl�ta ��da k��da:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Interneta piesl�guma koplieto�ana pa�laik ir iesl�gta"
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+"Interneta piesl�guma koplieto�ana jau ir uzst�d�ta.\n"
+"Pa�laik t� ir iesl�gta.\n"
+"\n"
+"Ko j�s v�laties dar�t?"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+msgid "disable"
+msgstr "atsl�gt"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+msgid "reconfigure"
+msgstr "p�rkonfigur�t"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Interneta piesl�guma koplieto�ana pa�laik ir atsl�gta"
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+"Interneta piesl�guma koplieto�ana jau ir uzst�d�ta.\n"
+"Pa�laik t� ir atsl�gta.\n"
+"\n"
+"Ko j�s v�laties dar�t?"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+msgid "enable"
+msgstr "iesl�gt"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "Konfigur�cijas faila saturu neizdodas saprast."
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "Interneta piesl�guma koplieto�ana"
+
+#: ../../standalone/drakgw_.c:152
+#, fuzzy
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+"Tagad, kad ir konfigur�ts j�su Interneta piesl�gums,\n"
+"datoru var konfigur�t t�, lai kop�gi izmantotu Interneta piesl�gumu.\n"
+"Piez�me: jums ir nepiecie�ams atsevi��s t�kla adapteris, lai uzst�d�ti "
+"lok�lo datort�klu (LAN).\n"
+"\n"
+"Vai v�laties uzst�d�t Interneta piesl�guma koplieto�anu?\n"
+
+#: ../../standalone/drakgw_.c:177
+msgid "using module"
+msgstr "izmantojot moduli"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "J�su sist�m� nav t�kla adaptera!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"J�su sist�m� nav atrasts neviens ethernet t�kla adapteris. L�dzu izmantojiet "
+"aparat�ras konfigur��anas r�ku."
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"J�su sist�m� ir tikai viens konfigur�ts t�kla adapteris:\n"
+"\n"
+"$interface\n"
+"\n"
+"Vai v�laties uzst�d�t j�su lok�lo datort�klu ar �o adapteri?"
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"L�dzu izv�lieties, kur� t�kla adapteris b�s piesl�gts j�su lok�lajam "
+"datort�klam."
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"Br�din�jums, t�kla adapteris jau ir konfigur�ts.\n"
+"Vai v�laties to konfigur�t atk�rtoti?"
+
+#: ../../standalone/drakgw_.c:258
+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:268
+msgid "Firewalling configuration detected!"
+msgstr "Atkl�ta ugunsm�ra konfigur�cija!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+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. "
+"Turpin�t?"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "Tiek konfigur�ti skripti, instal�tas programmas, start�ti serveri..."
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring..."
+msgstr "Konfigur�ju..."
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "Nevar instal�t ipchains RPM ar urpmi."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "Nevar instal�t dhcp RPM ar urpmi."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "Nevar instal�t linuxconf RPM ar urpmi."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "Nevar instal�t bind RPM ar urpmi."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "Nevar instal�t caching-nameserver RPM ar urpmi."
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Apsveicam!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4721,23 +6271,31 @@ msgstr "Uzst�du dro��bas l�meni"
 msgid "Choose the tool you want to use"
 msgstr "Izv�lities izmantojamo r�ku"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "K�ds ir j�su tastat�ras izk�rtojums?"
+#: ../../standalone/livedrake_.c:23
+msgid "Change Cd-Rom"
+msgstr "Nomain�t 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 ""
+"L�dzu ielieciet instal�cijas Cd-Rom un nospiediet Ok, kad tas izdar�ts.\n"
+"Ja jums nav �� diska, nospiediet Atsaukt, lai neuzs�ktu uzlabo�anu no t�kla."
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "K�ds ir j�su peles tips?"
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr "Neizdodas uzs�kt uzlabo�anu no t�kla !!!\n"
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "nav atrasta seri�la_usb\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Vai emul�t tre�o pogu?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Kuram seri�lajam portam ir piesl�gta pele?"
 
@@ -4757,7 +6315,7 @@ msgstr "Mekl�t"
 
 #: ../../standalone/rpmdrake_.c:49 ../../standalone/rpmdrake_.c:56
 msgid "Package"
-msgstr "Paka"
+msgstr "Pakotne"
 
 #: ../../standalone/rpmdrake_.c:51
 msgid "Text"
@@ -4781,11 +6339,11 @@ msgstr "Skat�t"
 
 #: ../../standalone/rpmdrake_.c:59 ../../standalone/rpmdrake_.c:163
 msgid "Installed packages"
-msgstr "Instal�t�s pakas"
+msgstr "Instal�t�s pakotnes"
 
 #: ../../standalone/rpmdrake_.c:60
 msgid "Available packages"
-msgstr "Pieejam�s pakas"
+msgstr "Pieejam�s pakotnes"
 
 #: ../../standalone/rpmdrake_.c:62
 msgid "Show only leaves"
@@ -4805,7 +6363,7 @@ msgstr "Konfigur�cija"
 
 #: ../../standalone/rpmdrake_.c:71
 msgid "Add location of packages"
-msgstr "Pievienot paku atra�an�s vietu"
+msgstr "Pievienot pakot�u atra�an�s vietu"
 
 #: ../../standalone/rpmdrake_.c:75
 msgid "Update location"
@@ -4817,15 +6375,15 @@ msgstr "Izdz�st"
 
 #: ../../standalone/rpmdrake_.c:100
 msgid "Configuration: Add Location"
-msgstr "Konfigur�ciju: pievienot vietu"
+msgstr "Konfigur�cija: pievienot vietu"
 
 #: ../../standalone/rpmdrake_.c:103
 msgid "Find Package"
-msgstr "Samekl�t paku"
+msgstr "Samekl�t pakotni"
 
 #: ../../standalone/rpmdrake_.c:104
 msgid "Find Package containing file"
-msgstr "Samekl�t paku, kur� ir fails"
+msgstr "Samekl�t pakotni, kur� ir fails"
 
 #: ../../standalone/rpmdrake_.c:105
 msgid "Toggle between Installed and Available"
@@ -4841,7 +6399,7 @@ msgstr "Noinstal�t"
 
 #: ../../standalone/rpmdrake_.c:163
 msgid "Choose package to install"
-msgstr "Izv�lieties instal�jamo paku"
+msgstr "Izv�lieties instal�jamo pakotni"
 
 #: ../../standalone/rpmdrake_.c:190
 msgid "Checking dependencies"
@@ -4853,7 +6411,7 @@ msgstr "Gaidiet"
 
 #: ../../standalone/rpmdrake_.c:209
 msgid "The following packages are going to be uninstalled"
-msgstr "Tiks noinstal�tas sekojo�as pakas"
+msgstr "Tiks noinstal�tas sekojo�as pakotnes"
 
 #: ../../standalone/rpmdrake_.c:210
 msgid "Uninstalling the RPMs"
@@ -4865,7 +6423,7 @@ msgstr "Regexp"
 
 #: ../../standalone/rpmdrake_.c:229
 msgid "Which package are looking for"
-msgstr "Kuru paku mekl�jat"
+msgstr "Kuru pakotni mekl�jat"
 
 #: ../../standalone/rpmdrake_.c:238 ../../standalone/rpmdrake_.c:262
 #: ../../standalone/rpmdrake_.c:278
@@ -4950,15 +6508,168 @@ msgstr "Mekl�ju lapas"
 msgid "Finding leaves takes some time"
 msgstr "Lapu samekl��ana aiz�em zin�mu laiku"
 
-#~ msgid "useless"
-#~ msgstr "neder�ga"
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr "R�ki CD disku rad��anai un ierakst��anai"
+
+#
+msgid "Internet Tools"
+msgstr "Interneta r�ki"
+
+#
+msgid "Internet"
+msgstr "Internets"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr "Person�g�s finanses"
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm u.c."
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafisk�s programmas, piem�ram, The Gimp"
+
+msgid "Office"
+msgstr "Birojs"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr "Datub�zu klienti un serveri (mysql un postgresql)"
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "R�ki darbam ar j�su Palm Pilot vai Visor"
+
+#
+msgid "Multimedia - Graphics"
+msgstr "Multim�dija - Grafika"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr "Video atska�ot�ji un redaktori"
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+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
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+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
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm u.c."
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "R�ku komplets pastam, jaunumiem, t�meklim, failu sa��m�anai un �atam"
+
+#
+msgid "Multimedia - Video"
+msgstr "Multim�dija - Video"
+
+msgid "KDE"
+msgstr "KDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr "Ska�as un video atska�o�anas/redi���anas programmas"
+
+msgid "Multimedia"
+msgstr "Multim�dija"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#
+msgid "Multimedia - Sound"
+msgstr "Multim�dija - Ska�a"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Dokument�cija"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programmas j�su finan�u p�rvald��anai, piem�ram, gnucach"
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr "Grafikas apstr�de"
+
+#
+msgid "Games"
+msgstr "Sp�les"
+
+#
+msgid "Multimedia - CD Burning"
+msgstr "Multim�dija - CD ierakst��ana"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr "Komunik�ciju r�ki"
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr "Datub�zes"
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Izv�lietis apjomu, ko v�laties instal�t"
 
-#~ msgid "garbage"
-#~ msgstr "atkritumi"
+#~ msgid "Total size: "
+#~ msgstr "Kop�jais apjoms: "
 
 #~ 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 Linux."
+#~ "The system is now connected to Internet! Congratulation.\n"
+#~ "Feel free to launch draknet at any time to setup your connection.\n"
 #~ msgstr ""
-#~ "J�su dator� ir atrasti da�i windows true type fonti. Vai v�laties tos\n"
-#~ "izmantot? P�rliecinieties, vai jums ir ties�bas tos izmantot Linux vid�."
+#~ "Sist�ma pa�laik ir piesl�gta Internetam! Apsveicam.\n"
+#~ "J�s varat palaist draknet jebkur� laik�, lai konfigur�tu piesl�gumu.\n"
diff --git a/perl-install/share/po/nl.po b/perl-install/share/po/nl.po
index c9881c174..428152038 100644
--- a/perl-install/share/po/nl.po
+++ b/perl-install/share/po/nl.po
@@ -2,55 +2,116 @@
 # Copyright (C) 1999-2000 Mandrakesoft
 # Jo <rainbow@linuxfan.com>, 1999
 # Tom Laermans <sidewinder@linuxfreak.com>, 2000
+# Niels Gras <niels.gras@wanadoo.nl>, 2000
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
-"Last-Translator: Tom Laermans <sidewinder@linuxfreak.com>\n"
+"Last-Translator: Niels Gras <niels.gras@wanadoo.nl>\n"
 "Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "Algemeen"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Grafische kaart"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Selecteer een grafische kaart"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Selecteer een X-server"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X-Server"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Welke configuratie van XFree wilt u hebben?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"Uw kaart kan 3D acceleratie ondersteuning krijgen, maar alleen met XFree "
+"%s.\n"
+"Uw kaart wordt ondersteund door XFree %s, welke betere ondersteuning zou \n"
+"kunnen hebben in 2D."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr "Uw kaart kan 3D acceleratie ondersteuning krijgen met XFree %s."
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s met 3D hardware acceleratie"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"Uw kaart kan 3D hardware acceleratie ondersteuning hebben, maar alleen met \n"
+"XFree %s, LET OP: DIT IS EEN EXPERIMENTELE ONDERSTEUNING, WELKE UW COMPUTER "
+"\n"
+"KAN LATEN VASTHANGEN.\n"
+"Uw kaart wordt ondersteund door XFree %s, welke betere ondersteuning zou \n"
+"kunnen hebben in 2D."
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"Uw kaart kan 3D acceleratie ondersteuning krijgen met XFree %s.\n"
+"LET OP: DIT IS EEN EXPERIMENTELE ONDERSTEUNING, WELKE UW COMPUTER KAN LATEN "
+"\n"
+"VASTHANGEN."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s met EXPERIMENTELE 3D hardware acceleratie"
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "XFree configuratie"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Selecteer hoeveel geheugen uw grafische kaart heeft"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Selecteer de opties voor de X-server"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Selecteer een monitor"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -75,39 +136,41 @@ msgstr ""
 "beschadigen.\n"
 "Bij twijfel, maakt u best een conservatieve keuze."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Horizontale verversingsratio"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Verticale verversingsratio"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Monitor niet geconfigureerd"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Grafische kaart nog niet geconfigureerd"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Resoluties nog niet gekozen"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Wenst u de configuraties te testen?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr "Waarschuwing: testen is gevaarlijk op deze grafische kaart"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr ""
+"Waarschuwing: door deze grafische kaart te testen, kan uw computer vast "
+"blijven hangen"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Configuratie Testen"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -115,184 +178,171 @@ msgstr ""
 "\n"
 "probeer een aantal parameters aan te passen"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Er is een fout opgetreden:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Verdwijnt binnen %d seconden"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "Is dit de juiste instelling?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Er is een fout opgetreden, probeer een aantal parameters aan te passen"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Automatische resoluties"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Om de beschikbare resoluties te detecteren, zal ik er een paar uitproberen.\n"
-"Uw scherm zal flikkeren...\n"
-"U kan het uitschakelen als u wenst, u zal een geluid horen als het voorbij is"
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Kies resolutie en kleurdiepte"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafische kaart: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86-server: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Toon alles"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Resoluties"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Ik kan proberen om de beschikbare resoluties te detecteren.\n"
-"Het kan zijn dat hierdoor uw computer hangt.\n"
-"Wenst u dit te proberen?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Geen geldige modi gevonden\n"
-"Probeer met een andere grafische kaart of monitor"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Toetsenbord instelling: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Muistype: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Muis: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor Horizontale Sync: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor Verticale Verversing: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafische kaart: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Videogeheugen: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "Kleurdiepte: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Resolutie: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86-server: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 driver: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Bezig met het voorbereiden van de configuratie van X-Windows"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Verander Monitor"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Verander grafische kaart"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Verander Server-opties"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Resolutie wijzigen"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Resoluties automatisch zoeken"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Informatie tonen"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Opnieuw testen"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Be�indig"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Wat wenst u te doen?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Veranderingen vergeten?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"Veranderingen bewaren?De huidige configuratie is:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Gelieve opnieuw in te loggen op %s om de wijzigingen te activeren"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Gelieve uit te loggen en daarna Ctrl-Alt-Backspace te gebruiken"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X bij opstarten"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -300,227 +350,223 @@ msgstr ""
 "Ik kan uw computer instellen om automatisch X te starten bij opstarten.\n"
 "Wenst u X te starten bij het opstarten?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Automatisch inloggen"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"Ik kan uw computer instellen om automatisch bij een bepaalde gebruiker in te "
+"loggen.\n"
+"Als u deze optie niet wilt gebruiken, klikt u op de knop annuleren."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Kies de standaard gebruiker:"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "Selecteer de 'window manager' die u wilt gebruiken:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 kleuren (8 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32,000 kleuren (15 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65,000 kleuren (16 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 miljoen kleuren (24 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 miljard kleuren (32 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB of meer"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standaard VGA, 640x480 aan 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 aan 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 Compatibel, 1024x768 aan 87 Hz interlaced (geen 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 aan 87 Hz interlaced, 800x600 aan 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Extended Super VGA, 800x600 aan 60 Hz, 640x480 aan 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "Non-Interlaced SVGA, 1024x768 aan 60 Hz, 800x600 aan 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "High Frequency SVGA, 1024x768 aan 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frequency in staat om 1280x1024 aan 60 Hz weer te geven"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frequency in staat om 1280x1024 aan 74 Hz weer te geven"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frequency in staat om 1280x1024 aan 76 Hz weer te geven"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Multi-frequency in staat om 1600x1200 aan 70 Hz weer te geven"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Multi-frequency in staat om 1600x1200 aan 76 Hz weer te geven"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "Krullend"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "Standaard"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "das"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "brunette"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "meisje"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "blondje"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "Automagisch"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Eerste sector van boot-partitie"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Eerste sector van station (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "LILO/grub-installatie"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "SILO Installatie"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Waar wenst u de bootloader te installeren?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "LILO/grub-installatie"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Geen"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Welke bootloader wenst u te gebruiken?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Bootloader installatie"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Boot-apparaat"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (werkt niet met oude BIOS'en)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Compact"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "compact"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Pauze voor het booten van standaard-image"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Video-modus"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Pauze voor het booten van standaard-image"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Wachtwoord (nogmaals)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Commandoregel-opties beperken"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "beperken"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Bootloader algemene opties"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "De optie ``Commandoregel-opties beperken'' heeft geen nut zonder wachtwoord"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Gelieve opnieuw te proberen"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "De wachtwoorden kloppen niet"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -528,167 +574,340 @@ msgstr ""
 "Hier zijn de ingangen voor LILO.\n"
 "U kan er bijvoegen of de bestaande wijzigen."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Toevoegen"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Klaar"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Welk type ingang wenst u toe te voegen?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Ander OS (SunOs...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Ander OS (Windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Welk type ingang wenst u toe te voegen?"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Beeld"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Toevoegen"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Lezen/schrijven"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Tabel"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Onveilig"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Naam"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Standaard"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Ingang verwijderen"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Lege naam is niet toegelaten"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Deze naam wordt al gebruikt"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "%s %s interfaces gevonden"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Heeft u er nog ��n?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Heeft u een %s interface?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Nee"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Ja"
+
+#: ../../any.pm_.c:505
+msgid "See hardware info"
+msgstr "Zie hardware-info"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Bezig met installeren van stuurprogramma voor %s kaart %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(module %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Welk %s stuurprogramma moet ik proberen?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"In sommige gevallen heeft het stuurprogramma van %s extra informatie nodig\n"
+"om juist te werken, alhoewel het meestal ook zonder goed werkt. Wil u\n"
+"extra opties invoeren of laat u liever het stuurprogramma zijn informatie\n"
+"zelf zoeken? Soms zal de automatische detectie de computer laten hangen,\n"
+"maar het zou geen schade mogen veroorzaken."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Automatisch Detecteren"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Geef opties"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "U mag nu de opties ingeven voor module %s."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"U mag nu de opties voor module %s ingeven.\n"
+"Opties staan in het formaat ``naam=waarde naam2=waarde2 ...''.\n"
+"Bijvoorbeeld, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Module-opties:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Het laden van module %s is niet gelukt.\n"
+"Wenst u opnieuw te proberen met andere parameters?"
+
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Welkom bij %s - Kies uw besturingssysteem!\n"
+"\n"
+"Om de mogelijke keuzes te tonen, druk <TAB>.\n"
+"\n"
+"Om een keuze te laden, voer de naam in en druk <ENTER>\n"
+"of wacht %d seconden voor de standaard-bootkeuze.\n"
+
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Welkom bij GRUB - Kies uw besturingssysteem!"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "Gebruik de %c en %c-toetsen om te aangeduide ingang te selecteren."
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Druk Enter om het geselecteerde besturingssysteem te booten, druk 'e'"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr " om de ingang eerst te bewerken, of 'c' voor een command-line."
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr ""
+"De aangeduide ingang zal automatisch gestart worden binnen %d seconden."
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr "niet genoeg ruimte in /boot"
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Desktop"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Start Menu"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d minuten"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 minuut"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d seconden"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Cre�er"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Ontkoppelen"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Formatteren"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Grootte aanpassen"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Type"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Koppelpunt"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "/etc/fstab schrijven"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Normaal > Expert"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Expert > Normaal"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Herstellen vanuit bestand"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Schrijven naar bestand"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "Wizard"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Herstellen van floppy"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Schrijven naar floppy"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Opnieuw beginnen"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Alles formatteren"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Automatisch toewijzen"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Alle primaire partities zijn al toegewezen"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Ik kan geen partitie meer toevoegen"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -696,59 +915,63 @@ msgstr ""
 "Om meer partities te kunnen maken, zal u er een moeten verwijderen. Dan kan\n"
 "er een uitgebreide (extended) partitie worden bijgemaakt"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Partitietabel redden"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Partitietabel schrijven"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Herladen"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Leeg"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
-msgstr ""
+msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Ander type"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Leeg"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Ander type"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Bestandssysteem types:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Details"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -760,17 +983,17 @@ msgstr ""
 "Ik stel voor dat u eerst die partitie verkleint\n"
 "(klik erop, en klik daarna op \"Grootte Aanpassen\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Gelieve eerst een veiligheidskopie van uw gegevens te maken"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Lees aandachtig!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -780,77 +1003,77 @@ msgstr ""
 "(2048 sectoren is genoeg)\n"
 "aan het begin van de schijf"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Voorzichtig: deze operatie is gevaarlijk."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Fout"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Koppelpunt: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Apparaat: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS schijfletter: %s (dit is slechts een gok)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Type: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Start: sector %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Grootte: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sectoren"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Cylinder %d tot cylinder %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Geformatteerd\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Niet geformatteerd\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Gekoppeld\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Loopback-bestand(en): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -858,79 +1081,79 @@ msgstr ""
 "Bij verstek te starten partitie\n"
 "    (om MS-DOS te booten, niet voor lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Niveau %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Chunk-grootte %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-schijven %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Loopback bestandsnaam: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Gelieve op een nieuwe partitie te klikken"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Grootte: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometrie: %s cylinders, %s koppen, %s sectoren\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Partitietabel-type: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "op bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Koppeling"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Actief"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Toevoegen aan RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Verwijderen uit RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "RAID aanpassen"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Voor Loopback gebruiken"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Kies een actie"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -938,13 +1161,13 @@ msgid ""
 "need /boot"
 msgstr ""
 "Sorry, het is zinloos om /boot zo ver achteraan de schijf te plaatsen (op "
-"een \n"
+"een\n"
 "cylinder > 1024).\n"
 "Ofwel gebruikt u LILO en zal het niet werken, of u gebruikt LILO niet en u "
 "heeft\n"
 "/boot niet nodig."
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -958,26 +1181,26 @@ msgstr ""
 "een\n"
 "/boot partitie toevoegt aan het begin van de schijf"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "U heeft een software RAID partitie als root (/) geselecteerd.\n"
 "Geen bootloader kan dit aan zonder een /boot partitie, dus wees er zeker\n"
-"van ook een /boot-partitie toe te voegen als u lilo of grub gebruikt."
+"van ook een /boot-partitie toe te voegen."
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Gebruik ``%s'' in de plaats"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Gebruik eerst ``Ontkoppelen''"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -985,41 +1208,41 @@ msgstr ""
 "Na het veranderen van het type van partiei %s, zullen alle gegevens op deze "
 "partitie verloren gaan"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Toch doorgaan?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Verlaten zonder opslaan"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Verlaten zonder de partitietabel op te slaan?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Verander partitietype"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Welk partitietype wenst u?"
+#: ../../diskdrake.pm_.c:471
+msgid "Which filesystem do you want?"
+msgstr "Welk bestandssysteem wenst u?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr ""
+msgstr "U kan ReiserFS niet gebruiken op een partitie kleiner dan 32MB"
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Waar wenst u dit loopback-apparaat %s aan te koppelen?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Waaraan wenst u dit apparaat %s te koppelen?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1027,144 +1250,148 @@ msgstr ""
 "Kan een aankoppelpunt niet verzetten omdat deze partitie gebruikt wordt als\n"
 "loopback. Verwijder de loopback eerst."
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "Na het formatteren van partiei %s, zullen alle gegevens op deze partitie "
 "verloren gaan"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Bezig met formatteren"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Bezig met formatteren van loopback %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Bezig met formatteren van partitie %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Nadat alle partities geformatteerd zijn,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "zullen alle gegevens op deze partities verloren zijn gegaan."
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Verplaatsen"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Naar welke schijf wenst u te verplaatsen?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sector"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Naar welke sector wenst u te verplaatsen?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Aan het verplaatsen"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Partitie aan het verplaatsen..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Partitietabel van schijf %s wordt weggeschreven!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "U zal moeten herstarten voordat de aanpassing van kracht wordt"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Bezig met berekenen van FAT bestandssysteemgrenzen"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Bezig met de grootte aan te passen"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+msgid "This partition is not resizeable"
+msgstr "Deze partitie is niet in grootte aanpasbaar"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr ""
 "Er zou een reservekopie moeten gemaakt worden van alle gegevens op deze "
 "partitie."
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "Na het veranderen van de grootte van partitie %s, zullen alle gegevens op "
 "deze partitie verloren gaan"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Kies de nieuwe grootte"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Nieuwe partitie cre�ren"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Start sector: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Grootte in MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Bestandssysteem-type: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Voorkeur: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Deze partitie kan niet gebruikt worden voor loopback"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Loopback-bestandsnaam: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "Loopback-bestand is al in gebruik, gelieve een ander te kiezen"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "Het bestand bestaat al. Wenst u het te gebruiken?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1172,11 +1399,11 @@ msgstr ""
 "De backup partitietabel heeft niet dezelfde grootte\n"
 "Toch verdergaan?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1184,77 +1411,78 @@ msgstr ""
 "Plaats een floppy in het station.\n"
 "Alle gegevens op deze floppy zullen verloren gaan"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Proberen om partitietabel veilig te stellen"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "Apparaat"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "niveau"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "chunk-grootte"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Kies een bestaande RAID om aan toe te voegen"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "nieuw"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formatteren van %s mislukt"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Ik weet niet hoe %s in type %s te formatteren"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "NFS koppeling mislukt"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "koppeling mislukt: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "fout bij ontkoppelen %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Koppelpunten moeten beginnen met een /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Er is al een partitie met als aankoppelpunt %s\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Circulaire mounts: %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr "Deze map zou binnen het root bestandssysteem moeten blijven"
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
+"U heeft een goed bestandssysteem (ext2, reiserfs) voor dit mount punt\n"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Fout bij het openen van %s voor schrijfbewerking: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1264,75 +1492,110 @@ msgstr ""
 "nieuwe bestandssystemen konden worden gecre�erd. Gelieve uw hardware na te\n"
 "kijken voor de oorzaak van dit probleem."
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "U heeft helemaal geen partities!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
-msgstr "Kies de gewenste taal voor installatie en systeemgebruik."
+#: ../../help.pm_.c:9
+msgid ""
+"Please choose your preferred language for installation and system usage."
+msgstr "Kies uw gewenste taal voor installatie en systeemgebruik."
+
+# ############
+#: ../../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:10
+#: ../../help.pm_.c:22
 msgid "Choose the layout corresponding to your keyboard from the list above"
 msgstr "Kies uw toetsenbordlayout uit de bovenstaande lijst"
 
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:25
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"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 ""
+"Als u andere talen (dan degene die u kiest bij het begin\n"
+"van de installatie) beschikbaar wilt hebben na de installatie, kiest u deze\n"
+"a.u.b. in bovenstaande lijst. Als u alle talen wilt selecteren, kiest u \n"
+"gewoon \"Alles\"."
+
+#: ../../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"
-"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).\n"
 "\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
-"  - 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"
+"\t* Recommanded: 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"
-"  - 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"
+"\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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 ""
 "Kies \"Installeren\" als er geen vorige versies van Linux ge�nstalleerd\n"
 "zijn, of als u meerdere distributies of versies wenst te gebruiken.\n"
 "\n"
-"Kies \"Upgrade\" als u een vorige versie van Mandrake Linux wenst te\n"
-"upgraden: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000 of 7.0 (Air).\n"
+"\n"
+"Kies \"Upgrade\" als u een vorige versie van Mandrake Linux wenst te "
+"upgraden\n"
+"\n"
 "\n"
 "Selecteer:\n"
 "\n"
-"  - Automatisch (aanbevolen): Als u Linux nog nooit ge�nstalleerd hebt.\n"
-"    NOOT: het netwerk zal niet geconfigureerd worden tijdens de "
-"installatie,\n"
-"    gebruik hiervoor \"LinuxConf\" wanneer de installatie afgelopen is.\n"
+"  - Aanbevolen: Als u Linux nog nooit ge�nstalleerd hebt.\n"
+"\n"
+"\n"
+"  - Aangepast: Als u bekend bent met Linux. U zal voor het gebruik van het\n"
+"systeem kunnen kiezen tussen normaal, ontwikkeling of server. Kies\n"
+"\"Normaal\" voor een algemene installatie van uw computer. U kan\n"
+"\"Ontwikkeling\" kiezen als u de computer voornamelijk zal gebruiken voor\n"
+"software-ontwikkeling, of \"Server\" als u een server wenst te installeren\n"
+"(voor post, afdrukken...).\n"
 "\n"
-"  - Aangepast: Als u bekend bent met GNU/Linux. U zal het gebruik van het\n"
-"    systeem kunnen kiezen. Zie lager voor details.\n"
 "\n"
 "  - Expert: Als u zich vlot een weg baant in GNU/Linux en een volledig aan\n"
-"    uw wensen aangepase installatie, is deze installatieklasse iets voor u.\n"
-"    Het zal volledig mogelijk zijn het gebruik van uw systeem te "
-"installeren,\n"
-"    zoals bij \"Aangepast\".\n"
-"    Maar let op, alsjeblief, KIES DIT NIET TENZIJ U COMPLEET WEET WAT U "
-"DOET!\n"
+"uw wensen aangepase installatie, is deze installatieklasse iets voor u.\n"
+"Het zal volledig mogelijk zijn het gebruik van uw systeem te installeren,\n"
+"zoals bij \"Aangepast\"."
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1340,51 +1603,49 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Selecteer:\n"
 "\n"
 "  - Aangepast: Als u bekend bent met Linux. U zal het gebruik van het\n"
 "systeem kunnen kiezen. Zie lager voor details.\n"
 "\n"
+"\n"
 "  - Expert: Als u zich vlot een weg baant in GNU/Linux en een volledig aan\n"
 "    uw wensen aangepase installatie, is deze installatieklasse iets voor u.\n"
 "    Het zal volledig mogelijk zijn het gebruik van uw systeem te "
 "installeren,\n"
 "    zoals bij \"Aangepast\".\n"
-"    Maar let op, alsjeblief, KIES DIT NIET TENZIJ U COMPLEET WEET WAT U "
-"DOET!\n"
+"    Maar let op, alsjeblief, KIES DIT NIET TENZIJ U COMPLEET WEET WAT U DOET!"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "De verschillende keuzes voor het gebruik van uw machine (tenminste, wanneer "
 "u\n"
@@ -1392,185 +1653,370 @@ msgstr ""
 "volgende:\n"
 "\n"
 "  - Normaal: kies dit als u uw machine hoofdzakelijk zal gebruiken voor\n"
-"    dagelijke gebruik (kantoorwerk, beeldbewerking, enz). Er zal geen "
-"enkele\n"
-"    compiler, ontwikkelings-tool, etc. geinstalleerd worden.\n"
-"\n"
-"  - Ontwikkeling: zoals de naam zelf het zegt. Kies dit als u uw machine "
-"voor\n"
-"    software-ontwikkeling wenst te gebruiken. U zal dan een complete "
-"collectie\n"
-"    software geinstalleerd hebben om de compilen, te debuggen, broncode op "
-"te\n"
-"    maken, of softwarepakketten aan te maken.\n"
+"    dagelijke gebruik (kantoorwerk, beeldbewerking, enz). Er zal geen\n"
+"     enkele compiler, ontwikkelings-tool, etc. geinstalleerd worden.\n"
+"\n"
+"  - Ontwikkeling: zoals de naam zelf het zegt. Kies dit als u uw machine\n"
+"    voor software-ontwikkeling wenst te gebruiken. U zal dan een complete\n"
+"    collectie software geinstalleerd hebben om de compilen, te debuggen,\n"
+"    broncode op te maken, of softwarepakketten aan te maken.\n"
 "\n"
 "  - Server: kies dit als deze machine gebruikt zal worden als server (ofwel\n"
 "    een bestandsserver (NFS of SMB), een print server (Unix' lp (Line "
 "Printer)\n"
 "    protocol, of Windows-style SMB-printers, een authenticatieserver (NIS),\n"
 "    een database server, enzovoorts...\n"
-"    Hier zal dan ook geen enkele gimmick (KDE, GNOME, ...) geinstalleerd "
-"worden.\n"
+"    Hier zal dan ook geen enkele gimmick (KDE, GNOME, ...) geinstalleerd\n"
+"    worden."
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 zal eerst proberen ��n of meerdere PCI SCSI adapters\n"
-"te vinden. Als er een gevonden wordt en er stuurprogramma's beschikbaar "
-"zijn,zullen deze automatisch gebruikt worden.\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"
+"\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"
-"Als uw SCSI adapter een ISA-kaart is, of een PCI-kaart die DrakX niet\n"
-"kent of geen stuurprogramma's voor heeft, of als u helemaal geen SCSI-\n"
-"adapter heeft, zal u gevraagd worden of u er ��n heeft of niet. Als u er\n"
-"geen heeft, antwoord dan \"Nee\". Als u er wel ��n (of meer) heeft,\n"
-"antwoord dan \"Ja\". Een lijst van stuurprogramma's zal dan verschijnen,\n"
-"waaruit u er een zal moeten kiezen.\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"
-"Nadat u het stuurprogramma heeft geselecteerd, zal DrakX u vragen of u\n"
-"er opties voor wenst op te geven. Laat de driver eerst de hardware zelf\n"
-"zoeken, dit werkt meestal perfect.\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"
-"Als dit niet het geval is, vergeet dan de informatie niet die u uit de\n"
-"documentatie kan halen of uit Windows (als u dit op uw systeem heeft ge-\n"
-"installeerd heeft), zoals voorgesteld in de installatiehandleiding. Dit\n"
-"zijn de opties die u aan het stuurprogramma moet meegeven."
+"\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 ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:160
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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"
 "\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 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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+"   * Done: when you have finished partitioning your hard drive, use this "
+"option to save your changes.\n"
 "\n"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\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"
 msgstr ""
-"Nu kunt u kiezen welke partitie(s) gebruikt moeten worden om uw Linux-\n"
-"Mandrake-systeem te installeren, als ze reeds gedefinieerd zijn (van een\n"
-"vorige Linux-installatie of een ander partitie-gereedschap). In andere\n"
-"gevallen, moeten harde schijf-partities gedefinieerd worden. Deze operatie\n"
-"bestaat uit het verdelen van de harde schijf in aparte delen.\n"
+
+#: ../../help.pm_.c:218
+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"
-"Als u nieuwe partities moet cre�ren, gebruik \"Automatisch toewijzen\" om "
-"automatisch partities voor Linux aan te maken. U kan de schijf voor "
-"partitieselecteren door op \"hda\" te klikken voor de eerste IDE-schijf,\n"
-"\"hdb\" voor de tweede, of \"sda\" voor de eerste SCSI-schijf en zo voort.\n"
+"For information, each partition is listed as follows: \"Name\", "
+"\"Capacity\".\n"
 "\n"
 "\n"
-"Twee veel voorkomende partities zijn: de root-partitie (/), die het start-\n"
-"punt is van het bestandssysteem en de directory-hi�rarchie, en /boot, dit\n"
-"bevat de bestanden die nodig zijn om het besturingssysteem te starten als\n"
-"de computer aangezet wordt.\n"
+"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
 "\n"
-"Omdat de effecten van dit proces meestal onomkeerbaar zijn, kan partities\n"
-"aanleggen indrukwekkend en ontmoedigend zijn voor de onervaren gebruiker.\n"
-"DiskDrake maakt dit proces simpeler zodat dit niet nodig is. Consulteer de\n"
-"documentatie en neem uw tijd voor u doorgaat.\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"
-"U kan elke optie ook gebruiken via het toetsenbord: navigeer door de "
-"partities\n"
-"door middel van Tab en de boven- en beneden-pijltjes. Wanneer een partitie "
-"is\n"
-"geselecteerd, kan u het volgende gebruiken\n"
 "\n"
-"- Ctrl-c  om een nieuwe partitie te maken (wanneer een lege partitie is "
-"geselecteerd)\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"
-"- Ctrl-d  om een partitie te verwijderen\n"
+"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"- Ctrl-m  om het aankoppelpunt in te stellen\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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:252
 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."
+"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 ""
-"Alle nieuw-gedefini�erde partities moeten geformatteerd worden voor ze\n"
-"kunnen gebruikt worden (formatteren betekent een bestandssysteem aanmaken.\n"
-"Op dit moment wil u misschien enkele bestaande partities herformatteren om\n"
-"de gegevens die erop staan te wissen. Noot: het is niet nodig om bestaande\n"
-"partities te herformatteren, zeker niet als ze bestanden bevatten of\n"
-"gegevens die u wenst te behouden.\n"
-"Meestal bijgehouden zijn /home en /usr/local."
+"Kies de harde schijf die u wilt wissen om uw nieuwe\n"
+"Linux-Mandrake partitie op te installeren. Ben voorzichtig, alle data die\n"
+"op deze schijf staat zal verloren gaan, en niet terug te halen zijn."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:257
+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 ""
+
+#: ../../help.pm_.c:267
+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 ""
+
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr "Even geduld a.u.b. Deze operatie kan enkele minuten duren."
+
+#: ../../help.pm_.c:303
+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 ""
+
+#: ../../help.pm_.c:329
 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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 nu de groepen pakketten selecteren die u wenst te installeren of\n"
 "te upgraden.\n"
 "\n"
+"\n"
 "DrakX zal dan controleren of u genoeg ruimte heeft om ze allemaal te "
 "installeren.\n"
 "Als dit niet zo is, zal u een waarschuwing krijgen. Als u toch wil "
@@ -1580,140 +2026,169 @@ msgstr ""
 "Onderaan de lijst kan u de optie \"Individuele pakketselectie\" selecteren,\n"
 "dan moet u door meer dan 1000 pakketten navigeren..."
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
-"Als u alle CDs in de lijst hierboven heeft, klik dan Ok.\n"
-"Als u geen enkele van die CDs heeft, klik dan Annuleren.\n"
-"Als maar enkele CDs zoek zijn, deselecteer ze dan, en klik Ok."
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:358
 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."
+"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 ""
-"De geselecteerde pakketten worden nu ge�nstalleerd. Dit zal enkele\n"
-"minuten duren, tenzij u een upgrade van een bestaand systeem heeft\n"
-"gekozen. In dat geval kan het nog meer tijd nemen voordat de upgrade\n"
-"van start gaat."
+"Als u alle CDs in de lijst hierboven heeft, klik dan Ok. Als u geen\n"
+"enkele van die CDs heeft, klik dan Annuleren. Als maar enkele CDs zoek\n"
+"zijn, deselecteer ze dan, en klik Ok."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:363
 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"
-"\n"
+"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"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
 "\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"Please be patient."
 msgstr ""
-"Als DrakX uw muis niet kan vinden, of als u wil controleren\n"
-"wat DrakX gedaan heeft, zal bovenstaande lijst met muizen getoond worden.\n"
-"\n"
-"\n"
-"Als u het eens bent met de instellingen van DrakX, spring dan gewoon\n"
-"naar de sectie die u wenst door erop te klikken in het linkermenu.\n"
-"Anders kiest u in het menu een muistype dat het dichtst bij uw muis\n"
-"ligt.\n"
+"Uw nieuwe Linux-Mandrake OS wordt nu ge�nstalleerd. Deze\n"
+"operatie zou enkele minuten in beslag moeten nemen (afhankelijk van de "
+"grootte\n"
+"van de installatie en de snelheid van uw computer).\n"
 "\n"
 "\n"
-"In het geval van een seri�le muis, zal u DrakX ook moeten vertellen\n"
-"met welke seri�le poort de muis verbonden is."
+"Even geduld a.u.b."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:371
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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 ""
-"Gelieve de correcte poort te kiezen. COM1 under MS Windows wordt "
+"U kunt nu uw muis testen. Gebruik de knoppen en het wiel om\n"
+"te controleren of de instellingen correct zijn. Als dit niet zo is, kunt u\n"
+"op \"Annuleren\" klikken om een andere driver te kiezen."
+
+#: ../../help.pm_.c:376
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
+msgstr ""
+"Gelieve de correcte poort te kiezen. COM1 onder MS Windows wordt "
 "bijvoorbeeld\n"
 "ttyS0 genoemd under Linux."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
-"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"
+"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 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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"Deze sectie helpt u bij het configureren van een lokaal netwerk (LAN) of\n"
-"een modem\n"
-"\n"
-"Kies \"Lokaal LAN\" en DrakX zal proberen een Ethernet adapter te vinden\n"
-"op uw machine. PCI zou moeten gevonden en automatisch geinitialiseerd "
-"worden.\n"
-"Maar, als u een ISA-kaart gebruikt, zal de automatische detectie niet "
-"werken,\n"
-"en zal u een stuurprogramma uit de lijst moeten kiezen.\n"
-"\n"
-"\n"
-"Voor SCSI-adapters, kan u het stuurprogramma laten testen om de adapter te\n"
-"vinden, anders zal u zelf de opties voor het stuurprogramma moeten ingeven\n"
-"die u dan uit de documentatie van de hardware heeft gehaald.\n"
+
+#: ../../help.pm_.c:393
+msgid ""
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
 "\n"
-"Als u een Linux-Mandrake-Systeem installeert op een machine die reeds deel\n"
-"uitmaakt van een bestaand netwerk, zal de netwerkbeheerder u reeds alle\n"
-"nodige informatie (IP-adres, netwerk-submasker of afgekort netmasker, en\n"
-"hostnaam) gegeven hebben. Als u een privaat netwerk opstelt, zal u de\n"
-"adressen zelf kunnen kiezen.\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+"Er is geen modem gevonden. Kiest u a.u.b. de serie�le poort waarop het "
+"modem/naangesloten is.\n"
 "\n"
 "\n"
-"Kies \"Inbellen met modem\" en de internetverbinding zal voor het gebruik\n"
-"van een modem geconfigureerd worden. DrakX zal proberen uw modem te vinden.\n"
-"Als dit niet lukt, kan u de juiste seri�le poort aanduiden waarmee uw\n"
-"modem verbonden is."
+"Ter informatie: de eerste serie�le poort (genaamd \"COM1\" onder MS "
+"Windows)\n"
+"heet \"ttysS0\" onder Linux."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:400
 msgid ""
-"Enter:\n"
-"\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
-"\n"
+"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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+"Als uw modem een extern modem is, zet deze dan u aan om DrakX deze "
+"automatischte laten detecteren."
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr "Zet a.u.b. uw modem aan en kies de juiste."
+
+#: ../../help.pm_.c:413
+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:420
+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 nu de inbel-opties ingeven. Als u niet zeker bent wat u hier moet\n"
+"invoeren, kan u de correcte informatie aanvragen bij uw ISP."
+
+#: ../../help.pm_.c:425
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
 "Hier dient u het volgende in te voeren:\n"
 "\n"
@@ -1726,10 +2201,27 @@ msgstr ""
 "\n"
 "  - Automatisch IP: Als uw netwerk BootP of DHCP gebruikt, selecteer\n"
 "dan deze optie. Als dit geselecteerd is, is er geen invoer nodig in het\n"
-"veld \"IP-adres\". Als u niet zeker bent, vraag het aan uw "
-"netwerkbeheerder.\n"
+"veld \"IP-adres\". Als u niet zeker bent, vraag het aan uw netwerkbeheerder."
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+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 ""
+"Als uw netwerk NIS gebruikt, selecteer dan \"NIS Gebruiken\". Als u het "
+"niet\n"
+"zeker weet, vraag het dan aan uw netwerkbeheerder."
+
+#: ../../help.pm_.c:441
+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 ""
+"U kunt nu uw host naam ingeven. Als u deze niet kent,\n"
+"of als u niet weet wat u moet invoeren, laat u dit\n"
+"veld leeg"
+
+#: ../../help.pm_.c:445
 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."
@@ -1737,7 +2229,7 @@ msgstr ""
 "U kan nu de inbel-opties ingeven. Als u niet zeker bent wat u hier moet\n"
 "invoeren, kan u de correcte informatie aanvragen bij uw ISP."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1746,13 +2238,14 @@ msgstr ""
 "u proxies zal gebruiken, kan u dit best vragen aan uw netwerkbeheerder of "
 "aan uw ISP."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
 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 ""
@@ -1760,118 +2253,237 @@ msgstr ""
 "correct ingesteld is. Eerst kiest u een \"mirror\" waar u de pakketten\n"
 "wenst te downloaden en daarna selecteert u de pakketten om te installeren.\n"
 "\n"
-"Noot: U moet de \"mirror\" en de pakketten selecteren naargelang uw\n"
+"Opmerking: U moet de \"mirror\" en de pakketten selecteren naargelang uw\n"
 "plaatselijke wetgeving."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr "U kunt nu uw tijdzone selecteren van de plaats waar u woont."
+
+#: ../../help.pm_.c:465
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
-"U kan nu uw tijdszone selecteren, afhankelijk van waar u woont.\n"
-"\n"
-"\n"
 "Linux beheert de tijd in GMT of \"Greenwich Mean Time\" en vertaalt deze "
 "dan\n"
-"in locale tijd, afhankelijk van de tijdszone die u geselecteerd hebt."
+"in locale tijd, afhankelijk van de tijdszone die u geselecteerd hebt.\n"
+"Als u Microsoft Windows op uw computer gebruikt, kiest u \"Nee\"."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 nu kiezen welke diensten u wil gestart hebben bij het opstarten.\n"
 "Wanneer u uw muis over een item navigeert, zal een klein ballonhulpje\n"
 "tevoorschijn komen dat de rol van de dienst beschrijft.\n"
 "\n"
+"\n"
 "Wees vooral voorzichtig in deze stap als u uw machine als een server wil\n"
-"gebriuken: u zal waarschijnlijk de diensten die u niet nodig heeft niet "
+"gebruiken: u zal waarschijnlijk de diensten die u niet nodig heeft niet "
 "willen\n"
 "starten."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
+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 ""
+"U kunt een locale printer (aangesloten op uw computer) of een netwerk\n"
+"printer (aan te sturen via een Unix, Netware of MS Windows netwerk)\n"
+"configureren."
+
+#: ../../help.pm_.c:490
 msgid ""
-"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"
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"Linux kan overweg met vele typen printers. Elke van deze printers\n"
-"heeft een aparte configuratie nodig. Merk welk op dat de printspooler\n"
-"'lp' gebruikt als standaardprinternaam; u moet dus een printer met die\n"
-"naam; maar u kan een printer meerdere namen geven, gescheiden door '|' "
-"tekens.\n"
-"Dus, als u liever een meer betekenisvolle naam geeft, zet hem dan eerst\n"
-"bijvoorbeeld: \"Mijn Printer|lp\".\n"
-"De printer die \"lp\" in zijn naam (namen) heeft zal de standaardprinter "
-"zijn.\n"
+"Als u in staat wilt zijn te kunnen printen, kiest u a.u.b. een printsysteem\n"
+"tussen CUPS en LPR.\n"
+"\n"
+"\n"
+"CUPS is een nieuw, krachtig en flexibel printsysteem voor Unix systemen "
+"(CUPS\n"
+"betekent \"Common Unix Printing System\"). Het is het standaard printsysteem "
+"in\n"
+"Linux-Mandrake.\n"
+"\n"
+"\n"
+"LPR is het oude printsysteem dat gebruikt wordt in vroegere Linux-Mandrake "
+"distributies.\n"
+"\n"
+"\n"
+"Als u geen printer heeft, klikt u op \"Geen\"."
+
+#: ../../help.pm_.c:505
+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"
-"Als uw printer rechtstreeks verbonden is met uw computer, kies dan\n"
-"\"Lokale Printer\". U zal dan moeten invoeren met welke poort uw\n"
-"printer verbonden is, en de gepaste filter selecteren.\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 ""
+
+#: ../../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"
+"\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 ""
+
+#: ../../help.pm_.c:542
+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:567
+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 ""
+"Uw printer werd niet gedetecteerd. Voer a.u.b. de naam in van het apparaat\n"
+"waar het op is aangesloten.\n"
+"\n"
+"\n"
+"Ter informatie, de meeste printers zijn op de eerste paralelle poort\n"
+"aangesloten.\n"
+"Deze heet onder Linux \"/ev/lp0\" en \"LPT1\" onder MS Windows."
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr "U moet nu uw printer in bovenstaande lijst selecteren."
+
+#: ../../help.pm_.c:578
+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"
-"Als u een printer wil gebruiken bij een Unix-machine op afstand,\n"
-"zal u \"lpd op afstand\" moeten selecteren. Om dit te laten werken\n"
-"is er geen gebruikersnaam of wachtwoord nodig, maar u zal wel de naam\n"
-"van de printerwachtrij op de server moeten kennen.\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 ""
+"Selecteer a.u.b. de juiste opties die overeenkomen met uw printer.\n"
+"Kijkt u a.u.b. in de documentatie als u niet weet wat u hier moet kiezen.\n"
 "\n"
 "\n"
-"Als u een SMB-printer wil gebruiken (een printer op een Windows 9x/NT "
-"machine op afstand), zal u de SMB-naam nodig hebben (niet de TCP/IP-naam)\n"
-"en mogelijk het IP-adres van de server, alsook de gebruikersnaam,\n"
-"werkgroep, en wachtwoord om toegang tot de printer te verkrijgen.\n"
-"Hetzelfde geldt voor een NetWare printer, behalve dat u geen werkgroep-\n"
-"informatie nodig heeft."
+"U zult in de volgende stap de configuratie kunnen testen en deze aanpassen\n"
+"als het niet werkt zoals u dit wilt."
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:585
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"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 nu het root-wachtwoord ingeven voor uw Linux-Mandrake-systeem.\n"
 "Het wachtwoord moet twee maal ingevoerd worden om te verifi�ren dat\n"
@@ -1887,7 +2499,7 @@ msgstr ""
 "Het mag *nooit* neergeschreven worden. Maak het wachtwoord echter ook niet\n"
 "te moeilijk, u moet het kunnen onthouden zonder veel moeite."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1895,7 +2507,7 @@ msgstr ""
 "Om een veiliger systeem in te stellen, selecteert u best \"Schaduw-bestand "
 "gebruiken\" en \"MD5-wachtwoorden gebruiken\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1904,7 +2516,7 @@ msgstr ""
 "niet\n"
 "zeker weet, vraag het dan aan uw netwerkbeheerder."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1944,22 +2556,20 @@ msgstr ""
 "Daarom moet u steeds verbinden met de gebruikersaccount die u hier hebt\n"
 "aangemaakt, en enkel als root inloggen voor administratie en onderhoud."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Het is sterk aanbevolen dat u hier \"Ja\" antwoordt. Als u Microsoft\n"
-"Windows later installeert zal het de bootsector overschrijven.\n"
-"Tenzij u een bootdiskette heeft aangemaakt zoals voorgesteld, zal u het\n"
-"Linux-systeem niet meer kunnen opstarten."
+"Een opstart diskette wordt sterkt aanbevolen. Als u uw\n"
+"computer niet kunt opstarten, is dit de enige manier om de computer te\n"
+"`redden' zonder Linux opnieuw te hoeven installeren."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
@@ -1972,7 +2582,7 @@ msgstr ""
 "Tenzij u precies weet wat u wenst te doen, kiest u \"Eerste sector van\n"
 "station (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1981,10 +2591,10 @@ msgstr ""
 "(de master-drive op het eerste IDE-kanaal) of \"/dev/sda\" (eerste SCSI "
 "schijf)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -2006,7 +2616,7 @@ msgstr ""
 "dan kan u de overeenkomstige ingangen verwijderen. Maar, in dit geval,\n"
 "zal u wel een bootdisk nodig hebben om ze nog te kunnen opstarten!"
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -2023,7 +2633,9 @@ msgid ""
 "\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."
 msgstr ""
 "LILO en grub hoofdopties zijn:\n"
@@ -2045,10 +2657,68 @@ msgstr ""
 "    * normal: selecteerd normale 80x25 tekstmodus\n"
 "    * <nummer>: gebruikt de overeenkomstige tekstmodus."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 (de LInux LOader) en Grub zijn bootloaders: ze kunnen Linux of eender\n"
+"welk ander besturingssysteem opstarten op uw computer.\n"
+"Normaalgezien worden deze besturingssystemen correct gedetecteerd en\n"
+"geinstalleerd. Als dit niet het geval is, kan u handmatig een ingang "
+"toevoegen\n"
+"op dit scherm. Wees voorzichtig bij het kiezen van de juiste opties.\n"
+"\n"
+"\n"
+"U wil ook misschien niet iedereen toegang geven tot die besturingssystemen,\n"
+"dan kan u de overeenkomstige ingangen verwijderen. Maar, in dit geval,\n"
+"zal u wel een bootdisk nodig hebben om ze nog te kunnen opstarten!"
+
+#: ../../help.pm_.c:692
+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 ""
+"LILO en grub hoofdopties zijn:\n"
+"  - Boot device: Selecteert de naam van het apparaat (= harde schijf-\n"
+"partitie) die de bootsector bevat. Tenzij u specifiek iets anders nodig\n"
+"heeft, kies \"/dev/hda\".\n"
+"\n"
+"\n"
+"  - Wachttijd voor het booten van standaard-image: Geeft het nummer in \n"
+"tienden van een seconde voor de bootloader het standaard-image opstart.\n"
+"Dit is handig op systemsn die rechtstreeks van de harde schijf starten \n"
+"na het inschakelen van het keyboard. De bootloader wacht niet als \"delay\"\n"
+"niet aanwezig is of op 0 gezet is.\n"
+"\n"
+"\n"
+"  - Videomodus: Dit geeft de VGA tekstmodus aan die geselecteerd moet "
+"worden\n"
+"bij het booten. De volgende waarden zijn mogelijk:\n"
+"    * normal: selecteerd normale 80x25 tekstmodus\n"
+"    * <nummer>: gebruikt de overeenkomstige tekstmodus."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2072,7 +2742,7 @@ msgstr ""
 "u het ermee eens bent. Als dit niet het geval is, kan u altijd terugkomen\n"
 "om deze instellingen aan te passen, zoveel keer als u wenst."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2080,7 +2750,7 @@ msgstr ""
 "Als er iets verkeerd zit in de X-configuratie, gebruik dan deze opties om\n"
 "het X-Window Systeem correct te configureren."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2088,42 +2758,46 @@ msgstr ""
 "Als u liefst een grafische inlogprocedure heeft, kies dan \"Ja\". Anders\n"
 "kiest u \"Nee\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"\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"
+"\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"
+"\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"
+"\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."
 msgstr ""
 "U kan nu enkele andere opties voor uw systeem kiezen.\n"
 "\n"
@@ -2173,7 +2847,7 @@ msgstr ""
 "    na het opstarten, kies dan deze optie (Noot: Num Lock zal misschien nog\n"
 "    steeds niet werken onder X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2187,96 +2861,115 @@ msgstr ""
 "Als u wil starten met een ander bestaand besturingssysteem, gelieve dan de\n"
 "bijkomende instructies te lezen."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Kies uw taal"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Installatieklasse selecteren"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Harde schijf-detectie"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Muis configureren"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Toetsenbord kiezen"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Overige"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Bestandssystemen instellen"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Partities formatteren"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Te installeren pakketten kiezen"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Systeem installeren"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Netwerk-configuratie"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Cryptografie"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Tijdszone configureren"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Diensten configureren"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Printer configureren"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Root-wachtwoord instellen"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Gebruiker toevoegen"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Boot-diskette aanmaken"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Boot-loader installeren"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "X Configureren"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Auto-installatiediskette"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Installatie afsluiten"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Fout bij het lezen van bestand $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "Test uw muis a.u.b."
+
+#: ../../install_gtk.pm_.c:427
+msgid "To activate the mouse,"
+msgstr "Welk type muis heeft u?"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr "BEWEEG UW WIELTJE"
+
+#: ../../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 ""
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2286,230 +2979,251 @@ msgstr ""
 "Hiervoor dient u een partitie aan te maken (of op een bestaande partitie "
 "teklikken). Daarna kiest u de actie ``Koppelpunt'' en stelt u dit i nop `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Ik kan uw partitietabel niet lezen, ze is te corrupt voor mij :-(\n"
-"Ik zal proberen door te gaan en de slechte partities te verwijderen"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "U moet een swap-partitie hebben"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake kon de partitietabel niet correct inlezen.\n"
-"Als u verdergaat, is dit op eigen risico!"
+"U heeft geen swap-partitie!\n"
+"\n"
+"Toch verdergaan?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Bezig met zoeken naar 'root'-partitie..."
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Gebruik vrije ruimte"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Informatie"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "Niet genoeg vrije ruimte om nieuwe partities te maken"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: Dit is geen root-partitie, gelieve er een andere te kiezen."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "Gebruik een bestaande partitie"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Geen root-partitie gevonden"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "Er is geen bestaande partitie om te gebruiken"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Kan `broadcast' niet gebruiken zonder NIS-domein"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Gebruik de Windows partitie voor loopback "
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Fout bij het lezen van bestand $f"
+#: ../../install_interactive.pm_.c:90
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Welke partitie wenst u te gebruiken voor Linux4Win?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Er is een fout opgetreden, maar ik weet niet hoe deze te behandelen.\n"
-"Als u verdergaat, is dit op eigen risico."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Kies de grootte"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Dubbel koppelpunt %s"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Root-partitie-grootte in MB:"
 
-#: ../../install_steps.pm_.c:323
-msgid ""
-"Some important packages didn't get installed properly.\n"
-"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
-msgstr ""
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Swap-partitie-grootte in MB: "
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Welkom bij %s!"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "Gebruik de vrije ruimte op de Windows partitie"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Geen diskettestation beschikbaar"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Van welke partitie wilt u de grootte veranderen?"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "Bezig met berekenen van Windows bestandssysteemgrenzen"
+
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "Overgang naar stap `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"De FAT grootte-aanpasser was niet instaat met uw partitie om te gaan, \n"
+"dit is fout gegaan: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "U moet een swap-partitie hebben"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
+"Uw Windows partitie is te gefragmenteerd, start a.u.b. eerst ``defrag'' eerst"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"U heeft geen swap-partitie!\n"
+"WAARSCHUWING!\n"
 "\n"
-"Toch verdergaan?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Selecteer de grootte die u wenst te installeren"
+"DrakX moet nu de grootte van uw Windows-partitie aanpassen. Wees "
+"voorzichtig:\n"
+"deze operatie is gevaarlijk. Als u dit niet reeds gedaan heeft, draait u\n"
+"best eerst scandisk (en eventueel defrag) op deze partitie en maakt u ook\n"
+"best een veiligheidskopie.\n"
+"Als u zeker bent, klik Ok."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Totale grootte: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "Welke grootte wilt u gebruiken om windows op?"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "Versie: %s\n"
+msgid "partition %s"
+msgstr "Partitie %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "Grootte: %d kB\n"
+msgid "FAT resizing failed: %s"
+msgstr "FAT grootte-aanpassing mislukt: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Kies de pakketten die u wenst te installeren"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+"Er is geen FAT partitie om de grootte van aan te passen of om als \n"
+"loopback te gebruiken (of er is te weinig ruimte over)"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "Volledige harde schijf wissen"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Installeren"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Verwijder Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Bezig met installeren"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr "U heeft meer dan een harde schijf, op welke wilt u Linux installeren?"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Even geduld, "
+#: ../../install_interactive.pm_.c:156
+#, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr ""
+"ALLE bestaande partities en de data die ze bevatten, zal worden gewist van "
+"schijf %s"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Tijd over "
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "Expert mode"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Totale tijd "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "Gebruik diskdrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Bezig met voorbereiden van installatie"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "Gebruik fdisk"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "Bezig met installeren van pakket %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"U kan nu uw schijf %s partitioneren.\n"
+"Vergeet niet op te slaan met `w' wanneer u klaar bent."
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Toch verdergaan?"
+#: ../../install_interactive.pm_.c:195
+msgid "You don't have enough free space on your Windows partition"
+msgstr "U heeft niet genoeg vrije ruimte op uw Windows partitie"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Er was een fout bij het sorteren van de pakketten:"
+#: ../../install_interactive.pm_.c:210
+msgid "I can't find any room for installing"
+msgstr "Ik kan geen partitie meer toevoegen"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Bestaande configuratie gebruiken voor X11?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "De DrakX partitie wizard heeft de volgende oplossingen gevonden:"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Gelieve een van de volgende installatieklasses te kiezen:"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Partitionering mislukt: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "U heeft geen windows partities!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Bezig met opstarten van het netwerk"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "U heeft niet genoeg plaats voor Lnx4win"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Bezig met stoppen van het netwerk"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"WAARSCHUWING!\n"
-"\n"
-"DrakX moet nu de grootte van uw Windows-partitie aanpassen. Wees "
-"voorzichtig:\n"
-"deze operatie is gevaarlijk. Als u dit niet reeds gedaan heeft, draait u\n"
-"best eerst scandisk (en eventueel defrag) op deze partitie en maakt u ook\n"
-"best een veiligheidskopie.\n"
-"Als u zeker bent, klik Ok."
+"Er is een fout opgetreden, maar ik weet niet hoe deze te behandelen.\n"
+"Als u verdergaat, is dit op eigen risico."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Automatische grootte-aanpassing is niet gelukt"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Dubbel koppelpunt %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Welke partitie wenst u te gebruiken om Linux4Win op te zetten?"
+#: ../../install_steps.pm_.c:375
+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 ""
+"Sommige belangrijke pakketen werden niet juist\n"
+"ge�nstalleerd. Of uw cdrom drive of uw cdrom is defect.\n"
+"Controleer de cdrom op een ge�nstalleerde computer met\n"
+"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Kies de grootte"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Welkom bij %s!"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Root-partitie-grootte in MB:"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Geen diskettestation beschikbaar"
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Swap-partitie-grootte in MB: "
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Overgang naar stap `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"Uw systeem heeft weinig bronnen beschikbaar. U zou problemen kunnen\n"
+"ondervinden bij het installeren van Linux-Mandrake. Als dit gebeurt,\n"
+"kunt u een text installatie proberen. Om dit te doen, drukt u op `F1'\n"
+"terwijl de CDROM opstart, en dan voert u `text' in."
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Gelieve een van de volgende installatieklasses te kiezen:"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "De totale grootte voor de geselecteerde groepen is ongeveer %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2523,7 +3237,7 @@ msgstr ""
 "Een laag percentage zal enkel de belangrijkste pakketten installeren;\n"
 "een percentage van 100% zal alle geselecteerde pakketten installeren."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2539,62 +3253,102 @@ msgstr ""
 "Een laag percentage zal enkel de belangrijkste pakketten installeren;\n"
 "een percentage van 100% zal alle geselecteerde pakketten installeren."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "Het is mogelijk preciezer te kiezen in de volgende stap."
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Percentage pakketten om te installeren"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Kies de pakketten die u wenst te installeren"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Installeren"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Automatische afhankelijkheden"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr ""
 "Boom\n"
 "Uitbreiden"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr ""
 "Boom\n"
 "Inklappen"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Schakelen tussen gewoon en per-groep-gesorteerd"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Slecht pakket"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Naam: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versie: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Grootte: %d kB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Belangrijkheid: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Totale grootte: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr "U kan dit pakket niet selecteren omdat er te weinig vrije ruimte is"
+
+#: ../../install_steps_gtk.pm_.c:386
+msgid "The following packages are going to be installed"
+msgstr "De volgende pakketten zullen ge�nstalleerd worden"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "De volgende pakketten zullen gede�nstalleerd worden"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "U kan dit pakket niet (de)selecteren"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Dit is een verplicht pakket, het kan niet gedeselecteerd worden"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "U kan dit pakket niet deselecteren. Het is al geinstalleerd."
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2602,45 +3356,88 @@ msgstr ""
 "Dit pakket moet geupgrade worden\n"
 "Bent u zeker dat u het wenst te deselecteren?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "U kan dit pakket niet deselecteren. Het moet geupgrade worden."
 
-#: ../../install_steps_gtk.pm_.c:493
-#, fuzzy
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr "U kan dit pakket niet deselecteren. Het is al geinstalleerd."
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "De volgende pakketten zullen ge(de)�nstalleerd worden"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "U kan dit pakket niet (de)selecteren"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Bezig met installeren"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Bezig met schatten"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Even geduld, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Tijd over "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Totale tijd "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Bezig met voorbereiden van installatie"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pakketten"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Bezig met installeren van pakket %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "Accepteren"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2657,182 +3454,388 @@ msgstr ""
 "Als u deze CD niet heeft, klik dan Annuleren om verdere installatie vanaf "
 "deze CD te vermijden."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "Niet Accepteren"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Toch verdergaan?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Er was een fout bij het sorteren van de pakketten:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Er was een fout bij het installeren van de pakketten:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Er is een fout opgetreden"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Gelieve een taal te kiezen."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr "Licentie overeenkomst"
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Toetsenbord"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Wat is uw toetsenbord-layout?"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr "U kan andere talen kiezen die verkrijgbaar zullen zijn na installatie"
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Root-partitie"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "Alles"
 
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Wat is de root-partitie (/) van uw systeem?"
-
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Installatie-klasse"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Welke installatie-klasse wenst u?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
-msgstr "Installatie/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Install/Update"
+msgstr "Installatie/Update"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Is this an install or an update?"
 msgstr "Is dit een installatie of een upgrade?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Automatisch"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Aanbevolen"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Aangepast"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Expert"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "Bent u zeker dat u een expert bent?\n"
-"U zal krachtigere dingen kunnen doen, maar ook gevaarlijkere!"
+"U zal krachtigere dingen kunnen doen, maar ook gevaarlijkere!\n"
+"U zult vragen gesteld krijgen als: ``Schaduw bestand gebruiken voor "
+"wachtwoorden?'',\n"
+"bent u er klaar voor zulke vragen te beantwoorden?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
-msgstr "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+msgid "Update"
+msgstr "Update"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Normaal"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "Werkstation"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Ontwikkeling"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Server"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
-msgstr "Waarvoor gebruikt u uw systeem voornamelijk?"
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
+msgstr "Waar wordt uw systeem voor gebruikt?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Welk type muis heeft u?"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Muispoort"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Met welke seri�le poort is uw muis verbonden?"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Bezig met configureren van PCMCIA-kaarten..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "IDE-Configuratie"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "Geen beschikbare partities"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Welke partitie wenst u te gebruiken als root-partitie?"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr "Bezig met scannen van partities om mount punten te vinden"
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Selecteer de koppelpunten"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Ik kan uw partitietabel niet lezen, ze is te corrupt voor mij :-(\n"
+"Ik kan proberen door te gaan en de slechte partities verwijderen\n"
+"(ALLE DATA zal worden gewist!).\n"
+"De andere oplossing is om DrakX de de partitie tabel niet te laten "
+"aanpassen.\n"
+"(de fout is %s)\n"
+"\n"
+"Gaat u ermee akkoord alle partities te verliezen?\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake kon de partitietabel niet correct inlezen.\n"
+"Als u verdergaat, is dit op eigen risico!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Root-partitie"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Wat is de root-partitie (/) van uw systeem?"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "U dient te herstarten om de wijzigingen in de partitietabel te activeren."
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Kies de partities die u wenst te formatteren"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Slechte blocks checken?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Bezig met formatteren van partities"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Bezig met aanmaken en formatteren van bestand %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Niet genoeg swap voor de installatie, voeg er wat toe"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Bezig met zoeken naar beschikbare pakketten"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Bezig met zoeken naar pakketten om te upgraden"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr "Uw systeem heeft niet genoeg ruimte over voor installatie of upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
+msgstr ""
+"Uw systeem heeft niet genoeg ruimte over voor installatie of upgrade (%d > "
+"%d)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "Volledig (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "Minimaal (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Aanbevolen (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "Aangepast"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "Selecteer de grootte die u wenst te installeren"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
-msgstr "Pakket-groep-selectie"
+msgstr "Pakket-groep Selectie"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Individuele pakketselectie"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2842,12 +3845,12 @@ msgstr ""
 "Als u geen enkele van die CDs heeft, klik dan Annuleren.\n"
 "Als maar enkele CDs zoek zijn, deselecteer ze dan, en klik Ok."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-Rom genaamd \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2855,173 +3858,11 @@ msgstr ""
 "Bezig met installeren van pakket %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Installatie na configuratie"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Huidige IP-configuratie behouden"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Netwerk nu herconfigureren"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Netwerk niet instellen"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Netwerk-configuratie"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Het locale netwerk is reeds geconfigureerd. Wil u:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Wenst u uw systeem te configureren voor gebruik met een netwerk?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "Geen netwerkkaart gevonden"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Modemconfiguratie"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr ""
-"Wenst u uw systeem te configureren voor gebruik met een inbelverbinding?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Bezig met configureren van netwerk-apparaat %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Gelieve de IP-configuratie voor deze machine in te geven.\n"
-"Elke ingang moet ingegeven worden als een IP adres in `dotted-decimal'-\n"
-"vorm (bijvoorbeeld 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Automatisch IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP-adres:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Netmasker:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(BootP/DHCP)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "Het IP-adres moet het formaat 1.2.3.4 hebben"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Bezig met configureren van netwerk"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Gelieve uw hostnaam in te voeren.\n"
-"Het moet een volledige hostnaam zijn, zoals ``mybox.mylab.myco.com''.\n"
-"U mag ook het IP-adres van de gateway invoeren als u er een heeft."
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS-server:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Gateway-apparaat:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Gateway:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Host-naam:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Proberen een modem te vinden?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Met welke seri�le poort is uw modem verbonden?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Inbel-opties"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Verbindingsnaam"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Telefoonnummer"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Aanmeldingsnaam"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Authenticatie"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Gebaseerd op een script"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Gebaseerd op een terminal"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Domeinnaam"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Eerste DNS-server"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Tweede DNS-server"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3060,90 +3901,94 @@ msgid ""
 "USA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Kies een `mirror' om de pakketten van af te halen"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 "Bezig met de `mirror' te contacteren om de lijst met beschikbarepakketten te "
 "verkrijgen"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Kies de pakketten die u wenst te installeren."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
-msgstr "Wat is uw tijdszone?"
+msgstr "Wat is uw tijdzone?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Is uw hardware-klok ingesteld op GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "Welk printer systeem wilt u gebruiken?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Geen wachtwoord"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Schaduw-bestand gebruiken"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "schaduw"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "MD5-wachtwoorden gebruiken"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "NIS gebruiken"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "Gouden Gids"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "Dit wachtwoord is te makkelijk (moet tenminste %d tekens lang zijn)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Authenticatie NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS-domein"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS-server"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Gebruiker aanvaarden"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Gebruiker toevoegen"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s reeds toegevoegd)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3153,37 +3998,37 @@ msgstr ""
 "Geef een gebruiker in\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Echte naam"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Gebruikersnaam"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Pictogram"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Dit wachtwoord is te simpel"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Geef een gebruikersnaam in"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -3191,24 +4036,51 @@ msgstr ""
 "De gebruikersnaam mag slechts kleine (lowercase) letters, cijfers, `-' en`_' "
 "bevatten"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Deze gebruikersnaam werd reeds toegevoegd"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Een bootdiskette zorgt ervoor dat u nog in uw Linux-systeem kan zonder\n"
+"afhankelijk te zijn van de normale bootloader. Dit is handig als u LILO\n"
+"(of grub) niet wil installeren op uw systeem, of als een ander "
+"besturingssysteem\n"
+"LILO verwijdert, of LILO werkt niet met uw hardware-configuratie.\n"
+"Een bootdiskette kan ook gebruikt worden met het Mandrake-reddings-image,\n"
+"waardoor het veel makkelijker wordt om te herstellen van grote systeem-\n"
+"fouten. Wil u nu een bootdiskette aanmaken voor uw systeem?\n"
+"Stop dan een diskette in het station en druk op \"OK\"."
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Eerste diskettestation"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Tweede diskettestation"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Overslaan"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3230,66 +4102,32 @@ msgstr ""
 "waardoor het veel makkelijker wordt om te herstellen van grote systeem-\n"
 "fouten. Wil u nu een bootdiskette aanmaken voor uw systeem?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Sorry, geen diskettestation beschikbaar"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Kies het diskettestation waarmee u de boot-diskette wenst te maken"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Plaats een floppy in station %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Bezig met het aanmaken van de boot-diskette"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr ""
-"De installatie van LILO is niet gelukt. De volgende fout werd gevonden:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Wenst u SILO te gebruiken?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "SILO-opties"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Hier zijn de ingangen voor SILO.\n"
-"U kan er bijvoegen of de bestaande wijzigen."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Partitie"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Deze naam wordt al gebruikt"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr ""
-"De installatie van SILO is niet gelukt. De volgende fout werd gevonden:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Bezig met klaarmaken van bootloader"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "Wenst u aboot te gebruiken?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3297,136 +4135,128 @@ msgstr ""
 "Fout bij het installeren van aboot,\n"
 "toch proberen te installeren, zelfs als dat de eerste partitie vernietigt?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Proxy-configuratie"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP-proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP-proxy"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy moet http://... zijn"
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy moet ftp://... zijn"
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr ""
+"De installatie van de bootloader is mislukt. De volgende fout werd gevonden:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Welkom, krakers!"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Zeer laag"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Laag"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Medium"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Hoog"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Parano�de"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Overige vragen"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(kan gegevenscorruptie veroorzaken)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Harde schijf-optimalisatie gebruiken?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Kies een veiligheids-niveau"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Juiste RAM-grootte (indien nodig) (%d MB gevonden)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Automatische koppeling van verwijderbare media"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "/tmp opruimen bij elke boot"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Meerdere profielen inschakelen"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Numlock inschakelen bij het opstarten"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Geef de RAM-grootte in MB"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Kan supermount niet gebruiken in hoog veiligheidsniveau"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX zal configuratiebestanden genereren voor XFree 3.3 en XFree 4.0.\n"
-"Standaard zal de 3.3 server gebruikt worden omdat deze op meer grafische\n"
-"kaarten werkt.\n"
-"\n"
-"Wenst u XFree 4.0 te proberen?"
+"let goed op: OP DIT LEVEL VAN VEILIGHEID, IS ROOT LOGIN OP HET CONSOLE\n"
+"NIET TOEGESTAAN! Als u root wilt zijn, moet u als een gebruiker inloggen,\n"
+"en dan \"su\" gebruiken. Algemener, verwacht niet uw computer voor iets\n"
+"anders te gebruiken dan als server.\n"
+"U bent gewaarschuwd."
+
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"Let op, als u numlock aan heeft, worden veel toetsaanhalen als\n"
+"cijfers in plaats van normale letters weergegeven (bijv: `p' => `6')"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Proberen PCI-apparaten te vinden?"
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Bestaande configuratie gebruiken voor X11?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
+msgstr "Wilt u een auto installatie diskette voor Linux replicatie?"
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Plaats een lege floppy in station %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Bezig met aanmaken van auto-installatiediskette"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
-"Sommige stappen zijn nog niet afgewerkt.\n"
-"\n"
-"Wil u nu echt afsluiten?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3438,165 +4268,20 @@ msgid ""
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
-"Gefeliciteerd, de installatie is compleet.\n"
-"Verwijder de opstartmedia en druk enter om te herstarten.\n"
-"\n"
-"Voor informatie over fixes die verkrijgbaar zijn voor deze release van\n"
-"Linux-Mandrake, consulteer de Errata die u kan vinden op\n"
-"http://www.linux-mandrake.com/.\n"
-"\n"
-"Informatie over de configuratie van uw systeem is verkrijgbaar in het\n"
-"\"Post install\" hoofdstuk in de officiele Linux-Mandrake gebruikers-\n"
-"handleiding."
-
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Bezig met afsluiten"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Bezig met installeren van stuurprogramma voor %s kaart %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(module %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Welk %s stuurprogramma moet ik proberen?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"In sommige gevallen heeft het stuurprogramma van %s extra informatie nodig\n"
-"om juist te werken, alhoewel het meestal ook zonder goed werkt. Wil u\n"
-"extra opties invoeren of laat u liever het stuurprogramma zijn informatie\n"
-"zelf zoeken? Soms zal de automatische detectie de computer laten hangen,\n"
-"maar het zou geen schade mogen veroorzaken."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Automatisch Detecteren"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Geef opties"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "U mag nu de opties ingeven voor module %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"U mag nu de opties voor module %s ingeven.\n"
-"Opties staan in het formaat ``naam=waarde naam2=waarde2 ...''.\n"
-"Bijvoorbeeld, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Module-opties:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Het laden van module %s is niet gelukt.\n"
-"Wenst u opnieuw te proberen met andere parameters?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Proberen PCMCIA-kaarten te vinden?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Bezig met configureren van PCMCIA-kaarten..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Proberen %s-apparaten te vinden?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "%s %s interfaces gevonden"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Heeft u er nog ��n?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Heeft u een %s interface?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Nee"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Zie hardware-info"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Bezig met opstarten van het netwerk"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Bezig met stoppen van het netwerk"
 
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake Installatie %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 " <Tab>/<Alt-Tab> tussen elementen | <Spatie> selecteert | <F12> volgend "
 "scherm "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"U kan nu uw %s harde schijf partitioneren.\n"
-"Vergeet niet op te slaan met `w' wanneer u klaar bent."
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Even geduld"
 
@@ -3606,7 +4291,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Verwarring (%s), wees meer precies\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Slechte keuze, probeer nog eens\n"
 
@@ -3620,449 +4305,958 @@ msgstr " ? (standaard %s) "
 msgid "Your choice? (default %s) "
 msgstr "Uw keuze? (standaard %s)"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Uw keuze? (standaard %s, geef `geen' voor geen)"
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "Tsjechisch"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Duits"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Spaans"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Fins"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Frans"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Noors"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Pools"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "UK toetsenbord"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "US toetsenbord"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armeens (oud)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armeens (typmachine)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armeens (fonetisch)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "Azerbeidzjan (latin)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "Azerbeidzjan (cyrillisch"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belgisch"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulgaars"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Braziliaans (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
-#, fuzzy
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
-msgstr "Bulgaars"
+msgstr "Belarusiaans"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Zwitsers (Duitse layout)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Zwitsers (Franse layout)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Duits (geen dode toetsen)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Deens"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak (US)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (Noorwegen)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Ests"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgisch (\"Russische\" layout)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgisch (\"Latin\" layout)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Grieks"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Israelisch"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Israelisch (Fonetisch)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Iraans"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "IJslands"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Italiaans"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "Japans 106 toetsen"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Latijns-Amerikaans"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lithuaans AZERTY (oud)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lithuaans AZERTY (nieuw)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lithuaans \"nummer-rij\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lithuaans \"fonetisch\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Pools (qwerty layout)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Pools (qwertz layout)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Canadees (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Russisch (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Zweeds"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Sloveens"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slovaaks"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Thai-toetsenbord"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turks (traditioneel \"F\"-model)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turks (modern \"Q\"-model)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Oekra�ens"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "US toetsenbord (internationaal)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vietnamese \"nummer-rij\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Yoegoslaafs (latin layout)"
 
-# 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.
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - muis"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "Standaard"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Algemeen"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "Wiel"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "seri�el"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Algemene 2-knopsmuis"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Algemene 3-knopsmuis"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech-muis (seri�el, oud C7-type)"
+
+#: ../../mouse.pm_.c:64
+msgid "busmouse"
+msgstr "bus muis"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2 knoppen"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3 knoppen"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "geen"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Geen muis"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "Volgende ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Is dit correct?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Internet configuratie"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Wenst u nu te proberen een connectie te maken met Internet?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr ""
+"\n"
+"U kunt uw connectie herconfigureren"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "U bent op dit moment niet aangesloten op het Internet."
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"U kunt verbinding maken met het Internet of uw connectie herconfigureren"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "ISDN Configuratie"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Selecteer uw provider.\n"
+" Als uw provider niet in de lijst staat, kiest u Unlisted"
+
+#: ../../netconnect.pm_.c:158
+msgid "Connection Configuration"
+msgstr "Connectie configuratie"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "Selecteer of vul onderstaand veld a.u.b. in"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "IRQ van de kaart"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "Mem (DMA) van de kaart"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "IO van de kaart"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "IO_0 van de kaart"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "IO_1 van de kaart"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "Uw persoonlijke telefoonnummer"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "Naam van uw provider (bijv. provider.nl)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Telefoonnummer van uw provider"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "DNS 1 van uw provider"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "DNS 2 van uw provider"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "Inbel mode"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "Account Login (gebruikers-naam)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Wachtwoord"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Bevestig Wachtwoord"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "Europa"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Europa (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "De rest van de wereld"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "De rest van de wereld - geen D-Channel (geleasde lijnen)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "Welk protocol wenst u te gebruiken?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "Ik weet het niet"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "Welk type kaart heeft u?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "Verder"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "Annuleren"
+
+#: ../../netconnect.pm_.c:245
+msgid ""
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
-"Welkom bij LILO - Kies uw besturingssysteem!\n"
 "\n"
-"Om de mogelijke keuzes te tonen, druk <TAB>.\n"
+"Als u een ISA kaart bezit, zouden de waardes op het volgende scherm moeten "
+"kloppen.\n"
 "\n"
-"Om een keuze te laden, voer de naam in en druk <ENTER>\n"
-"of wacht %d seconden voor de standaard-bootkeuze.\n"
+"Als  u een PCMCIA kaart bezit, moet u het irq en io van uw kaart weten.\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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Welkom bij GRUB - Kies uw besturingssysteem!"
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "Welke is uw ISDN kaart?"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "Gebruik de %c en %c-toetsen om te aangeduide ingang te selecteren."
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "Ik heb een ISDN kaart gevonden:\n"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Druk Enter om het geselecteerde besturingssysteem te booten, druk 'e'"
+#: ../../netconnect.pm_.c:287
+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 ""
+"Ik heb een ISDN PCI kaart gevonden, maar ik ken het merk niet. Selecteer "
+"a.u.b. een PCI kaart op het volgende scherm."
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr " om de ingang eerst te bewerken, of 'c' voor een command-line."
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr ""
+"Geen ISDN PCI kaart gevonden. Selecteer a.u.b. uw kaart op het volgende "
+"scherm."
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"De aangeduide ingang zal automatisch gestart worden binnen %d seconden."
+"Er is geen ethernet netwerk adapter op uw systeem gevonden.\n"
+"Ik kan dit type connectie niet opzetten."
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Kies de netwerk interface"
+
+#: ../../netconnect.pm_.c:336
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Kies a.u.b. met welke netwerkkaart u met het Internet wilt verbinden"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "Netwerk Interface"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
+"\n"
+"Do you agree?"
 msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Desktop"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr ""
+"Ik sta op het punt het netwerk apparaat $device te herstarten. Is dit OK?"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Start Menu"
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "ADSL Configuratie"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun - muis"
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "Wenst u bij aboot uw connectie te starten?"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB-muis"
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Proberen een modem te vinden?"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB-muis (2 knoppen)"
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Met welke seri�le poort is uw modem verbonden?"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB-muis (3 knoppen of meer)"
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Inbel-opties"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB-muis"
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Verbindingsnaam"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB-muis (2 knoppen)"
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "Telefoonnummer"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB-muis (3 knoppen of meer)"
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Aanmeldingsnaam"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Algemene muis (PS/2)"
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Authenticatie"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (PS/2)"
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Algemene 3-knopsmuis (PS/2)"
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Gebaseerd op een script"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Gebaseerd op een terminal"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Domeinnaam"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Eerste DNS-server"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Tweede DNS-server"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:582
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr ""
+"\n"
+"U kunt verbinding maken met het Internet of uw connectie herconfigureren"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr ""
+"\n"
+"U kunt uw connectie herconfigureren"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:582
+msgid "You are not currently connected to Internet."
+msgstr "U bent op dit moment niet aangesloten op het Internet."
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
+"\n"
+"U kunt nu de verbrinding verbreken of uw connectie herconfigureren."
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Busmuis"
+#: ../../netconnect.pm_.c:586
+msgid "You are currently connected to internet."
+msgstr "U bent op dit moment aangesloten op het Internet."
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Busmuis"
+#: ../../netconnect.pm_.c:590
+msgid "Connect to Internet"
+msgstr "Verbind met het Internet"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Busmuis"
+#: ../../netconnect.pm_.c:592
+msgid "Disconnect from Internet"
+msgstr "Verbreek verbinding met het Internet"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB-muis"
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Configureer uw Internet connectie"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB-muis (3 knoppen of meer)"
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "Internet verbinding & configuratie"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Geen muis"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr ""
+"Ik ga het netwerk apparaat $netc->{NET_DEVICE} herstarten. Is dit goed?"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A of hoger (seri�el)"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Configureer uw Internet connectie"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (seri�el)"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Configureer uw Internet connectie"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (seri�el)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Interne ISDN kaart"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (seri�el)"
+#: ../../netconnect.pm_.c:668
+msgid "External ISDN modem"
+msgstr "Extern ISDN modem"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (seri�el)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "Verbinden met het Internet"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (seri�el)"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "Wat voor een ISDN connectie heeft u?"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (seri�el)"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Configureer uw Internet connectie"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (seri�el)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "Frankrijk"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech-muis (seri�el, oud C7-type)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "Andere landen"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (seri�el)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "In welk land bent u nu?"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Algemene Muis (seri�el)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "Alcatel modem"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft-compatibel (seri�el)"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "ECI modem"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Algemene 3-knopsmuis (seri�eel)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "Als uw adsl modem een Alcatel is, kiest u Alcatel. Anders kiest u ECI."
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (seri�el)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "gebruik pppoe"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Is dit correct?"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "gebruik geen pppoe"
 
-#: ../../partition_table.pm_.c:528
-msgid "Extended partition not supported on this platform"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"De meest gebruikte manier om te verbinden met adsl is met\n"
+"dhcp + pppoe. Niettemin, het komt voor dat een verbinding\n"
+"alleen dhcp gebruiken.\n"
+"Als u het niet weet, kiest u 'gebruik pppoe'"
+
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Configureer uw Internet connectie"
+
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"Welke dhcp client wenst u te gebruiken?\n"
+"Standaard is dit dhcpd"
+
+#: ../../netconnect.pm_.c:800
+msgid "Disable Internet Connection"
+msgstr "Netwerk-configuratie"
+
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "Configureer locaal netwerk"
+
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Netwerk-configuratie"
+
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Wenst u de configuraties te testen?"
+
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "Networking uitschakelen"
+
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Verbinding maken met het Internet / Configureer locaal netwerk"
+
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"Het locale netwerk is reeds geconfigureerd.\n"
+"Wilt u:"
+
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "Hoe wenst u verbindingte maken met het Internet?"
+
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Netwerk-configuratie"
+
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
+"Nu uw Internet connectie geconfigureerd is,\n"
+"kan uw computer geconfigureerd worden om zijn Internet connectie\n"
+"te delen. Opmerking: u heeft een Netwerk Adapter nodig om een Local Area\n"
+"op te zetten.\n"
+"\n"
+"Wilt u Internet Connectie Delen nu instellen?\n"
+
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "Geen netwerkkaart gevonden"
+
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Bezig met configureren van netwerk"
+
+#: ../../network.pm_.c:274
+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 ""
+"Gelieve uw hostnaam in te voeren als u deze kent.\n"
+"Sommige DHCP servers hebben de hostnaam nodig om te werken.\n"
+"Het moet een volledige hostnaam zijn, zoals ``mybox.mylab.myco.com''.\n"
+"U mag ook het IP-adres van de gateway invoeren als u er een heeft."
+
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "Host naam:"
+
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+"WAARSCHUWING: Dit apparaat is al geconfigureerd om verbinding te maken met "
+"Internet.\n"
+"Druk gewoon op OK om deze configuratie te behouden.\n"
+"Als u de onderstaande velden aanpast, wordt het apparaat opnieuw "
+"geconfigureerd"
+
+#: ../../network.pm_.c:302
+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 ""
+"Gelieve de IP-configuratie voor deze machine in te geven.\n"
+"Elke ingang moet ingegeven worden als een IP adres in `dotted-decimal'-\n"
+"vorm (bijvoorbeeld 1.2.3.4)."
+
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Bezig met configureren van netwerk-apparaat %s"
+
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Automatisch IP"
+
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "IP adres"
+
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "Netmasker"
+
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(BootP/DHCP)"
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "Het IP-adres moet het formaat 1.2.3.4 hebben"
+
+#: ../../network.pm_.c:341
+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 ""
+"Gelieve uw hostnaam in te voeren.\n"
+"Het moet een volledige hostnaam zijn, zoals ``mybox.mylab.myco.com''.\n"
+"U mag ook het IP-adres van de gateway invoeren als u er een heeft."
+
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "DNS server"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "Gateway"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "Gateway apparaat"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "Configuratie van proxie(s)"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP-proxy"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP-proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy moet http://... zijn"
 
-#: ../../partition_table.pm_.c:546
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy moet ftp://... zijn"
+
+#: ../../partition_table.pm_.c:540
+msgid "Extended partition not supported on this platform"
+msgstr "Extended partitie niet ondersteund op dit platform"
+
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4072,21 +5266,21 @@ msgstr ""
 "De enige oplossing is om uw primaire partitie te verplaatsen zodat het gat "
 "naast de extended partitie komt te liggen"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fout bij het lezen van bestand %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Het herstellen van bestand %s is niet gelukt: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Slechte reservekopie"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Fout bij het schrijven naar bestand %s"
@@ -4120,42 +5314,51 @@ msgstr "interessant"
 msgid "maybe"
 msgstr "misschien"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (belangrijk)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (heel leuk)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (leuk)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Minder tonen"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Meer tonen"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Lokale printer"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "lpd op afstand"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "Netwerk printer"
+
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "Netwerk CUPS server"
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "Lpd server op netwerk"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "Netwerk printer (socket)"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "Printerapparaat URI"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Bezig met het detecteren van apparaten..."
@@ -4169,11 +5372,11 @@ msgstr "Poorten testen"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Een printer, model \"%s\", werd gedetecteerd op"
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Lokale Printer"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4181,15 +5384,15 @@ msgstr ""
 "Met welke poort is uw printer verbonden \n"
 "(/dev/lp0 is equivalent met LPT1:) ?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Printerapparaat:"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "lpd op afstand - Printer-opties"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4199,19 +5402,19 @@ msgstr ""
 "hostnaam van de printerserver en de wachtrij-naam op die\n"
 "server invoeren."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Hostnaam op afstand:"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Wachtrij op afstand:"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) Printer-opties"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4224,27 +5427,27 @@ msgstr ""
 "en mogelijk het IP-adres van de server, alsook de sharenaam van de\n"
 "printer en indien nodig een gebruikersnaam, wachtwoord en werkgroep."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "SMB-server host"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "SMB-server IP"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Share-naam"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Werkgroep"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "NetWare Printer-Opties"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4255,130 +5458,154 @@ msgstr ""
 "servernaam opgeven (Deze kan verschillen van de TCP/IP hostnaam!) en ook\n"
 "de printerwachtrij en indien nodig een gebruikersnaam en wachtwoord."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Printer Server"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Naam van de printerwachtrij"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "Socket Printer opties"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"Om naar een socket printer te printen, moet u de host- \n"
+"naam van de printer en optioneel het poortnummer geven."
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "Printer Hostnaam"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "Poort"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr "U kunt de URI invoeren om de printer met CUPS te benaderen"
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Welk type printer heeft u?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Wenst u de printer-configuratie te testen?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Bezig met afdrukken van testpagina(s)..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"Testpagina(s) werd(en) naar de printer-daemon gestuurd.\n"
+"Het kan even duren voordat het eigenlijke afdrukken begint.\n"
+"Print-status:\n"
+"%s\n"
+"\n"
+"Werkt het afdrukken naar behoren?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"Testpagina's) werd(en) naar de printer-daemon gestuurd.\n"
+"Het kan even duren voordat het eigenlijke afdrukken begint.\n"
+"Werkt het afdrukken naar behoren?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Ja, print een ASCII testpagina"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Ja, print een PostScript testpagina"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Ja, print beide testpagina's"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Printer configureren"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Welk type printer heeft u?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Printer-opties"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Papiergrootte"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Pagina uitwerpen na job?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Uniprint stuurprogramma-opties"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Kleurdiepte-opties"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Text afdrukken als PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Pagina-volgorde omdraaien"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Getrapte tekst repareren?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Aantal pagina's per uitvoerpagina's"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Linker/Rechtermarges in punten (1/72 inch)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Boven/Ondermarges in punten (1/72 inch)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Extra GhostScript opties"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Extra tekst-opties"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Wenst u de printer-configuratie te testen?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Bezig met afdrukken van testpagina(s)..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"Testpagina(s) werd(en) naar de printer-daemon gestuurd.\n"
-"Het kan even duren voordat het eigenlijke afdrukken begint.\n"
-"Print-status:\n"
-"%s\n"
-"\n"
-"Werkt het afdrukken naar behoren?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"Testpagina's) werd(en) naar de printer-daemon gestuurd.\n"
-"Het kan even duren voordat het eigenlijke afdrukken begint.\n"
-"Werkt het afdrukken naar behoren?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Printer"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Wenst u een printer in te stellen?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4386,19 +5613,66 @@ msgstr ""
 "Hier zijn de printerwachtrijen.\n"
 "U kan er bijvoegen of de bestaande wijzigen."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "Bezig met starten van CUPS"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr "Bezig met lezen van CUPS drivers database..."
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Selecteer Printer-verbinding"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Hoe is de printer verbonden?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "Selecteer Netwerk Printerverbinding"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+"Met een netwerk CUPS server, hoeft u hier een printer te\n"
+"configureren; printers zullen automatisch gedetecteerd worden.\n"
+"Als u twijfelt, selecteert u \"Remote CUPS server\"."
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Wachtrij verwijderen:"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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 printer heeft een naam nodig (bijv. lp).\n"
+"Andere parameters zoals de beschrijving van de printer en zijn locatie\n"
+"kunnen aangegeven worden. Welke naam moet voor deze printer gebruikt worden\n"
+"en hoe is de printer aangesloten?"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "Naam van de printer"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "Beschrijving"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "Locatie"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4410,45 +5684,45 @@ msgstr ""
 "directory moeten gebruikt worden voor deze wachtrij, en hoe is de printer "
 "verbonden?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Naam van de wachtrij:"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Spool-directory:"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Selecteer Printer-verbinding"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Kan geen partitie toevoegen aan een _geformatteerde_ RAID md%d"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Kan niet schrijven naar bestand $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid-fout!"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid-fout! (misschien ontbreken de raidtools?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Niet genoeg partities voor RAID-niveau %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, een periodieke commando-planner."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4458,7 +5732,7 @@ msgstr ""
 "Het kan ook gebruikt worden om de machine uit te schakelen als het "
 "spanningsniveau van de batterij laag is."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4467,7 +5741,7 @@ msgstr ""
 "werd opgegeven als at werd gestart, en draait batch-commando's wanneer het "
 "load-average laag genoeg is."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4480,7 +5754,7 @@ msgstr ""
 "aande basis UNIX-cron,\n"
 "waaronder betere veiligheid en krachtigere configuratieopties."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4492,7 +5766,7 @@ msgstr ""
 "toe,\n"
 "en biedt ook ondersteuning voor pop-up menu's op de console."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4500,7 +5774,7 @@ msgstr ""
 "Apache is een World Wide Web-server. Het wordt gebruikt om HTML files\n"
 "aan te bieden, en CGI."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4515,7 +5789,7 @@ msgstr ""
 "uitschakelt,\n"
 "schakelt u alle diensten uit waar de daemon verantwoordelijk voor is."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4526,7 +5800,7 @@ msgstr ""
 "utility.\n"
 "U laat dit best aanstaan voor de meeste machines."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4534,7 +5808,7 @@ msgstr ""
 "lpd is de print-daemon, die nodig is om lpr goed te laten werken. Het is\n"
 "voornamelijk een server die print-jobs naar printers stuurt en regelt."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4542,7 +5816,7 @@ msgstr ""
 "named (BIND) is een Domain Name Server (DNS) die is gebruikt om hostnamen\n"
 "naar IP-adressen om te zetten."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4550,7 +5824,7 @@ msgstr ""
 "(Ont)koppelt alle Network File System (NFS), SMB (Lan Manager/Windows)\n"
 "en NCP (NetWare) koppelpunten."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4558,7 +5832,7 @@ msgstr ""
 "Activeert/Deactiveert alle netwerk-interfaces die geconfigureerd zijn\n"
 "om bij het opstarten ingeschakeld te worden."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4569,7 +5843,7 @@ msgstr ""
 "het\n"
 "bestand /etc/exports."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4577,7 +5851,7 @@ msgstr ""
 "NFS is een populair protocol voor bestandsdeling over TCP/IP-netwerken.\n"
 "Deze dienst geeft u NFS-bestands'locking'-functionaliteit."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4590,7 +5864,7 @@ msgstr ""
 "is\n"
 "veilig om het geinstalleerd te hebben op machines die het niet nodig hebben."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4601,7 +5875,7 @@ msgstr ""
 "zoals NFS en NIS. De portmap-server moet draaien op machines die fungeren\n"
 "als servers voor protocols die het RPC-mechanisme gebruiken."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4609,7 +5883,7 @@ msgstr ""
 "Postfix is een Mail Transport Agent, een programma dat post verplaatst\n"
 "van de ene machine naar de andere."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4617,7 +5891,7 @@ msgstr ""
 "Bewaart en herstelt de systeem-entropy pool voor betere generatie\n"
 "van willekeurige cijfers."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4627,7 +5901,7 @@ msgstr ""
 "protocol. RIP is vooral gebruikt op kleine netwerken, complexere routing-\n"
 "protocols zijn nodig voor complexere netwerken."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4635,7 +5909,7 @@ msgstr ""
 "Het rstat-protocol laat gebruikers op een netwerk de prestatie-cijfers\n"
 "voor elke machine op dat netwerk op te vragen."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4643,7 +5917,7 @@ msgstr ""
 "Het rusers-protocol laat gebruikers op een netwerk toe om de kijken wie er\n"
 "ingelogd is op de andere machines op dat netwerk."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4652,7 +5926,7 @@ msgstr ""
 "gebruikers die op een machine ingelogd zijn die de rwho daemon draait.\n"
 "(vergelijkbaar met finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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."
@@ -4662,59 +5936,221 @@ msgstr ""
 "verscheidene systeem-logbestanden. Het is een goed idee syslog altijd te "
 "draaien."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr "Dit opstartscript probeert modules te laden voor uw USB-muis."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "Start en stopt de X Font Server bij opstarten en afsluiten."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr ""
 "Selecteer welke diensten automatisch gestart moeten worden bij het opstarten"
 
-# 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.
-#
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Welkom bij SILO - Kies uw besturingssysteem!\n"
-"\n"
-"Om de mogelijke keuzes te tonen, druk <TAB>.\n"
-"\n"
-"Om een keuze te laden, voer de naam in en druk <ENTER>\n"
-"of wacht %d seconden voor de standaard-bootkeuze.\n"
+"Ik kan uw partitietabel niet lezen, ze is te corrupt voor mij :-(\n"
+"Ik zal proberen door te gaan en de slechte partities te verwijderen"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "LILO/GRUB Configureren"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Boot-diskette aanmaken"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Diskette formatteren"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Keuze"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr ""
+"De installatie van LILO is niet gelukt. De volgende fout werd gevonden:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Internet Connectie Delen staat aan"
+
+#: ../../standalone/drakgw_.c:104
+#, fuzzy
+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 "De setup van Internet Connectie Delen is al uitgevoerd.\n"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Tabel"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "X Configureren"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Internet Connectie Delen staat niet aan"
+
+#: ../../standalone/drakgw_.c:123
+#, fuzzy
+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 "De setup van Internet Connectie Delen is al uitgevoerd.\n"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Tabel"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "De inhoud v/h Config bestand kon niet worden ge�nterpreteerd."
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "Internetverbinding delen"
+
+#: ../../standalone/drakgw_.c:152
+#, fuzzy
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+"Nu uw Internet connectie geconfigureerd is,\n"
+"kan uw computer geconfigureerd worden om zijn Internet connectie\n"
+"te delen. Opmerking: u heeft een Netwerk Adapter nodig om een Local Area\n"
+"op te zetten.\n"
+"\n"
+"Wilt u Internet Connectie Delen nu instellen?\n"
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Inbel mode"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "Geen netwerk adapter op uw systeem!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Er is geen ethernet netwerk adapter op uw systeem gevonden. Start a.u.b het "
+"hardware configuratie programma."
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"Kies a.u.b. welke netwerkadapter verbinding zal maken met uw Local Area "
+"Network."
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"Waarschuwing, de netwerkadapter is al geconfigureerd.\n"
+"Wilt u deze herconfigureren?"
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+"Potentieel LAN adres conflict gevonden in de huidige config van\n"
+"$_!\n"
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "Firewall configuratie gedetecteerd!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+"Waarschuwing! Een bestaande firewall configuratie is gevonden. U kunt "
+"misschien na de installatie een handmatige aanpassing nodig hebben. Doorgaan?"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+"Bezig met het configurenen v/d scripts, installeren v/d software, starten "
+"v/d servers..."
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "IDE-Configuratie"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "Kon ipchains RPM niet met urpmi installeren."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "Kon dhcp RPM niet met urpmi installeren."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "Kon Linuxconf RPM niet met urpmi installeren"
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "Kon bind RPM niet met urpmi installeren."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "Kon caching-nameserver RPM niet met urpmi installeren."
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Gefeliciteerd!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4779,23 +6215,31 @@ msgstr "Selecteer een veiligheids-niveau"
 msgid "Choose the tool you want to use"
 msgstr "Selecteer het programma dat u wenst te gebruiken"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Wat is uw toetsenbord-layout?"
+#: ../../standalone/livedrake_.c:23
+msgid "Change Cd-Rom"
+msgstr "Verander Cd-Rom"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Welk type muis heeft u?"
+#: ../../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 ""
+"Stop a.u.b. de Installatie Cd-Rom in uw Cd-Rom drive en druk daarna op OK.\n"
+"Als u deze niet heeft, drukt u op Annuleren om live upgrade te vermijden."
+
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr "Niet in staat live upgrade te starten !!!\n"
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "Geen seriele USB gevonden\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Derde knop emuleren?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Met welke seri�le poort is uw muis verbonden?"
 
@@ -5008,1047 +6452,199 @@ msgstr "Bezig met zoeken naar leaves"
 msgid "Finding leaves takes some time"
 msgstr "Leaves zoeken vraagt wat tijd"
 
-#~ msgid "useless"
-#~ msgstr "zinloos"
-
-#~ msgid "garbage"
-#~ msgstr "prullen"
-
-#~ 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 Linux."
-#~ msgstr ""
-#~ "Sommige truetype-lettertypen van Windows zijn gevonden op uw computer.\n"
-#~ "Wenst u deze te gebruiken? Zorg ervoor dat u het recht hebt ze te gebruiken "
-#~ "onder Linux."
-
-#~ msgid "Recommended"
-#~ msgstr "Aanbevolen"
-
-#~ 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 ""
-#~ "Kies \"Installeren\" als er geen vorige versies van Linux ge�nstalleerd\n"
-#~ "zijn, of als u meerdere distributies of versies wenst te gebruiken.\n"
-#~ "\n"
-#~ "\n"
-#~ "Kies \"Upgrade\" als u een vorige versie van Mandrake Linux wenst te\n"
-#~ "upgraden: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus),\n"
-#~ "6.1 (Helios), Gold 2000 of 7.0 (Air)."
-
-#~ msgid "Do you want to use LILO?"
-#~ msgstr "Wenst u LILO te gebruiken?"
-
-#~ 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 ""
-#~ "U kan nu de pakketten selecteren die u wenst te installeren.\n"
-#~ "\n"
-#~ "\n"
-#~ "Eerst kan u groepen pakketten kiezen die u wens te installeren of te \n"
-#~ "upgraden. Daarna kan u meer pakketten kiezen naargelang de totale grootte\n"
-#~ "die u wenst te installeren.\n"
-#~ "\n"
-#~ "\n"
-#~ "Als u zich in expert-mode bevindt, kan u de pakketten individueel "
-#~ "selecteren.\n"
-#~ "Onthoud dat sommige pakketten andere pakketen nodig hebben om te werken.\n"
-#~ "Dit worden pakket-afhankelijkheden genoemd. De pakketten die u selecteert,\n"
-#~ "en de pakketten die ervoor nodig zijn zullen automatisch geselecteerd "
-#~ "worden.\n"
-#~ "Het is onmogelijk een pakket te installeren zonder alle afhankelijkheden\n"
-#~ "te installeren."
-
-#~ 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 (de LInux LOader) kan Linux en ook andere besturingssystemen "
-#~ "opstarten.\n"
-#~ "Normaalgezien worden deze correct gedetecteerd gedurende de installatie.\n"
-#~ "Als u die van u niet ziet, kan u deze nu toevoegen.\n"
-#~ "\n"
-#~ "\n"
-#~ "Als u niet wil dat iedereen toegang heeft tot al deze systemen, kan u "
-#~ "debetreffende ingangen nu verwijderen. (een boot-diskette zal nodig zijn om "
-#~ "dit systeem alsnog op te starten)."
-
-#~ 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."
-#~ msgstr ""
-#~ "Nu u de gewenste groepen heeft aangeduid, kiest u hoeveel \n"
-#~ "pakketten u wenst, gaande van minimaal tot volledige \n"
-#~ "installatie van elke geselecteerde groep."
-
-#~ 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 ""
-#~ "U heeft %dMB nodig voor een volledige installatie van de geselecteerde "
-#~ "groepen.\n"
-#~ "U kan toch doorgaan, maar u zal niet alle pakketten kunnen verkrijgen"
-
-#~ msgid "Choose other CD to install"
-#~ msgstr "Selecteer een andere CD voor installatie"
-
-#~ 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\"."
-#~ msgstr ""
-#~ "Selecteer:\n"
-#~ "\n"
-#~ "  - Aanbevolen: Als u Linux nog nooit ge�nstalleerd hebt.\n"
-#~ "\n"
-#~ "\n"
-#~ "  - Aangepast: Als u bekend bent met Linux. U zal voor het gebruik van het\n"
-#~ "systeem kunnen kiezen tussen normaal, ontwikkeling of server. Kies\n"
-#~ "\"Normaal\" voor een algemene installatie van uw computer. U kan\n"
-#~ "\"Ontwikkeling\" kiezen als u de computer voornamelijk zal gebruiken voor\n"
-#~ "software-ontwikkeling, of \"Server\" als u een server wenst te installeren\n"
-#~ "(voor post, afdrukken...).\n"
-#~ "\n"
-#~ "\n"
-#~ "  - Expert: Als u zich vlot een weg baant in GNU/Linux en een volledig aan\n"
-#~ "uw wensen aangepase installatie, is deze installatieklasse iets voor u.\n"
-#~ "Het zal volledig mogelijk zijn het gebruik van uw systeem te installeren,\n"
-#~ "zoals bij \"Aangepast\"."
-
-#~ msgid "Help"
-#~ msgstr "Hulp"
-
-#~ msgid "Downloading cryptographic packages"
-#~ msgstr "Bezig met downloaden van cryptogragische pakketten"
-
-#~ msgid "Setup SCSI"
-#~ msgstr "SCSI instellen"
-
-#~ msgid "Which language do you want?"
-#~ msgstr "Welke taal wenst u?"
-
-#~ msgid "Which packages do you want to install"
-#~ msgstr "Welke pakketten wenst u te installeren?"
-
-#~ msgid "Local LAN"
-#~ msgstr "Lokaal LAN"
-
-#~ msgid "Dialup with modem"
-#~ msgstr "Inbellen met modem"
-
-#~ msgid "Local Printer Options"
-#~ msgstr "Lokale Printer-opties"
-
-#~ msgid "server"
-#~ msgstr "server"
-
-#~ msgid "expert"
-#~ msgstr "expert"
-
-#~ msgid "developer"
-#~ msgstr "ontwikkelaar"
-
-#~ msgid "beginner"
-#~ msgstr "beginner"
-
-#~ msgid "KB"
-#~ msgstr "KB"
-
-#~ msgid "Sig"
-#~ msgstr "Code"
-
-#~ msgid "error"
-#~ msgstr "fout"
-
-#~ msgid "couldn't open file"
-#~ msgstr "kan bestand niet openen"
-
-#~ msgid "could not read lead bytes"
-#~ msgstr "kan eerste bytes niet lezen"
-
-#~ msgid "file version doesn't support signatures"
-#~ msgstr "Bestandsversie ondersteunt geen handtekeningen"
-
-#~ msgid "could not read signature block"
-#~ msgstr "kan inhoud handtekening-blok niet lezen"
-
-#~ msgid "no signatures"
-#~ msgstr "geen handtekeningen"
-
-#~ msgid "error reading file"
-#~ msgstr "fout bij lezen bestand"
-
-#~ msgid "error writing temp file"
-#~ msgstr "fout bij schrijven van tijdelijk bestand"
-
-#~ msgid "size"
-#~ msgstr "grootte"
-
-#~ msgid "size does not match signature"
-#~ msgstr "grootte past niet bij handtekening"
-
-#~ msgid "md5"
-#~ msgstr "md5"
-
-#~ msgid "md5 sum does not match signature"
-#~ msgstr "som van md5 past niet bij handtekening"
-
-#~ msgid "pgp"
-#~ msgstr "pgp"
-
-#~ msgid "unknown"
-#~ msgstr "onbekend"
-
-#~ msgid "unknown signature test failed"
-#~ msgstr "testen van onbekende handtekening mislukt"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Bad FTP server response"
-#~ msgstr "Slechte respons van FTP server"
-
-#~ msgid "FTP IO error"
-#~ msgstr "FTP IO fout"
-
-#~ msgid "FTP server timeout"
-#~ msgstr "FTP server timeout"
-
-#~ msgid "Unable to lookup FTP server host address"
-#~ msgstr "Kan host adres van FTP server niet vinden"
-
-#~ msgid "Unable to lookup FTP server host name"
-#~ msgstr "Kan host naam van FTP server niet vinden"
-
-#~ msgid "Failed to connect to FTP server"
-#~ msgstr "Kan geen verbinding maken met FTP server"
-
-#~ msgid "Failed to establish data connection to FTP server"
-#~ msgstr "Kan geen data verbinding met FTP server maken"
-
-#~ msgid "IO error to local file"
-#~ msgstr "IO fout bij lokaal bestand"
-
-#~ msgid "Error setting remote server to passive mode"
-#~ msgstr "Fout bij het in passive mode zetten van externe server"
-
-#~ msgid "File not found on server"
-#~ msgstr "Bestand niet gevonden op server"
-
-#~ msgid "FTP Unknown or unexpected error"
-#~ msgstr "FTP onbekend of onverwachte fout"
-
-#~ msgid "Unknown"
-#~ msgstr "Onbekend"
-
-#~ msgid "unknown/group"
-#~ msgstr "onbekende/groep"
-
-#~ msgid "no summary"
-#~ msgstr "geen samenvatting"
-
-#~ msgid "No description !"
-#~ msgstr "Geen beschrijving !"
-
-#~ msgid "unknown.host"
-#~ msgstr "onbekende.host"
-
-#~ msgid "geometry of main window"
-#~ msgstr "geometrie van hoofdvenster"
-
-#~ msgid "wxh+x+y"
-#~ msgstr "bxh+x+y"
-
-#~ msgid "ROOT"
-#~ msgstr "ROOT"
-
-#~ msgid "the file system root"
-#~ msgstr "de root van het bestandssysteem"
-
-#~ msgid "query packages"
-#~ msgstr "pakketinformatie bekijken"
-
-#~ msgid "packages are in files (rather than db)"
-#~ msgstr "pakketten zitten in bestanden (in plaats van de db)"
-
-#~ msgid "upgrade packages"
-#~ msgstr "pakketten opwaarderen"
-
-#~ msgid "verify packages"
-#~ msgstr "pakketten controleren"
-
-#~ msgid "check signatures"
-#~ msgstr "controleer handtekeningen"
-
-#~ msgid "Couldn't install %s"
-#~ msgstr "Kan %s niet installeren"
-
-#~ msgid "Couldn't upgrade %s"
-#~ msgstr "Kan %s niet opwaarderen"
-
-#~ msgid "You must give a package name to query"
-#~ msgstr "Geef een pakketnaam."
-
-#~ msgid "%s of %d packages failed."
-#~ msgstr "%s van de %d pakketten is/zijn mislukt."
-
-#~ msgid "Upgrading"
-#~ msgstr "Aan het opwaarderen"
-
-#~ msgid "error: cannot open file %s"
-#~ msgstr "fout: kan bestand %s niet openen"
-
-#~ msgid " requires "
-#~ msgstr " vereist "
-
-#~ msgid " conflicts with "
-#~ msgstr " botst met "
-
-#~ msgid "Dependency Problems"
-#~ msgstr "Afhankelijkheidsproblemen"
-
-#~ msgid "The following dependency problems occured:"
-#~ msgstr "De volgende afhankelijkheidsproblemen deden zich voor:"
-
-#~ msgid ""
-#~ "Do you want to ignore these problems?\n"
-#~ "(saying yes may make your system unstable)"
-#~ msgstr ""
-#~ "Wilt u deze problemen negeren?\n"
-#~ "(bevestigen kan uw systeem instabiel maken)"
-
-#~ msgid "Installation Problems"
-#~ msgstr "Installatie Problemen"
-
-#~ msgid "The following installation problems occured:"
-#~ msgstr "De volgende installatie problemen deden zich voor:"
-
-#~ msgid "Dependency check failed."
-#~ msgstr "Controle afhankelijkheid mislukt"
-
-#~ msgid "Continue Removal"
-#~ msgstr "Doorgaan met verwijderen"
-
-#~ msgid "Remove the following packages?"
-#~ msgstr "De volgende pakketten verwijderen?"
-
-#~ msgid "Gnome RPM"
-#~ msgstr "Gnome RPM"
-
-#~ msgid "Packages Selected: 0"
-#~ msgstr "Geselecteerde pakketten: 0"
-
-#~ msgid "Packages selected: %d"
-#~ msgstr "Geselecteerde pakketten: %d"
-
-#~ msgid "_Query..."
-#~ msgstr "_Informatie..."
-
-#~ msgid "Get information about the selected packages"
-#~ msgstr "Informatie over de geselecteerde pakketten"
-
-#~ msgid "_Uninstall"
-#~ msgstr "_Deinstalleren"
-
-#~ msgid "Uninstall the selected packages"
-#~ msgstr "De�nstalleer de geselecteerde pakketten"
-
-#~ msgid "_Verify"
-#~ msgstr "_Controleren"
-
-#~ msgid "Verify the selected packages"
-#~ msgstr "Controleer de geselecteerde pakketten"
-
-#~ msgid "_Create desktop entry..."
-#~ msgstr "_Maak een snelkoppeling op het bureaublad..."
-
-#~ msgid "Create desktop entries (for panel) for the selected packages"
-#~ msgstr "Maak snelkoppeling in de taakbalk voor de geselecteerde pakketten"
-
-#~ msgid "Quit GnoRPM"
-#~ msgstr "Verlaat GnoRPM"
-
-#~ msgid "_Quit"
-#~ msgstr "_Afsluiten"
-
-#~ msgid "_Find..."
-#~ msgstr "_Zoek..."
-
-#~ msgid "Search RPM database for packages"
-#~ msgstr "Zoek in RPM database naar pakketten"
-
-#~ msgid "Web find..."
-#~ msgstr "Zoek op het web..."
-
-#~ msgid "Find packages on the web with rpmfind"
-#~ msgstr "Zoek pakketten op het web met rpmfind"
-
-#~ msgid "_Install..."
-#~ msgstr "_Installeren..."
-
-#~ msgid "Install some new packages"
-#~ msgstr "Installeer enkele nieuwe pakketten"
-
-#~ msgid "_Preferences..."
-#~ msgstr "_Voorkeuren..."
-
-#~ msgid "Alter GnoRPM's preferences"
-#~ msgstr "GnoRPM's voorkeuren aanpassen"
-
-#~ msgid "Bring up the about box"
-#~ msgstr "Open het informatievenster"
-
-#~ msgid "_About..."
-#~ msgstr "_Info..."
-
-#~ msgid "_Packages"
-#~ msgstr "_Pakketten"
-
-#~ msgid "_Operations"
-#~ msgstr "_Acties"
-
-#~ msgid "_Help"
-#~ msgstr "_Help"
-
-#~ msgid "Unselect"
-#~ msgstr "Deselecteer"
-
-#~ msgid "Unselect all packages"
-#~ msgstr "Deselecteer alle pakketten"
-
-#~ msgid "Uninstall selected packages"
-#~ msgstr "De�nstalleer geselecteerde pakketten"
-
-#~ msgid "Query selected packages"
-#~ msgstr "Bekijk informatie van geselecteerde pakketten"
-
-#~ msgid "Verify"
-#~ msgstr "Controleer"
-
-#~ msgid "Verify selected packages"
-#~ msgstr "Controleer geselecteerde pakketten"
-
-#~ msgid "Find"
-#~ msgstr "Zoek"
-
-#~ msgid "Find packages"
-#~ msgstr "Zoek pakketten"
-
-#~ msgid "Web find"
-#~ msgstr "Zoek op het web"
-
-#~ msgid "About GnoRPM"
-#~ msgstr "Informatie over GnoRPM"
-
-#~ msgid ""
-#~ "May be distributed under the terms of the GPL2\n"
-#~ "This program uses rpmlib, written by Red Hat"
-#~ msgstr ""
-#~ "Mag gedistribueerd worden onder de voorwaarden van de GPL2\n"
-#~ "Dit programma gebruikt rpmlib, geschreven door Red Hat"
-
-#~ msgid "Install of %d packages failed."
-#~ msgstr "Installatie van %d pakketten mislukt."
-
-#~ msgid "Upgrade of %d packages failed."
-#~ msgstr "Opwaarderen van %d pakketten mislukt."
-
-#~ msgid "Rpmfind"
-#~ msgstr "Rpmfind"
-
-#~ msgid "_Query"
-#~ msgstr "_Informatie"
-
-#~ msgid "Desktop Entry Editor"
-#~ msgstr "Bureaubladsnelkoppeling editor"
-
-#~ msgid "Save Desktop Entry"
-#~ msgstr "Bewaar Bureaubladsnelkoppeling"
-
-#~ msgid "/contain file"
-#~ msgstr "/bevat bestand"
-
-#~ msgid "/are in the group"
-#~ msgstr "/zijn in de groep"
-
-#~ msgid "/provide"
-#~ msgstr "/voorzien"
-
-#~ msgid "/require"
-#~ msgstr "/vereisen"
-
-#~ msgid "/conflict with"
-#~ msgstr "/botst met"
-
-#~ msgid "/match label"
-#~ msgstr "/past bij label"
-
-#~ msgid "/are triggered by"
-#~ msgstr "/worden aangezwengeld door"
-
-#~ msgid "Name"
-#~ msgstr "Naam"
-
-#~ msgid "/All but installed packages"
-#~ msgstr "/Alles behalve ge�nstalleerde pakketten"
-
-#~ msgid "/Only uninstalled packages"
-#~ msgstr "/Alleen gede�nstalleerde pakketten"
-
-#~ msgid "/Only newer packages"
-#~ msgstr "/Alleen nieuwere pakketten"
-
-#~ msgid "/Uninstalled or newer packages"
-#~ msgstr "/Gede�nstalleerde of nieuwere pakketten"
-
-#~ msgid "Filter:"
-#~ msgstr "Filteren:"
-
-#~ msgid "Packages"
-#~ msgstr "Pakketten"
-
-#~ msgid ""
-#~ "Select\n"
-#~ "All"
-#~ msgstr ""
-#~ "Selecteer\n"
-#~ "Alles"
-
-#~ msgid ""
-#~ "Unselect\n"
-#~ "All"
-#~ msgstr ""
-#~ "Deselecteer\n"
-#~ "Alles"
-
-#~ msgid "Check Sig"
-#~ msgstr "Controleer Code"
-
-#~ msgid "Can't open file %s"
-#~ msgstr "Kan bestand %s niet openen"
-
-#~ msgid "%s doesn't appear to be a RPM package"
-#~ msgstr "%s lijkt geen RPM pakket te zijn"
-
-#~ msgid "Add Packages"
-#~ msgstr "Pakketten Toevoegen"
-
-#~ msgid "Close"
-#~ msgstr "Sluiten"
-
-#~ msgid "Package Info"
-#~ msgstr "Pakket informatie"
-
-#~ msgid "Version"
-#~ msgstr "Versie"
-
-#~ msgid "Release"
-#~ msgstr "Uitgave"
-
-#~ msgid "Summary"
-#~ msgstr "Samenvatting"
-
-#~ msgid "Remaining"
-#~ msgstr "Overgebleven"
-
-#~ msgid "Total"
-#~ msgstr "Totaal"
-
-#~ msgid "Size"
-#~ msgstr "Grootte"
-
-#~ msgid "Time"
-#~ msgstr "Tijd"
-
-#~ msgid "No dependency checks"
-#~ msgstr "Geen controle van afhankelijkheid"
-
-#~ msgid "Do not check for dependencies on other rpms. Equivalent to --nodeps"
-#~ msgstr ""
-#~ "Controleer niet op afhankelijkheid van andere rpm's. Gelijk aan --nodeps"
-
-#~ msgid "No reordering"
-#~ msgstr "Geen herordening"
-
-#~ msgid ""
-#~ "Do not reorder package installation to satisfy dependencies. Equivalent to "
-#~ "--noorder"
-#~ msgstr ""
-#~ "Installatie van pakket niet herordenen om aan afhankelijkheden te voldoen. "
-#~ "Gelijk aan --noorder."
-
-#~ msgid "Don't run scripts"
-#~ msgstr "Geen scripts uitvoeren"
-
-#~ msgid ""
-#~ "Do not run the pre and post install scripts. Equivalent to --noscripts."
-#~ msgstr ""
-#~ "De scripts voor en na installatie niet uitvoeren. Gelijk aan --noscripts."
-
-#~ msgid ""
-#~ "Replace packages with a new copy of itself. Equivalent to --replacepkgs."
-#~ msgstr "Vervang pakketten met een niewere versie. Gelijk aan --replacepkgs."
-
-#~ msgid "Allow replacement of files"
-#~ msgstr "Vervangen van bestanden toestaan"
-
-#~ msgid ""
-#~ "Replace files owned by another package. Equivalent to --replacefiles."
-#~ msgstr ""
-#~ "Vervang bestanden toebehorend aan een ander pakket. Gelijk aan "
-#~ "--replacefiles."
-
-#~ msgid "Allow upgrade to old version"
-#~ msgstr "Opwaarderen naar oudere versie toestaan"
-
-#~ msgid ""
-#~ "Upgrade packages to an older package if need be. Equivalent to --oldpackage"
-#~ msgstr ""
-#~ "Pakketten opwaarderen naar een ouder pakket wanneer nodig. Gelijk aan "
-#~ "--oldpackage."
-
-#~ msgid "Keep packages made obsolete"
-#~ msgstr "Behoud verouderde pakketten"
-
-#~ msgid "If a package has been obsoleted, keep it anyway."
-#~ msgstr "Een pakket behouden, ook al is het verouderd."
-
-#~ msgid "Don't install documentation"
-#~ msgstr "Geen documentatie installeren"
-
-#~ msgid "Do not install any of the doc files. Equivalent to --excludedocs."
-#~ msgstr "Geen van de doc bestanden installeren. Gelijk aan --excludedocs."
-
-#~ msgid "Install all files"
-#~ msgstr "Installeer alle bestanden"
-
-#~ msgid "Just update database"
-#~ msgstr "Alleen database opwaarderen"
-
-#~ msgid ""
-#~ "Do not change any files, just update the database as though you did. "
-#~ "Equivalent to --justdb"
-#~ msgstr ""
-#~ "Geen bestanden veranderen, alleen de database opwaarderen zoals u het zou "
-#~ "doen. Gelijk aan --justdb."
-
-#~ msgid "Just test"
-#~ msgstr "Alleen testen"
-
-#~ msgid "Do not actually change anything, just test.  Equivalent to --test"
-#~ msgstr "Niets veranderen, alleen testen. Gelijk aan --test."
-
-#~ msgid "Don't check package architecture"
-#~ msgstr "Pakket architectuur niet controleren"
-
-#~ msgid ""
-#~ "Do not check the system and rpm architectures. Equivalent to --ignorearch"
-#~ msgstr ""
-#~ "De systeem en rpm architectuur niet controleren. Gelijk aan --ignoresearch."
-
-#~ msgid "Don't check package OS"
-#~ msgstr "Besturingssysteem van pakket niet controleren"
-
-#~ msgid "Do not check the package OS field. Equivalent to --ignoreos"
-#~ msgstr ""
-#~ "Veld met besturingssysteem van pakket niet controleren. Gelijk aan "
-#~ "--ignoreos."
-
-#~ msgid "Rating"
-#~ msgstr "Prioriteit"
-
-#~ msgid "mirror"
-#~ msgstr "mirror"
-
-#~ msgid "Preferences"
-#~ msgstr "Voorkeuren"
-
-#~ msgid "Other Options"
-#~ msgstr "Andere Opties"
-
-#~ msgid "Database Options"
-#~ msgstr "Database Opties"
-
-#~ msgid "Architecture Options"
-#~ msgstr "Architectuur Opties"
-
-#~ msgid "Behaviour"
-#~ msgstr "Gedrag"
-
-#~ msgid "Package Listing"
-#~ msgstr "Lijst van Pakketten"
-
-#~ msgid "View as list"
-#~ msgstr "Weergeven als lijst"
-
-#~ msgid "Display packages in a list format"
-#~ msgstr "Pakketten weergeven in lijst formaat"
-
-#~ msgid "View as icons"
-#~ msgstr "Weergeven als pictogrammen"
-
-#~ msgid "Display packages as icons in package list"
-#~ msgstr "Pakketten weergeven als pictogrammen in pakketlijst"
-
-#~ msgid "Package Colours"
-#~ msgstr "Pakket Kleuren"
-
-#~ msgid "Older Colour:"
-#~ msgstr "Oude Kleur:"
-
-#~ msgid ""
-#~ "Set the colour used to highlight packages older than the installed version"
-#~ msgstr ""
-#~ "Geef de kleur om pakketten weer te geven die ouder zijn dan de "
-#~ "ge�nstalleerde versie"
-
-#~ msgid "Current Colour:"
-#~ msgstr "Huidige Kleur:"
-
-#~ msgid ""
-#~ "Set the colour used to highlight packages that are same as the installed "
-#~ "version"
-#~ msgstr ""
-#~ "Geef de kleur om pakketten weer te geven die gelijk zijn aan de "
-#~ "ge�nstalleerde versie."
-
-#~ msgid "Newer Colour:"
-#~ msgstr "Nieuwe Kleur:"
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
 
-#~ msgid ""
-#~ "Set the colour used to highlight packages newer than the installed version"
-#~ msgstr ""
-#~ "Geef de kleur om pakketten weer te geven die nieuwer zijn dan de "
-#~ "ge�nstalleerde versie"
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
 
-#~ msgid "Default File Selection Dialog Path"
-#~ msgstr "Standaard Bestandsselectie Dialoog Pad"
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
 
-#~ msgid "The default directory where the file selection dialog points at"
-#~ msgstr "De standaard map waar de bestandsselectie dialoog naar verwijst"
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
 
-#~ msgid "RPM Directories"
-#~ msgstr "RPM Mappen"
+#, fuzzy
+msgid "Internet Tools"
+msgstr "��������"
 
-#~ msgid "Newline separated list of directories where RPMs may be stored"
-#~ msgstr "Lijst van mappen waarin RPM bestanden opgeslagen kunnen worden"
+msgid "Internet"
+msgstr "��������"
 
-#~ msgid "Install Window"
-#~ msgstr "Installatie Venster"
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
 
-#~ msgid "Network Settings"
-#~ msgstr "Netwerk Instellingen"
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
 
-#~ msgid "HTTP Proxy:"
-#~ msgstr "HTTP Proxy:"
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
 
-#~ msgid "Format: http://proxyhost:port/"
-#~ msgstr "Formaat: http://proxyhost:poort/"
+#, fuzzy
+msgid "Office"
+msgstr "leuk"
 
-#~ msgid "FTP Proxy:"
-#~ msgstr "FTP Proxy:"
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
 
-#~ msgid "Proxy User:"
-#~ msgstr "Proxy Gebruiker:"
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
 
-#~ msgid "The user name to send to the proxy server"
-#~ msgstr "De gebruikersnaam om naar de proxy server te sturen"
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "����������"
 
-#~ msgid "Proxy Password:"
-#~ msgstr "Proxy Wachtwoord:"
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
 
-#~ msgid "Your password will be not securely stored!"
-#~ msgstr "Uw wachtwoord wordt niet veilig opgeslagen!"
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
 
-#~ msgid "Cache expire:"
-#~ msgstr "Verlopen cache:"
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
 
-#~ msgid "The number of days til a downloaded file expires"
-#~ msgstr "Het aantal dagen voordat een opgehaald bestand verloopt"
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
 
-#~ msgid "days"
-#~ msgstr "dagen"
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
 
-#~ msgid "Local Hostname:"
-#~ msgstr "Naam Lokale Host:"
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
 
-#~ msgid "The hostname of the computer -- used to guess distances to mirrors"
-#~ msgstr ""
-#~ "De hostname van de computer -- gebruikt om de afstand tot mirrors te bepalen"
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
 
-#~ msgid "Network"
-#~ msgstr "Netwerk"
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
 
-#~ msgid "Rpmfind Options"
-#~ msgstr "Rpmfind Opties"
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
 
-#~ msgid "Metadata Server:"
-#~ msgstr "Metadata Server:"
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
 
-#~ msgid "The server used to download metadata from"
-#~ msgstr "De server die gebruikt word om metadata van te downloaden"
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "����������"
 
-#~ msgid "Download dir:"
-#~ msgstr "Download map:"
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
 
-#~ msgid "The directory to place downloaded RPMs in"
-#~ msgstr "De map om de op te halen RPM bestanden in te plaatsen"
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
 
-#~ msgid "Vendor:"
-#~ msgstr "Leverancier:"
+msgid "Multimedia"
+msgstr "����������"
 
-#~ msgid "The vendor of your distribution (used to sort package alternates)"
-#~ msgstr ""
-#~ "De leverancier van uw distributie (gebruikt om pakketten te sorteren)"
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
 
-#~ msgid "Distrib:"
-#~ msgstr "Distributie:"
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "����������"
 
-#~ msgid "The name of your distribution (used to sort package alternates)"
-#~ msgstr "De naam van uw distributie (gebruikt om pakketten te sorteren)"
+#, fuzzy
+msgid "Gnome"
+msgstr "geen"
 
-#~ msgid "Want sources"
-#~ msgstr "Ik wil sources"
+#, fuzzy
+msgid "Documentation"
+msgstr "Authenticatie"
 
-#~ msgid ""
-#~ "Check this if you want to download source rather than binary packages"
-#~ msgstr "Als u liever de source dan de binary pakketten wil downloaden."
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
 
-#~ msgid "Want latest version"
-#~ msgstr "Ik wil de laatste versie"
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
 
-#~ msgid ""
-#~ "Check this if you want the latest version rather than the most compatible "
-#~ "version of a package"
-#~ msgstr ""
-#~ "Als u liever de laatste versie van het pakket wil dan de versie die het "
-#~ "meest compatible is."
+# ../../share/compssUsers
+msgid "Games"
+msgstr ""
 
-#~ msgid "No Upgrade List:"
-#~ msgstr "Geen Opwaardeer Lijst:"
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "����������"
 
-#~ msgid "A newline separated list of packages to never update with rpmfind"
-#~ msgstr ""
-#~ "Een lijst van pakketten die nooit met rpmfind opgewaardeerd mogen worden"
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
 
-#~ msgid "Distribution Settings"
-#~ msgstr "Distributie Instellingen"
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
 
-#~ msgid "Origin:"
-#~ msgstr "Origine:"
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Selecteer de grootte die u wenst te installeren"
 
-#~ msgid "Sources:"
-#~ msgstr "Sources:"
+#~ msgid "Total size: "
+#~ msgstr "Totale grootte: "
 
-#~ msgid "Rating:"
-#~ msgstr "Prioriteit:"
+#~ msgid "Reconfigure local network"
+#~ msgstr "Locale netwerk nu herconfigureren"
 
 #~ msgid ""
-#~ "The rating for this distribution (use -1 to ignore this distribution)"
-#~ msgstr ""
-#~ "De prioriteit van deze distributie (gebruik -1 om deze distributie te "
-#~ "negeren)"
-
-#~ msgid "Preferred Mirror:"
-#~ msgstr "Voorkeur Mirror:"
-
-#~ msgid "The mirror to use for this distribution when downloading packages"
-#~ msgstr ""
-#~ "De voor deze distributie te gebruiken mirror bij het downloaden van pakketten"
-
-#~ msgid "Change"
-#~ msgstr "Veranderen"
-
-#~ msgid "Make the changes to this distribution's settings"
-#~ msgstr "Veranderingen van de instellingen van deze distributie toepassen"
-
-#~ msgid "Distributions"
-#~ msgstr "Distributies"
-
-#~ msgid "Size:"
-#~ msgstr "Grootte:"
-
-#~ msgid "Install Date:"
-#~ msgstr "Datum van Installatie:"
-
-#~ msgid "not installed"
-#~ msgstr "niet ge�nstalleerd"
-
-#~ msgid "Build Host:"
-#~ msgstr "Aanmaak Host:"
-
-#~ msgid "Build Date:"
-#~ msgstr "Aanmaak datum:"
-
-#~ msgid "Distribution:"
-#~ msgstr "Distributie:"
-
-#~ msgid "Group:"
-#~ msgstr "Groep:"
-
-#~ msgid "Packager:"
-#~ msgstr "Maker Pakket:"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "<none>"
-#~ msgstr "<geen>"
-
-#~ msgid "Distribution"
-#~ msgstr "Distributie"
-
-#~ msgid "Download"
-#~ msgstr "Download"
-
-#~ msgid "have %s-%s"
-#~ msgstr "hebben %s-%s"
-
-#~ msgid "No packages to download"
-#~ msgstr "Geen pakketten om te downloaden"
-
-#~ msgid "Download files?"
-#~ msgstr "Bestanden downloaden?"
-
-#~ msgid "Download these packages?"
-#~ msgstr "Deze bestanden downloaden?"
-
-#~ msgid "Problem"
-#~ msgstr "Probleem"
-
-#~ msgid "Verifying Packages"
-#~ msgstr "Pakketten Controleren"
-
-#~ msgid "missing"
-#~ msgstr "ontbrekend"
-
-#~ msgid ", md5"
-#~ msgstr ", md5"
-
-#~ msgid ", file size"
-#~ msgstr ", bestandsgrootte"
-
-#~ msgid ", symbolic link problem"
-#~ msgstr ", probleem met symbolische link"
-
-#~ msgid ", user"
-#~ msgstr ", gebruiker"
-
-#~ msgid ", group"
-#~ msgstr ", groep"
-
-#~ msgid ", modification time"
-#~ msgstr ", wijzigingstijd"
-
-#~ msgid ", file mode"
-#~ msgstr ", bestandsmodus"
-
-#~ msgid ", device file type"
-#~ msgstr ", bestandssoort apparaat"
-
-#~ msgid "*script*"
-#~ msgstr "*script*"
-
-#~ msgid "script problem"
-#~ msgstr "script probleem"
-
-#~ msgid "No problems found."
-#~ msgstr "Geen problemen gevonden."
-
-#~ msgid "Going to install %d MB. You can choose to install more programs"
+#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "\n"
 #~ msgstr ""
-#~ "%d MB wordt geinstalleerd. U kan kiezen om meer programma's te installeren."
-
-#~ msgid "Bad kickstart file %s (failed %s)"
-#~ msgstr "Slecht `kickstart'-bestand %s (fout %s)"
-
-#~ msgid "Size: %s MB"
-#~ msgstr "Grootte: %s MB"
+#~ "Uw computer kan worden geconfigureerd om zijn Internet connectie te.\n"
+#~ "delen\n"
 
-#~ msgid "resizing"
-#~ msgstr "bezig met de grootte aan te passen"
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "Alles is geconfigureerd.\n"
 
-#~ msgid "formatting"
-#~ msgstr "bezig met formatteren"
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Verbinden met het Internet met een normaal modem"
 
-#~ msgid "changing type of"
-#~ msgstr "type wordt veranderd"
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Verbinden met het Internet met een ISDN modem"
 
-#~ msgid "After %s partition %s,"
-#~ msgstr "Na %s partitie %s,"
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Verbinden met het Internet met DSL (of ADSL)"
 
-#~ msgid "linear"
-#~ msgstr "lineair"
-
-#~ msgid "Linear (needed for some SCSI drives)"
-#~ msgstr "Lineair (nodig voor sommige SCSI-stations)"
-
-#~ msgid "Password:"
-#~ msgstr "Wachtwoord:"
-
-#~ msgid "User name:"
-#~ msgstr "Gebruikersnaam:"
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Verbindig maken met Internet via de Kabel"
 
 #~ msgid ""
-#~ "Failed to create an HTP boot floppy.\n"
-#~ "You may have to restart installation and give ``%s'' at the prompt"
+#~ "The interface $netcnx->{NET_INTERFACE} is configured and loaded, but you "
+#~ "cannot access to Internet.\n"
+#~ "I suggest you to disconnect, and reconfigure the Internet connection."
 #~ msgstr ""
-#~ "Kon geen HTP bootfloppy aanmaken.\n"
-#~ "U zal misschien de installatie moeten herstarten en ``%s'' ingeven aan de "
-#~ "prompt"
-
-#~ msgid "It is necessary to restart installation with the new parameters"
-#~ msgstr "Het is nodig de installatie te herstarten met de nieuwe parameters"
-
-#~ msgid "It is necessary to restart installation booting on the floppy"
-#~ msgstr "Het is nodig de installatie te herstarten door de floppy te booten"
-
-#~ msgid "A entry %s already exists"
-#~ msgstr "Een %s-ingang bestaat reeds"
-
-#~ msgid "Choose install or upgrade"
-#~ msgstr "Kies installatie of upgrade"
-
-#~ msgid "What usage do you want?"
-#~ msgstr "Welk gebruik wenst u?"
+#~ "De interface $netcnx->{NET_INTERFACE} is geconfigureerd en geladen, maar u "
+#~ "heeft geen toegang tot\n"
+#~ "Internet. Ik beveel u aan de verbinding te verbreken, en uw Internet "
+#~ "connectie hefconfigureert."
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index be8a5d1fc..fab0460f4 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-10-06 21:29+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -478,7 +478,7 @@ msgstr "Hvor �nsker du installere oppstartslasteren?"
 msgid "LILO/grub Installation"
 msgstr "LILO/grub-installasjon"
 
-#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:725
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Ingen"
 
@@ -514,15 +514,15 @@ msgstr "Skjermmodus"
 msgid "Delay before booting default image"
 msgstr "Forsinkelse f�r oppstart av standard bilde"
 
-#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:753
-#: ../../install_steps_interactive.pm_.c:804 ../../netconnect.pm_.c:549
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
 #: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
 #: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Passord"
 
-#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:754
-#: ../../install_steps_interactive.pm_.c:805
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Passord (igjen)"
@@ -545,14 +545,14 @@ msgid ""
 msgstr ""
 "Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:763
-#: ../../install_steps_interactive.pm_.c:818
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Vennligst pr�v igjen"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:763
-#: ../../install_steps_interactive.pm_.c:818
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Passordene stemmer ikke overens"
@@ -571,7 +571,7 @@ msgid "Add"
 msgstr "Legg til"
 
 #: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
-#: ../../install_steps_interactive.pm_.c:798 ../../netconnect.pm_.c:831
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
 #: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Ferdig"
@@ -629,7 +629,7 @@ msgid "Default"
 msgstr "Standard"
 
 #: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
-#: ../../install_steps_interactive.pm_.c:751 ../../interactive.pm_.c:76
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
 #: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
 #: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
 #: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
@@ -665,13 +665,13 @@ msgid "Do you have any %s interfaces?"
 msgstr "Har du noen %s grensesnitt?"
 
 #: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
-#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:466
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
 #: ../../printerdrake.pm_.c:233
 msgid "No"
 msgstr "Nei"
 
 #: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
-#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:464
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
 msgid "Yes"
 msgstr "Ja"
 
@@ -1374,9 +1374,7 @@ msgstr ""
 msgid "Choose the new size"
 msgstr "Velg den nye st�rrelsen"
 
-#: ../../diskdrake.pm_.c:609 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-#: ../../install_steps_interactive.pm_.c:511
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
 #: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
@@ -3320,7 +3318,7 @@ msgstr "Konfigurer mus"
 msgid "Choose your keyboard"
 msgstr "Velg tastatur"
 
-#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:499
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
@@ -3356,8 +3354,8 @@ msgstr "Konfigurer tjenester"
 msgid "Configure printer"
 msgstr "Konfigurer skriver"
 
-#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:751
-#: ../../install_steps_interactive.pm_.c:752
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Sett root-passord"
 
@@ -3385,7 +3383,7 @@ msgstr "Diskett autoinstallering"
 msgid "Exit install"
 msgstr "Avslutt installering"
 
-#: ../../install_any.pm_.c:583
+#: ../../install_any.pm_.c:584
 msgid "Error reading file $f"
 msgstr "Feil ved lesing av fil $f"
 
@@ -3420,11 +3418,11 @@ msgstr ""
 "Opprett en partisjon for dette (eller klikk p� en eksisterende).\n"
 "Velg s� ``Monteringspunkt'' og  sett dette til `/'"
 
-#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:46
 msgid "You must have a swap partition"
 msgstr "Du m� ha en vekslingspartisjon"
 
-#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:47
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -3610,12 +3608,12 @@ msgstr ""
 "pen m�te.\n"
 "Fortsett p� eget ansvar."
 
-#: ../../install_steps.pm_.c:197
+#: ../../install_steps.pm_.c:196
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Dupliser monteringspunkt %s"
 
-#: ../../install_steps.pm_.c:376
+#: ../../install_steps.pm_.c:375
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -3627,12 +3625,12 @@ msgstr ""
 "Sjekk cd-platen p� en installert maskin med \"rpm -qpl "
 "Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:450
 #, c-format
 msgid "Welcome to %s"
 msgstr "Velkommen til %s"
 
-#: ../../install_steps.pm_.c:663
+#: ../../install_steps.pm_.c:662
 msgid "No floppy drive available"
 msgstr "Ingen diskettstasjon tilgjengelig"
 
@@ -3642,80 +3640,6 @@ msgstr "Ingen diskettstasjon tilgjengelig"
 msgid "Entering step `%s'\n"
 msgstr "Entrer trinn `%s'\n"
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Velg st�rrelsen du �nsker � installere"
-
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Total st�rrelse: "
-
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:353
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Versjon: %s\n"
-
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:354
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "St�rrelse: %d KB\n"
-
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:260
-msgid "Choose the packages you want to install"
-msgstr "Velg pakkene du �nsker � installere"
-
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:263
-msgid "Info"
-msgstr "Info"
-
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:268
-#: ../../install_steps_interactive.pm_.c:216 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Installer"
-
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:466
-#: ../../install_steps_interactive.pm_.c:587
-msgid "Installing"
-msgstr "Installerer"
-
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:472
-msgid "Please wait, "
-msgstr "Vennligst vent, "
-
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:474
-msgid "Time remaining "
-msgstr "Tid som gjenst�r "
-
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:475
-msgid "Total time "
-msgstr "Total tid "
-
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:484
-#: ../../install_steps_interactive.pm_.c:587
-msgid "Preparing installation"
-msgstr "Forbereder installasjon"
-
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:500
-#, c-format
-msgid "Installing package %s"
-msgstr "Installerer pakke %s"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:569
-#: ../../install_steps_gtk.pm_.c:573
-msgid "Go on anyway?"
-msgstr "Fortsette uansett?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:569
-msgid "There was an error ordering packages:"
-msgstr "Det var en feil ved endring av pakkenes rekkef�lge:"
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:992
-msgid "Use existing configuration for X11?"
-msgstr "Bruke eksisterende konfigurasjon for X11?"
-
 #: ../../install_steps_gtk.pm_.c:136
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
@@ -3776,6 +3700,19 @@ msgstr "Du vil kunne velge disse mere spesifisert i neste trinn."
 msgid "Percentage of packages to install"
 msgstr "Prosentdel av pakker � installere"
 
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Velg pakkene du �nsker � installere"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Installer"
+
 #: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Avhengigheter automatisk"
@@ -3801,6 +3738,16 @@ msgstr "D�rlig pakke"
 msgid "Name: %s\n"
 msgstr "Navn: %s\n"
 
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versjon: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "St�rrelse: %d KB\n"
+
 #: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
@@ -3850,10 +3797,26 @@ msgstr ""
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Du kan ikke fjerne denne pakken. Den m� oppgraderes"
 
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Installerer"
+
 #: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Beregner"
 
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Vennligst vent, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Tid som gjenst�r "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Total tid "
+
 #: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
 #: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
 #: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
@@ -3861,11 +3824,20 @@ msgstr "Beregner"
 msgid "Cancel"
 msgstr "Avbryt"
 
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Forbereder installasjon"
+
 #: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pakker"
 
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Installerer pakke %s"
+
 #: ../../install_steps_gtk.pm_.c:531
 msgid ""
 "\n"
@@ -3949,6 +3921,14 @@ msgstr ""
 msgid "Refuse"
 msgstr "Nekte"
 
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Fortsette uansett?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Det var en feil ved endring av pakkenes rekkef�lge:"
+
 #: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Det var en feil ved installering av pakkene:"
@@ -4218,7 +4198,7 @@ msgid "You can choose other languages that will be available after install"
 msgstr "Du kan velge andre spr�k som vil v�re tilgjengelige etter installasjon"
 
 #: ../../install_steps_interactive.pm_.c:173
-#: ../../install_steps_interactive.pm_.c:513
+#: ../../install_steps_interactive.pm_.c:520
 msgid "All"
 msgstr "Alle"
 
@@ -4404,38 +4384,38 @@ msgstr ""
 "Systemet ditt har ikke nok plass for installasjon eller oppgradering (%d > "
 "%d)"
 
-#: ../../install_steps_interactive.pm_.c:453
+#: ../../install_steps_interactive.pm_.c:449
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Ferdig (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:453
+#: ../../install_steps_interactive.pm_.c:449
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimum (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:453
+#: ../../install_steps_interactive.pm_.c:449
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Anbefalt (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:459
+#: ../../install_steps_interactive.pm_.c:455
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../../install_steps_interactive.pm_.c:466
+#: ../../install_steps_interactive.pm_.c:462
 msgid "Select the size you want to install"
 msgstr "Velg st�rrelsen du �nsker � installere"
 
-#: ../../install_steps_interactive.pm_.c:501
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Valg pakkegruppe"
 
-#: ../../install_steps_interactive.pm_.c:514
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Individuelt pakkevalg"
 
-#: ../../install_steps_interactive.pm_.c:563
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -4445,12 +4425,12 @@ msgstr ""
 "Hvis du ikke har noen av CDene, klikk Avbryt.\n"
 "Hvis bare noen av CDene mangler, fjern disse, klikk s� Ok."
 
-#: ../../install_steps_interactive.pm_.c:568
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROM merket \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:596
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -4458,11 +4438,11 @@ msgstr ""
 "Installerer pakke %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:605
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Konfigurasjon postinstallering"
 
-#: ../../install_steps_interactive.pm_.c:630
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4536,92 +4516,92 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:661
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Velg et speil som pakkene kan hentes fra"
 
-#: ../../install_steps_interactive.pm_.c:669
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Kontakter speilet for � f� en liste over tilgjengelige pakker"
 
-#: ../../install_steps_interactive.pm_.c:672
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Vennligst velg pakkene du �nsker � installere."
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
 msgstr "Hva er din tidsone?"
 
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Er maskinvareklokken din satt til GMT?"
 
-#: ../../install_steps_interactive.pm_.c:724
+#: ../../install_steps_interactive.pm_.c:731
 msgid "Which printing system do you want to use?"
 msgstr "Hvilket utskriftsystem �nsker du � bruke?"
 
-#: ../../install_steps_interactive.pm_.c:751
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Intet passord"
 
-#: ../../install_steps_interactive.pm_.c:756
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Bruk skyggefil"
 
-#: ../../install_steps_interactive.pm_.c:756
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "skygge"
 
-#: ../../install_steps_interactive.pm_.c:757
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:757
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Bruk MD5 passord"
 
-#: ../../install_steps_interactive.pm_.c:759
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Bruk NIS"
 
-#: ../../install_steps_interactive.pm_.c:759
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "gule sider"
 
-#: ../../install_steps_interactive.pm_.c:765
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "Dette passordet er for enkelt (m� v�re minst %d tegn langt)"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Autentifikasjon NIS"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS-domene"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS-tjener"
 
-#: ../../install_steps_interactive.pm_.c:798
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Godta bruker"
 
-#: ../../install_steps_interactive.pm_.c:798
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(allerede lagt til %s)"
 
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -4631,48 +4611,48 @@ msgstr ""
 "Entre en bruker\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:801
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Virkelig navn"
 
-#: ../../install_steps_interactive.pm_.c:802 ../../printerdrake.pm_.c:93
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
 #: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Brukernavn"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Skall"
 
-#: ../../install_steps_interactive.pm_.c:809
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../../install_steps_interactive.pm_.c:819
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Dette passordet er for enkelt"
 
-#: ../../install_steps_interactive.pm_.c:820
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Vennligst oppgi et brukernavn"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Brukernavnet kan kun inneholde sm� bokstaver, tall, `-' og `_'"
 
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Denne brukeren er allerede lagt til"
 
-#: ../../install_steps_interactive.pm_.c:846
+#: ../../install_steps_interactive.pm_.c:853
 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 "
@@ -4703,19 +4683,19 @@ msgstr ""
 "en diskett\n"
 "i den f�rste stasjonen og trykk \"Ok\"."
 
-#: ../../install_steps_interactive.pm_.c:862
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "F�rste diskettstasjon"
 
-#: ../../install_steps_interactive.pm_.c:863
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Andre diskettstasjon"
 
-#: ../../install_steps_interactive.pm_.c:864
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Dropp"
 
-#: ../../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -4740,32 +4720,32 @@ msgstr ""
 "etter systemsvikt. �nsker du � opprette en oppstartsdiskett for systemet "
 "ditt?"
 
-#: ../../install_steps_interactive.pm_.c:878
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Beklager, ingen diskettstasjon tilgjengelig"
 
-#: ../../install_steps_interactive.pm_.c:881
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Velg diskettstasjonen du �nsker � bruke for � lage oppstartsdisketten"
 
-#: ../../install_steps_interactive.pm_.c:887
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Sett inn en diskett i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:890
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Oppretter oppstartdiskett"
 
-#: ../../install_steps_interactive.pm_.c:897
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Klargj�r oppstartslaster"
 
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "�nsker du � bruke aboot?"
 
-#: ../../install_steps_interactive.pm_.c:909
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -4773,80 +4753,80 @@ msgstr ""
 "Feil ved installasjon av aboot, \n"
 "pr�ve � installere selv om det �delegger den f�rste partisjonen?"
 
-#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:925
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Installasjon av oppstartslaster mislykket. F�lgende feil oppsto:"
 
-#: ../../install_steps_interactive.pm_.c:932 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Velkommen til Crackers"
 
-#: ../../install_steps_interactive.pm_.c:933 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "D�rlig"
 
-#: ../../install_steps_interactive.pm_.c:934 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Lav"
 
-#: ../../install_steps_interactive.pm_.c:935 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Medium"
 
-#: ../../install_steps_interactive.pm_.c:936 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "H�y"
 
-#: ../../install_steps_interactive.pm_.c:937 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoid"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Forskjellige sp�rsm�l"
 
-#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(kan for�rsake korrupsjon av data)"
 
-#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Bruk harddisk-optimisering?"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Velg sikkerhetsniv�"
 
-#: ../../install_steps_interactive.pm_.c:954
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Presiser RAM-st�rrelse hvis det trengs (funnet %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:956
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Fjernbart media automontering"
 
-#: ../../install_steps_interactive.pm_.c:958
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "T�m /tmp ved hver oppstart"
 
-#: ../../install_steps_interactive.pm_.c:961
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Sl� p� multiprofiler"
 
-#: ../../install_steps_interactive.pm_.c:963
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Sl� p� num lock ved oppstart"
 
-#: ../../install_steps_interactive.pm_.c:966
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Oppgi ram-st�rrelsen i MB"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Kan ikke bruke supermount i h�yt sikkerhetsniv�"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:977
 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"
@@ -4860,7 +4840,7 @@ msgstr ""
 "Mere generelt, ikke forvent � bruke maskinen din til annet enn en tjener.\n"
 "Du har blitt advart."
 
-#: ../../install_steps_interactive.pm_.c:975
+#: ../../install_steps_interactive.pm_.c:982
 msgid ""
 "Be carefull, having numlock enabled causes a lot of keystrokes to\n"
 "give digits instead of normal letters (eg: pressing `p' gives `6')"
@@ -4868,22 +4848,26 @@ msgstr ""
 "V�r forsiktig, � ha numlock sl�tt p� for�rsaker at mange av tastene\n"
 "gir tall istedenfor vanlige bokstaver (f.eks: `p' gir `6')"
 
-#: ../../install_steps_interactive.pm_.c:1021
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Bruke eksisterende konfigurasjon for X11?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 "�nsker du � generere en auto installeringsdiskett for linux replikasjon?"
 
-#: ../../install_steps_interactive.pm_.c:1023
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sett inn en tom diskett i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:1038
-#: ../../install_steps_interactive.pm_.c:1068
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Oppretter diskett for autoinstallasjon"
 
-#: ../../install_steps_interactive.pm_.c:1093
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -4893,7 +4877,7 @@ msgstr ""
 "\n"
 "�nsker du virkelig � avslutte n�?"
 
-#: ../../install_steps_interactive.pm_.c:1102
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -5312,14 +5296,11 @@ msgid "Testing your connection..."
 msgstr "Tester tilkoblingen din..."
 
 #: ../../netconnect.pm_.c:106
-msgid ""
-"The system is now connected to Internet! Congratulation.\n"
-"Feel free to launch draknet at any time to setup your connection.\n"
-msgstr ""
-"Systemet er n� koblet til Internett! Gratulerer.\n"
-"Bruk draknet n�r du vil for � sette opp tilkoblingen din.\n"
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Du er for �yeblikket ikke koblet opp mot Internett."
 
-#: ../../netconnect.pm_.c:108
+#: ../../netconnect.pm_.c:107
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
@@ -5327,13 +5308,13 @@ msgstr ""
 "Det ser ikke ut til at systemet er koblet til Internett.\n"
 "Pr�v � rekonfigurere tilkoblingen din."
 
-#: ../../netconnect.pm_.c:142 ../../netconnect.pm_.c:214
-#: ../../netconnect.pm_.c:233 ../../netconnect.pm_.c:245
-#: ../../netconnect.pm_.c:257
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
 msgid "ISDN Configuration"
 msgstr "ISDN-konfigurasjon"
 
-#: ../../netconnect.pm_.c:142
+#: ../../netconnect.pm_.c:141
 msgid ""
 "Select your provider.\n"
 " If it's not in the list, choose Unlisted"
@@ -5341,115 +5322,115 @@ msgstr ""
 "Velg din tilbyder.\n"
 " Hvis denne ikke er i listen, velg ikke i listen"
 
-#: ../../netconnect.pm_.c:159
+#: ../../netconnect.pm_.c:158
 msgid "Connection Configuration"
 msgstr "Konfigurasjon tilknytning."
 
-#: ../../netconnect.pm_.c:160
+#: ../../netconnect.pm_.c:159
 msgid "Please fill or check the field below"
 msgstr "Vennnligst fyll eller merk feltet under"
 
-#: ../../netconnect.pm_.c:162
+#: ../../netconnect.pm_.c:161
 msgid "Card IRQ"
 msgstr "Kort IRQ"
 
-#: ../../netconnect.pm_.c:163
+#: ../../netconnect.pm_.c:162
 msgid "Card mem (DMA)"
 msgstr "Kort mem (DMA)"
 
-#: ../../netconnect.pm_.c:164
+#: ../../netconnect.pm_.c:163
 msgid "Card IO"
 msgstr "Kort IO"
 
-#: ../../netconnect.pm_.c:165
+#: ../../netconnect.pm_.c:164
 msgid "Card IO_0"
 msgstr "Kort IO_0"
 
-#: ../../netconnect.pm_.c:166
+#: ../../netconnect.pm_.c:165
 msgid "Card IO_1"
 msgstr "Kort IO_1"
 
-#: ../../netconnect.pm_.c:167
+#: ../../netconnect.pm_.c:166
 msgid "Your personal phone number"
 msgstr "Ditt telefonnummer"
 
-#: ../../netconnect.pm_.c:169
+#: ../../netconnect.pm_.c:168
 msgid "Provider name (ex provider.net)"
 msgstr "Navn tilbyder (f.eks. tilbyder.net)"
 
-#: ../../netconnect.pm_.c:170
+#: ../../netconnect.pm_.c:169
 msgid "Provider phone number"
 msgstr "Telefonnummer tilbyder"
 
-#: ../../netconnect.pm_.c:171
+#: ../../netconnect.pm_.c:170
 msgid "Provider dns 1"
 msgstr "Tilbyder dns 1"
 
-#: ../../netconnect.pm_.c:172
+#: ../../netconnect.pm_.c:171
 msgid "Provider dns 2"
 msgstr "Tilbyder dns 2"
 
-#: ../../netconnect.pm_.c:173
+#: ../../netconnect.pm_.c:172
 msgid "Dialing mode"
 msgstr "Oppringningsmodus"
 
-#: ../../netconnect.pm_.c:175
+#: ../../netconnect.pm_.c:174
 msgid "Account Login (user name)"
 msgstr "Logg inn (brukernavn)"
 
-#: ../../netconnect.pm_.c:176
+#: ../../netconnect.pm_.c:175
 msgid "Account Password"
 msgstr "Passord"
 
-#: ../../netconnect.pm_.c:177
+#: ../../netconnect.pm_.c:176
 msgid "Confirm Password"
 msgstr "Bekreft passord"
 
-#: ../../netconnect.pm_.c:209
+#: ../../netconnect.pm_.c:208
 msgid "Europe"
 msgstr "Europa"
 
-#: ../../netconnect.pm_.c:209
+#: ../../netconnect.pm_.c:208
 msgid "Europe (EDSS1)"
 msgstr "Europa (EDSS1)"
 
-#: ../../netconnect.pm_.c:211
+#: ../../netconnect.pm_.c:210
 msgid "Rest of the world"
 msgstr "Resten av verden"
 
-#: ../../netconnect.pm_.c:211
+#: ../../netconnect.pm_.c:210
 msgid "Rest of the world - no D-Channel (leased lines)"
 msgstr "Resten av verden - ingen D-kanal (leid linje)"
 
-#: ../../netconnect.pm_.c:215
+#: ../../netconnect.pm_.c:214
 msgid "Which protocol do you want to use ?"
 msgstr "Hvilken protokoll �nsker du � bruke?"
 
-#: ../../netconnect.pm_.c:225
+#: ../../netconnect.pm_.c:224
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:227
+#: ../../netconnect.pm_.c:226
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:229
+#: ../../netconnect.pm_.c:228
 msgid "I don't know"
 msgstr "Jeg vet ikke"
 
-#: ../../netconnect.pm_.c:234
+#: ../../netconnect.pm_.c:233
 msgid "What kind of card do you have?"
 msgstr "Hva slags kort har du?"
 
-#: ../../netconnect.pm_.c:240
+#: ../../netconnect.pm_.c:239
 msgid "Continue"
 msgstr "Fortsett"
 
-#: ../../netconnect.pm_.c:242
+#: ../../netconnect.pm_.c:241
 msgid "Abort"
 msgstr "Avbryt"
 
-#: ../../netconnect.pm_.c:246
+#: ../../netconnect.pm_.c:245
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -5461,15 +5442,15 @@ msgstr ""
 "\n"
 "Hvis du har et PCMCIA kort m� du vite irq og io for kortet.\n"
 
-#: ../../netconnect.pm_.c:258
+#: ../../netconnect.pm_.c:257
 msgid "Which is your ISDN card ?"
 msgstr "Hvilket er ditt ISDN-kort?"
 
-#: ../../netconnect.pm_.c:282
+#: ../../netconnect.pm_.c:281
 msgid "I have found an ISDN Card:\n"
 msgstr "Jeg har funnet et ISDN-kort:\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../netconnect.pm_.c:287
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -5477,11 +5458,11 @@ msgstr ""
 "Jeg har oppdaget et ISDN PCI-kort, men jeg vet ikke hviklet type. Vennligst "
 "velg et PCI-kort i neste skjermbilde."
 
-#: ../../netconnect.pm_.c:300
+#: ../../netconnect.pm_.c:299
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "Ingen ISDN PCI-kort funnet. Vennligst velg et i neste skjermbilde."
 
-#: ../../netconnect.pm_.c:332
+#: ../../netconnect.pm_.c:331
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
 "I cannot set up this connection type."
@@ -5489,23 +5470,23 @@ msgstr ""
 "Ikke noe ethernet nettverksadapter har blitt oppdaget i systemet ditt.\n"
 "Jeg kan ikke sette opp denne tilkoblingstypen."
 
-#: ../../netconnect.pm_.c:336 ../../standalone/drakgw_.c:222
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
 msgid "Choose the network interface"
 msgstr "Velg nettverksgrensesnitt"
 
-#: ../../netconnect.pm_.c:337
+#: ../../netconnect.pm_.c:336
 msgid ""
 "Please choose which network adapter you want to use to connect to Internet"
 msgstr ""
 "Vennligst velg hvilket nettverksadapter du �nsker � bruke til � koble opp\n"
 "mot Internett"
 
-#: ../../netconnect.pm_.c:352 ../../netconnect.pm_.c:625
-#: ../../netconnect.pm_.c:755 ../../standalone/drakgw_.c:217
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
 msgid "Network interface"
 msgstr "Nettverksgrensesnitt"
 
-#: ../../netconnect.pm_.c:353
+#: ../../netconnect.pm_.c:352
 msgid ""
 "\n"
 "Do you agree?"
@@ -5513,71 +5494,71 @@ msgstr ""
 "\n"
 "Er du enig?"
 
-#: ../../netconnect.pm_.c:353
+#: ../../netconnect.pm_.c:352
 msgid "I'm about to restart the network device:\n"
 msgstr "Jeg er i ferd med � starte denne nettverksenheten p� nytt:\n"
 
-#: ../../netconnect.pm_.c:469
+#: ../../netconnect.pm_.c:468
 msgid "ADSL configuration"
 msgstr "ADSL-konfigurasjon"
 
-#: ../../netconnect.pm_.c:470
+#: ../../netconnect.pm_.c:469
 msgid "Do you want to start your connection at boot?"
 msgstr "�nsker du � starte tilkoblingen din ved oppstart?"
 
-#: ../../netconnect.pm_.c:530
+#: ../../netconnect.pm_.c:529
 msgid "Try to find a modem?"
 msgstr "Pr�ve � finne et modem?"
 
-#: ../../netconnect.pm_.c:540
+#: ../../netconnect.pm_.c:539
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
 
-#: ../../netconnect.pm_.c:545
+#: ../../netconnect.pm_.c:544
 msgid "Dialup options"
 msgstr "Opsjoner oppringt"
 
-#: ../../netconnect.pm_.c:546
+#: ../../netconnect.pm_.c:545
 msgid "Connection name"
 msgstr "Navn tilknytning"
 
-#: ../../netconnect.pm_.c:547
+#: ../../netconnect.pm_.c:546
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: ../../netconnect.pm_.c:548
+#: ../../netconnect.pm_.c:547
 msgid "Login ID"
 msgstr "Login ID"
 
-#: ../../netconnect.pm_.c:550
+#: ../../netconnect.pm_.c:549
 msgid "Authentication"
 msgstr "Autentifikasjon"
 
-#: ../../netconnect.pm_.c:550
+#: ../../netconnect.pm_.c:549
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:550
+#: ../../netconnect.pm_.c:549
 msgid "Script-based"
 msgstr "Scriptbasert"
 
-#: ../../netconnect.pm_.c:550
+#: ../../netconnect.pm_.c:549
 msgid "Terminal-based"
 msgstr "Terminalbasert"
 
-#: ../../netconnect.pm_.c:551
+#: ../../netconnect.pm_.c:550
 msgid "Domain name"
 msgstr "Domenenavn"
 
-#: ../../netconnect.pm_.c:553
+#: ../../netconnect.pm_.c:552
 msgid "First DNS Server"
 msgstr "F�rste DNS-tjener"
 
-#: ../../netconnect.pm_.c:554
+#: ../../netconnect.pm_.c:553
 msgid "Second DNS Server"
 msgstr "Andre DNS-tjener"
 
-#: ../../netconnect.pm_.c:584
+#: ../../netconnect.pm_.c:582
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -5585,7 +5566,7 @@ msgstr ""
 "\n"
 "Du kan koble opp mot Internett eller rekonfigurere tilkoblingen din."
 
-#: ../../netconnect.pm_.c:584 ../../netconnect.pm_.c:588
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
 msgid ""
 "\n"
 "You can reconfigure your connection."
@@ -5593,11 +5574,11 @@ msgstr ""
 "\n"
 "Du kan rekonfigurere tilkoblingen din."
 
-#: ../../netconnect.pm_.c:584
+#: ../../netconnect.pm_.c:582
 msgid "You are not currently connected to Internet."
 msgstr "Du er for �yeblikket ikke koblet opp mot Internett."
 
-#: ../../netconnect.pm_.c:588
+#: ../../netconnect.pm_.c:586
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5605,96 +5586,96 @@ msgstr ""
 "\n"
 "Du kan koble ned eller rekonfigurere tilkoblingen din."
 
-#: ../../netconnect.pm_.c:588
+#: ../../netconnect.pm_.c:586
 msgid "You are currently connected to internet."
 msgstr "Du er for �yeblikket koblet opp mot Internett"
 
-#: ../../netconnect.pm_.c:592
+#: ../../netconnect.pm_.c:590
 msgid "Connect to Internet"
 msgstr "Koble opp mot Internett"
 
-#: ../../netconnect.pm_.c:594
+#: ../../netconnect.pm_.c:592
 msgid "Disconnect from Internet"
 msgstr "Koble ned fra Internett"
 
-#: ../../netconnect.pm_.c:596
+#: ../../netconnect.pm_.c:594
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Konfigurer nettverk-tilkobling (LAN eller Internett)"
 
-#: ../../netconnect.pm_.c:599
+#: ../../netconnect.pm_.c:597
 msgid "Internet connection & configuration"
 msgstr "Internett tilkobling & konfigurasjon"
 
-#: ../../netconnect.pm_.c:626 ../../netconnect.pm_.c:756
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
 msgid ""
 "I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
 "Jeg er i ferd med � starte nettverksenhet $netc->{NET_DEVICE} p� nytt. Er du "
 "enig?"
 
-#: ../../netconnect.pm_.c:643
+#: ../../netconnect.pm_.c:641
 msgid "Configure a normal modem connection"
 msgstr "Konfigurer en normal modem-tilkobling"
 
-#: ../../netconnect.pm_.c:662
+#: ../../netconnect.pm_.c:661
 msgid "Configure an ISDN connection"
 msgstr "Konfigurer en ISDN-tilkobling"
 
-#: ../../netconnect.pm_.c:667
+#: ../../netconnect.pm_.c:666
 msgid "Internal ISDN card"
 msgstr "Internt ISDN-kort"
 
-#: ../../netconnect.pm_.c:669
+#: ../../netconnect.pm_.c:668
 msgid "External ISDN modem"
 msgstr "Eksternt ISDN modem"
 
-#: ../../netconnect.pm_.c:672 ../../netconnect.pm_.c:706
-#: ../../netconnect.pm_.c:718 ../../netconnect.pm_.c:742
-#: ../../netconnect.pm_.c:787
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
 msgid "Connect to the Internet"
 msgstr "Koble opp mot Internett"
 
-#: ../../netconnect.pm_.c:673
+#: ../../netconnect.pm_.c:672
 msgid "What kind is your ISDN connection?"
 msgstr "Hva slags type er ISDN-tilknytningen din?"
 
-#: ../../netconnect.pm_.c:692
+#: ../../netconnect.pm_.c:691
 msgid "Configure a DSL (or ADSL) connection"
 msgstr "Konfigurer en DSL- (eller ADSL) tilkobling"
 
-#: ../../netconnect.pm_.c:701
+#: ../../netconnect.pm_.c:700
 msgid "France"
 msgstr "Frankrike"
 
-#: ../../netconnect.pm_.c:703
+#: ../../netconnect.pm_.c:702
 msgid "Other countries"
 msgstr "Andre land"
 
-#: ../../netconnect.pm_.c:707
+#: ../../netconnect.pm_.c:706
 msgid "In which country are you located ?"
 msgstr "I hvilket land er du ?"
 
-#: ../../netconnect.pm_.c:713
+#: ../../netconnect.pm_.c:712
 msgid "Alcatel modem"
 msgstr "Alcatel modem"
 
-#: ../../netconnect.pm_.c:715
+#: ../../netconnect.pm_.c:714
 msgid "ECI modem"
 msgstr "ECI modem"
 
-#: ../../netconnect.pm_.c:719
+#: ../../netconnect.pm_.c:718
 msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
 msgstr "Hvis adsl modemet ditt er Alcatel, velg Alcatel. ellers, ECI."
 
-#: ../../netconnect.pm_.c:737
+#: ../../netconnect.pm_.c:736
 msgid "use pppoe"
 msgstr "bruk pppoe"
 
-#: ../../netconnect.pm_.c:739
+#: ../../netconnect.pm_.c:738
 msgid "don't use pppoe"
 msgstr "ikke bruk pppoe"
 
-#: ../../netconnect.pm_.c:743
+#: ../../netconnect.pm_.c:742
 msgid ""
 "The most common way to connect with adsl is dhcp + pppoe.\n"
 "However, some connections only use dhcp.\n"
@@ -5704,11 +5685,11 @@ msgstr ""
 "Men, det eksisterer noen tilkoblinger som bare bruker dhcp.\n"
 "Hvis du ikke vet, velg 'bruk pppoe'"
 
-#: ../../netconnect.pm_.c:766
+#: ../../netconnect.pm_.c:765
 msgid "Configure a cable connection"
 msgstr "Konfigurer en kabel-tilkobling"
 
-#: ../../netconnect.pm_.c:788
+#: ../../netconnect.pm_.c:787
 msgid ""
 "Which dhcp client do you want to use?\n"
 "Default is dhcpd"
@@ -5716,31 +5697,31 @@ msgstr ""
 "Hvilken dhcp klient �nsker du � bruke?\n"
 "Standard er dhcpd"
 
-#: ../../netconnect.pm_.c:801
+#: ../../netconnect.pm_.c:800
 msgid "Disable Internet Connection"
 msgstr "Sl� av Internett-tilkobling"
 
-#: ../../netconnect.pm_.c:812
+#: ../../netconnect.pm_.c:811
 msgid "Configure local network"
 msgstr "Konfigurer lokalt nettverk"
 
-#: ../../netconnect.pm_.c:816
+#: ../../netconnect.pm_.c:815
 msgid "Network configuration"
 msgstr "Nettverkskonfigurasjon"
 
-#: ../../netconnect.pm_.c:817
+#: ../../netconnect.pm_.c:816
 msgid "Do you want to restart the network"
 msgstr "Vil du starte nettverket p� nytt"
 
-#: ../../netconnect.pm_.c:825
+#: ../../netconnect.pm_.c:824
 msgid "Disable networking"
 msgstr "sl� av nettverk"
 
-#: ../../netconnect.pm_.c:835
+#: ../../netconnect.pm_.c:834
 msgid "Configure the Internet connection / Configure local Network"
 msgstr "Konfigurer Internett-tilkoblingen / Konfigurer lokalt nettverk"
 
-#: ../../netconnect.pm_.c:836
+#: ../../netconnect.pm_.c:835
 msgid ""
 "Local networking has already been configured.\n"
 "Do you want to:"
@@ -5748,15 +5729,15 @@ msgstr ""
 "Lokalt nettverk har allerede blitt konfigurert.\n"
 "Vil du:"
 
-#: ../../netconnect.pm_.c:837
+#: ../../netconnect.pm_.c:836
 msgid "How do you want to connect to the Internet?"
 msgstr "Hvordan vil du koble opp mot Internett?"
 
-#: ../../netconnect.pm_.c:859
+#: ../../netconnect.pm_.c:858
 msgid "Network Configuration"
 msgstr "Nettverkskonfigurasjon"
 
-#: ../../netconnect.pm_.c:860
+#: ../../netconnect.pm_.c:859
 msgid ""
 "Now that your Internet connection is configured,\n"
 "your computer can be configured to share its Internet connection.\n"
@@ -7083,101 +7064,101 @@ msgid "Finding leaves takes some time"
 msgstr "Finne tillatelser vil ta litt tid"
 
 # ../../share/compssUsers
-msgid "Graphics Manipulation"
-msgstr "Grafisk manipulasjon"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Mere grafiske skrivebord (Gnome, IceWM)"
 
 # ../../share/compssUsers
-msgid "Personnal Finance"
-msgstr "Personlig finans"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment, basis grafikkmilj� med en samling av passende verkt�y"
 
 # ../../share/compssUsers
-msgid "Databases"
-msgstr "Databaser"
-
-msgid "Internet"
-msgstr "Internett"
-
-msgid "Multimedia - Graphics"
-msgstr "Multimedia - Grafikk"
+msgid "Personnal Information Management"
+msgstr "Personling informasjonsh�ndtering"
 
 # ../../share/compssUsers
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Lydrelaterte verkt�y: mp3 eller midi-spillere, miksere etc."
+msgid "Tools to create and burn CD's"
+msgstr "Verkt�y for � opprette og brenne CD'er"
 
-msgid "Multimedia"
-msgstr "Multimedia"
+msgid "Internet Tools"
+msgstr "Internett verkt�y"
 
-msgid "Office"
-msgstr "Office"
+msgid "Internet"
+msgstr "Internett"
 
 # ../../share/compssUsers
-msgid ""
-"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
-"transfer tools"
-msgstr ""
-"Chat (IRC eller �yeblikkelig beskjed) programmer s� som xchat, licq, gaim, "
-"og fil- overf�ringsverkt�y"
+msgid "Personnal Finance"
+msgstr "Personlig finans"
 
 # ../../share/compssUsers
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Sett med verkt�y for � lese og sende e-post og nyheter (pine, mutt, tin...) "
-"og for se p� webben"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm etc"
 
 # ../../share/compssUsers
-msgid "Communication facilities"
-msgstr "Kommunikasjonsfasaliteter"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafiske programmer s� som Gimp"
 
-msgid "KDE"
-msgstr "KDE"
+msgid "Office"
+msgstr "Office"
 
 # ../../share/compssUsers
-msgid "Personnal Information Management"
-msgstr "Personling informasjonsh�ndtering"
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr "Databaseklienter og tjenere (mysql og postgresql)"
 
 # ../../share/compssUsers
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programmer for � h�ndtere dine finanser, s� som gnucash"
-
-msgid "Gnome"
-msgstr "Gnome"
-
-msgid "Documentation"
-msgstr "Dokumentasjon"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Verkt�y for din Palm Pilot eller din Visor"
 
-msgid "Internet Tools"
-msgstr "Internett verkt�y"
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Grafikk"
 
 # ../../share/compssUsers
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm etc"
-
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Lyd"
+msgid "Video players and editors"
+msgstr "Videospillere og redigerere"
 
 # ../../share/compssUsers
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Underholdningsprogrammer: arkade, bordspill, strategi etc"
 
 # ../../share/compssUsers
-msgid "Video players and editors"
-msgstr "Videospillere og redigerere"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kontorprogrammer: tekstbehandlere (kword, abiword), regneark (kspread, "
+"gnumeric), pdf fremvisere etc"
 
 # ../../share/compssUsers
-msgid "Databases clients and servers (mysql and postgresql)"
-msgstr "Databaseklienter og tjenere (mysql og postgresql)"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Sett med verkt�y for � lese og sende e-post og nyheter (pine, mutt, tin...) "
+"og for se p� webben"
 
 # ../../share/compssUsers
-msgid "Sound and video playing/editing programs"
-msgstr "Lyd og bilde avspilling/redigeringsprogrammer"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Lydrelaterte verkt�y: mp3 eller midi-spillere, miksere etc."
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+"Chat (IRC eller �yeblikkelig beskjed) programmer s� som xchat, licq, gaim, "
+"og fil- overf�ringsverkt�y"
 
 # ../../share/compssUsers
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "B�ker og howto's om Linux og fri programvare"
 
 # ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm etc"
+
+# ../../share/compssUsers
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -7185,57 +7166,70 @@ msgstr ""
 "Et grafisk milj� med et brukervennlig sett med applikasjoner og skrivebords- "
 "verkt�y"
 
-msgid "Games"
-msgstr "Spill"
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Sett med verkt�y for e-post, nyheter, web, filoverf�ring og chat"
 
 msgid "Multimedia - Video"
 msgstr "Multimedia - Video"
 
+msgid "KDE"
+msgstr "KDE"
+
 # ../../share/compssUsers
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafiske programmer s� som Gimp"
+msgid "Sound and video playing/editing programs"
+msgstr "Lyd og bilde avspilling/redigeringsprogrammer"
+
+msgid "Multimedia"
+msgstr "Multimedia"
 
 # ../../share/compssUsers
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop Environment, basis grafikkmilj� med en samling av passende verkt�y"
+msgid "Other Graphical Desktops"
+msgstr "Andre grafiske skrivebord"
+
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Lyd"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Dokumentasjon"
 
 # ../../share/compssUsers
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Mere grafiske skrivebord (Gnome, IceWM)"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programmer for � h�ndtere dine finanser, s� som gnucash"
 
 # ../../share/compssUsers
-msgid "Tools to create and burn CD's"
-msgstr "Verkt�y for � opprette og brenne CD'er"
+msgid "Graphics Manipulation"
+msgstr "Grafisk manipulasjon"
+
+msgid "Games"
+msgstr "Spill"
 
 msgid "Multimedia - CD Burning"
 msgstr "Multimedia - CD-brenning"
 
 # ../../share/compssUsers
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Kontorprogrammer: tekstbehandlere (kword, abiword), regneark (kspread, "
-"gnumeric), pdf fremvisere etc"
+msgid "Communication facilities"
+msgstr "Kommunikasjonsfasaliteter"
 
 # ../../share/compssUsers
-msgid "Other Graphical Desktops"
-msgstr "Andre grafiske skrivebord"
+msgid "Databases"
+msgstr "Databaser"
 
-# ../../share/compssUsers
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Verkt�y for din Palm Pilot eller din Visor"
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Velg st�rrelsen du �nsker � installere"
 
-# ../../share/compssUsers
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm etc"
+#~ msgid "Total size: "
+#~ msgstr "Total st�rrelse: "
 
-# ../../share/compssUsers
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Sett med verkt�y for e-post, nyheter, web, filoverf�ring og chat"
+#~ msgid ""
+#~ "The system is now connected to Internet! Congratulation.\n"
+#~ "Feel free to launch draknet at any time to setup your connection.\n"
+#~ msgstr ""
+#~ "Systemet er n� koblet til Internett! Gratulerer.\n"
+#~ "Bruk draknet n�r du vil for � sette opp tilkoblingen din.\n"
 
 #~ msgid "Reconfigure local network"
 #~ msgstr "Rekonfigurer lokalt nettverk"
diff --git a/perl-install/share/po/pl.po b/perl-install/share/po/pl.po
index be0816873..c689d1cfb 100644
--- a/perl-install/share/po/pl.po
+++ b/perl-install/share/po/pl.po
@@ -1,58 +1,110 @@
-# KTranslator Generated File
-# some descriptive title.
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Copyright (c) 1999 MandrakeSoft
-# Pawe� Jab�o�ski <pj@linux-mandrake.com>, 1999.
+# Pawel Jablonski <pj@linux-mandrake.com>, 1999-2000.
 # Wojciech Karas <karas@uci.agh.edu.pl>, 2000
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
-"PO-Revision-Date: 2000-06-05 11:05\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
+"PO-Revision-Date: 2000-10-06 11:32+0200\n"
 "Last-Translator: Pawel Jablonski <pj@linux-mandrake.com>\n"
-"Language-Team: Polish\n"
+"Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=ISO 8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.5.5\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "Konfiguracja podstawowa"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Karta graficzna"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Wybierz kart� graficzn�"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Wybierz X serwer"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X serwer"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: ../../Xconfigurator.pm_.c:220
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Kt�r� konfiguracj� XFree chcesz mie�?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+"Dla Twojej karty akceleracja 3D jest obs�ugiwana tylko przez XFree %s.\n"
+"Posiada ona jednak lepsz� obs�ug� 2D w XFree %s."
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, 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:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s z obs�ug� sprz�towej akceleracji 3D"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+"Dla Twojej karty akceleracja 3D jest obs�ugiwana tylko przez XFree %s.\n"
+"JEST TO ROZWI�ZANIE EKSPERYMENTALNE, MO�E ZAWIESI� KOMPUTER.\n"
+"Dla Twojej karty akceleracja 2D jest obs�ugiwana lepiej przez XFree %s."
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+"Dla Twojej karty akceleracja 3D jest obs�ugiwana przez XFree %s.\n"
+"JEST TO ROZWI�ZANIE EKSPERYMENTALNE, MO�E ZAWIESI� KOMPUTER."
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s z EKSPERYMENTALN� obs�ug� sprz�towej akceleracji 3D "
+
+#: ../../Xconfigurator.pm_.c:265
+msgid "XFree configuration"
+msgstr "Konfiguracja XFree"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Okre�l rozmiar pami�ci karty graficznej"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Wybierz opcje serwera"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Wybierz monitor"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -65,49 +117,49 @@ msgid ""
 "monitor.\n"
 " If in doubt, choose a conservative setting."
 msgstr ""
-"Dwa krytyczne parametry to cz�stotliwo�� synchronizacji pionowej, kt�ra "
-"okre�la\n"
-"jak cz�sto odswie�any jest ca�y ekran, oraz najbardziej istotny - "
-"cz�stotliwo�� synchronizacji poziomej - odswie�ania linii.\n"
+"Dwa krytyczne parametry to cz�stotliwo�� synchronizacji pionowej,\n"
+"kt�ra okre�la, jak cz�sto od�wie�any jest ca�y ekran, oraz najbardziej "
+"istotny\n"
+"- cz�stotliwo�� synchronizacji poziomej - rysowania linii.\n"
 "\n"
 "Jest BARDZO WA�NE aby nie poda� typu monitora o wi�kszym zakresie\n"
-"cz�stotliwo�ci odchylania ni� mo�liwo�ci Twojego monitora, poniewa�\n"
-"mo�e to spowodowa� uszkodzenie Twojego monitora.\n"
+"cz�stotliwo�ci odchylania ni� mo�liwo�ci Twojego monitora,\n"
+"poniewa� mo�e to spowodowa� jego uszkodzenie.\n"
 "Je�li masz w�tpliwo�ci, wybierz bardziej zachowawcze ustawienia."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Cz�stotliwo�� synchronizacji poziomej"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Cz�stotliwo�� synchronizacji pionowej"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Nie skonfigurowano monitora"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Nie skonfigurowano jeszcze karty graficznej"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Nie okre�lono jeszcze rozdzielczo�ci"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Chcesz przetestowa� t� konfiguracj�?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr "Ostrze�enie: testowanie tej karty mo�e by� niebezpieczne"
+#: ../../Xconfigurator.pm_.c:431
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr "Ostrze�enie: testowanie tej karty mo�e zawiesi� komputer"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Test konfiguracji"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -115,186 +167,172 @@ msgstr ""
 "\n"
 "spr�buj zmieni� jakie� parametry"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Wyst�pi� b��d:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Pozostalo %d sekund"
 
-#
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "Dzia�a prawid�owo?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Wyst�pi� b��d, spr�buj zmieni� jakie� parametry"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Automatyczny dob�r rozdzielczo�ci"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"W celu okre�lenia dost�pnych rozdzielczo�ci zostan� wypr�bowane\n"
-"r�ne ustawienia. Ekran mo�e migota�...\n"
-"Je�li chcesz, mo�esz wy��czy� monitor, po zako�czeniu us�yszysz d�wi�k."
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Rozdzielczo��"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Okre�l rozdzielczo�� oraz g��bi� kolor�w"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Karta graficzna: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Serwer XFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Poka� wszystkie"
 
-#
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Rozdzielczo�ci"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Pr�ba wykrycia dost�pnych rozdzielczo�ci (np. 800x600).\n"
-"mo�e spowodowa� w rzadkich przypadkach zawieszenie komputera.\n"
-"Czy chcesz spr�bowa�?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Nie znaleziono dzia�aj�cych tryb�w pracy\n"
-"Wypr�buj inn� kart� graficzn� lub monitor"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Uk�ad klawiatury: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Typ myszy: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Port myszy: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Synchronizacja pozioma monitora: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Synchronizacja pionowa monitora: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Karta graficzna: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
-msgstr "Pami�c karty: %s kB\n"
+msgstr "Pami�� karty: %s kB\n"
+
+#: ../../Xconfigurator.pm_.c:1028
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "Ilo�� kolor�w: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Rozdzielczo��: %s\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Serwer XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "Sterownik XFree86: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Przygotowanie konfiguracji X-Window"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Zmieni� monitor"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Zmieni�  kart� graficzn�"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Zmieni� opcje serwera"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Zmieni� rozdzielczo��"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Automatycznie dobra� rozdzielczo��"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Zobaczy� informacje"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Powt�rnie testowa�"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Wyj��"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Co chcesz zrobi�?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Zignorowa� zmiany?"
+#: ../../Xconfigurator.pm_.c:1082
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"Zachowa� zmainy?\n"
+"Aktualna konfiguracja jest nast�puj�ca:\n"
+"\n"
+"%s"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "By uaktywni� zmiany zaloguj si� ponownie do %s"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Prosz� u�y� Ctrl-Alt-BackSpace po wylogowaniu"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X przy uruchomieniu "
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -302,234 +340,221 @@ msgstr ""
 "Mo�na skonfigurowa� komputer, by X-y by�y automatycznie uruchamiane.\n"
 "Czy chcesz, by X-y uruchamia�y si� po restarcie?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Automatyczne rejestrowanie w systemie"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"Mo�na skonfigurowa� komputer, by automatycznie rejestrowa� u�ytkownika\n"
+"w systemie. Je�li nie chcesz korzysta� z tej mo�liwo�ci, wybierz Anuluj."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Wybierz domy�lnego u�ytkownika:"
+
+#: ../../Xconfigurator.pm_.c:1155
+msgid "Choose the window manager to run:"
+msgstr "Wybierz uruchamianego mened�era okien:"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 kolor�w (8 bit�w)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tysi�ce kolor�w (15 bit�w)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tysi�cy kolor�w (16 bit�w)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 milion�w kolor�w (24 bity)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 miliardy kolor�w (32 bity)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB lub wi�cej"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standard VGA, 640x480 przy 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 przy 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 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:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Extended SVGA, 800x600 przy 60 Hz, 640x480 przy 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Wysokocz�stotliwo�ciowy SVGA, 1024x768 przy 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Wielocz�stotliwo�ciowy do 1280x1024 przy 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Wielocz�stotliwo�ciowy do 1280x1024 przy 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Wielocz�stotliwo�ciowy do 1280x1024 przy 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor do 1600x1200 przy 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor do 1600x1200 przy 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "k�dzierzawa"
-
-#
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "domy�lna"
-
-#
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "krawaciarz"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "brunetk(ka)"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "dziewczynka"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "blondynka"
-
-#
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "automatyczna"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Pierwszy sektor na partycji startowej"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Pierwszy sektor na dysku (MBR)"
 
-#
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr "Instalacja LILO/Grub"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "Instalacja SILO"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
-msgstr "Gdzie chcesz zainstalowa� bootloader?"
+msgstr "Gdzie chcesz zainstalowa� program rozruchowy?"
 
-#
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "Instalacja LILO/Grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
-msgstr "�adnego"
+msgstr "Brak"
 
-#
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
-msgstr "Kt�rego bootloadera chcesz u�y�?"
+msgstr "Jaki program rozruchowy chcesz u�ywa�?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Instalacja programu rozruchowego"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Urz�dzenie startowe"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (nie dzia�a ze starym BIOSem)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Odczytuj du�e bloki"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "(dla dyskietek)"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Op�nienie przed startowaniem domy�lnego obrazu"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Tryb video"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Op�nienie przed uruchomieniem domy�lnego systemu"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Has�o"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Has�o (ponownie)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Ograniczenie opcji linii komend"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "ograniczenie"
 
-#
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
-msgstr "G��wne opcje bootloadera"
+msgstr "Podstawowe opcje programu rozruchowego"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Prosz� spr�bowa� ponownie"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Has�a nie zgadzaj� si�"
 
-#
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -537,229 +562,448 @@ msgstr ""
 "Masz nast�puj�ce pozycje.\n"
 "Mo�esz doda� nast�pne lub zmieni� istniej�ce."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Zrobione"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Jakiego typu pozycj� chcesz doda�?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
-msgid "Other OS (windows...)"
-msgstr "Inny OS (windows...)"
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Inny OS (SunOS...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Jakiego typu pozycj� chcesz doda�?"
+#: ../../any.pm_.c:175
+msgid "Other OS (windows...)"
+msgstr "Inny OS (Windows...)"
 
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Obraz"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Do��cz"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Zapis-odczyt"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Tabela"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Niebezpieczne"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Etykieta"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Domy�lne"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Usu� pozycj�"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Pusta etykieta jest niedozwolona"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Ta etykieta jest ju� u�ywana"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Znaleziono %s  %s interfejs�w"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Masz inne?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Czy masz interfejs %s?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Nie"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Tak"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Instalacja sterownika do karty %s %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(modu� %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Kt�ry sterownik %s wypr�bowa�?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"W pewnych przypadkach sterownik %s potrzebuje dodatkowych\n"
+"informacji do poprawnego dzia�ania, mimo �e zazwyczaj dzia�a\n"
+"bez nich. Czy chcesz poda� dodatkowe parametry, czy te� \n"
+"pozwolisz sterownikowi wykry� je automatycznie?\n"
+"Czasami wykrywanie mo�e zawiesi� komputer, nie powoduje to\n"
+"jednak �adnych problem�w (utraty danych)."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Autodetekcja"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Okre�l parametry"
+
+#: ../../any.pm_.c:551
+#, 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:557
+#, 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 ""
+"Mo�esz przekaza� do modu�u %s parametry.\n"
+"S� one w formacie \"nazwa1=warto��1 nazwa2=warto��2 ...\n"
+"Np. \"io=0x300 irq=7\" "
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Opcje modu�u:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Nieudane za�adowanie modu�u %s.\n"
+"Chcesz spr�bowa� z innymi parametrami?"
+
+# 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)
+#: ../../bootloader.pm_.c:234
+#, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Witamy w programie wybierajacym system - %s\n"
+"\n"
+"Wybierz system operacyjny z listy powyzej lub\n"
+"czekaj %d sekund na domyslny start.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Witamy w programie wybierajacym system - GRUB!"
+
+# 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
+#
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "Uzyj %c i %c klawiszy , aby podswietlic pozycje."
+
+# 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
+#
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr ""
+"Nacisnij Enter, aby zaladowac wybrany system operacyjny, `e' aby wyedytowac"
+
+# 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
+#
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "komendy przed zaladowaniem albo `c' , aby pracowac w linii polecen."
+
+# 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
+#
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "Podswietlony system zostanie uruchomiony po %d sekundach."
+
+#: ../../bootloader.pm_.c:604
+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
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Pulpit"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Menu start"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr "%d minut"
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr "1 minuta"
+
+#: ../../common.pm_.c:614
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekund"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Utw�rz"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Odmontuj"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Usu�"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Formatuj"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Zmie� rozmiar"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Typ"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Punkt montowania"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Zapisz /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Prze��cz na tryb zaawansowany"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Prze��cz na tryb standardowy"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Przywr�� z pliku"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Zapisz do pliku"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "Kreator"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Przywr�� z dyskietki"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Zapisz na dyskietk�"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Wyczy�� wszystko"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Sformatuj wszystko"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Rozmie�� automatycznie"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Wszystkie partycje podstawowe s� u�ywane"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Nie mo�na doda� wi�cej partycji"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr ""
-"By mie� wi�cej partycji, nale�y usun�c jedn�, by by�o mo�liwe utworzenie\n"
-" partycji rozszerzonej"
+"By mie� wi�cej partycji, nale�y usun�� jedn�,\n"
+"by by�o mo�liwe utworzenie partycji rozszerzonej."
 
-#
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Odzyskaj tablic� partycji"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Cofnij"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Zapisz tablic� partycji"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Prze�aduj"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Pusta"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Inna"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Pusta"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Inna"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Typy systemu plik�w:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Szczeg�y"
 
-#
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -768,99 +1012,99 @@ msgid ""
 msgstr ""
 "Na dysku jest jedna wielka partycja FAT.\n"
 "(zazwyczaj u�ywana przez Microsoft Dos/Windows)\n"
-"Proponujemy zacz�� od pomniejszenia partycji\n"
+"Nale�y zacz�� od pomniejszenia tej partycji\n"
 "(kliknij na partycji, po czym kliknij na \"Zmie� rozmiar\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
-msgstr "Najpierw zarchiwizuj swoje dane"
+msgstr "Prosz� zacz�� od archiwizacji danych"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Czytaj uwa�nie!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 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"
+"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:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Uwa�aj: ta operacja jest niebezpieczna"
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "B��d"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Punkt montowania: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Urz�dzenie: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "Dosowy dysk: %s (przypuszczalnie)\n"
+msgstr "Dosowy dysk: (przypuszczalnie %s)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Rodzaj: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
-msgstr "Start: sektor Nr %s\n"
+msgstr "Start: sektor  %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Rozmiar: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektor�w"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Cylinder %d do cylindra %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Sformatowana\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Nie sformatowana\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Zamontowano\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Plik(i) \"loopback\":%s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -868,79 +1112,79 @@ msgstr ""
 "Domy�lna partycja startowa\n"
 "    (dla startu MS-DOS, nie dla lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Poziom %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Rozmiar kawa�ka %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "Dyski RAID %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Nazwa pliku \"loopback\":%s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Prosz� klikn�� na partycji"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Rozmiar: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, 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:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Typ tabeli partycji: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
-msgstr "Na szynie %d id %d\n"
+msgstr "na szynie %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Montuj"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Aktywuj"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Dodaj do RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Usu� z RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Modyfikuj RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "U�yj dla loopback"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Wybierz czynno��"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -949,10 +1193,10 @@ msgid ""
 msgstr ""
 "Niestety, nie mo�na utworzy� /boot tak daleko na dysku (poza cylindrem "
 "1024)\n"
-"Albo u�yjesz LILO, (nie b�dzie dzia�a�), lub nie b�dziesz u�ywa� LILO\n"
+"Albo u�yjesz LILO, (nie b�dzie dzia�a�), lub nie b�dziesz u�ywa� lilo\n"
 "i nie potrzebujesz /boot"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -960,69 +1204,69 @@ msgid ""
 "If you plan to use the LILO boot manager, be careful to add a /boot partition"
 msgstr ""
 "Doda�e� partycj� root (/) na dysku poza cylindrem 1024, nie ma te�\n"
-"partycji /boot. Je�eli wi�c chcesz u�ywa� boot menad�era lilo\n"
+"partycji /boot. Je�eli wi�c chcesz u�ywa� programu rozruchowego lilo\n"
 "dodaj partycj� /boot poni�ej cylindra 1024"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
-"Wybra�e� jako partycj� root (/) softwarowy RAID.\n"
-"�aden bootloader nie jest w stanie obs�u�y� jej bez partycji /boot\n"
-".Pami�taj wi�c o dodaniu partycji /boot, je�li chcesz u�ywa� grub lub lilo"
+"Wybra�e� jako partycj� root (/) programowy RAID.\n"
+"�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:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "U�yj zamiast tego ``%s'' "
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Najpierw ``Odmontuj'' "
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, 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:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Kontynuowa� mimo to?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Wyj�cie bez zapisywania"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Opu�ci� program bez zapisywania tabeli partycji?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Zmiana typu partycji"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Jaki typ partycji wybierasz?"
+#: ../../diskdrake.pm_.c:471
+msgid "Which filesystem do you want?"
+msgstr "Jaki system plik�w chcesz wykorzysta�?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 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:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Gdzie chcesz zamontowa� plik ``loopback'' %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Gdzie chcesz zamontowa� urz�dzenie %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1030,141 +1274,143 @@ msgstr ""
 "Nie mo�na odmontowa� tej partycji, gdy� jest u�ywana przez loopback.\n"
 "Usu� najpierw loopback."
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, 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:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Formatowanie"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formatowanie pliku loopback %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formatowanie partycji %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Po sformatowaniu wszystkich partycji,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "wszystkie dane znajduj�ce si� na nich zostan� utracone"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Przesu�"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Na kt�ry  dysk chcesz przenie�� ?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Na kt�ry sektor chcesz przenie�� ?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Przenoszenie"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Przenoszenie partycji..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, 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!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
-msgstr "Nale�y zrestartowa� komputer przed uaktywnieniem modyfikacji"
+msgstr "Nale�y zrestartowa� komputer przed uaktywnieniem zmian"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Obliczanie granic systemu plik�w FAT"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Zmiana rozmiaru"
 
-#
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+msgid "This partition is not resizeable"
+msgstr "Tej partycji nie mo�na zmniejszy�"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "Wszystkie dane na tej partycji powinny zosta� zarchiwizowane"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, 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.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Okre�l nowy rozmiar"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Utw�rz now� partycj�"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Sektor startowy: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Rozmiar w MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Typ systemu plik�w: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Preferencja:"
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Ta partycja nie mo�e by� u�yta przez loopback."
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Nazwa pliku \"loopback\": "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "Plik jest u�ywany przez urz�dzenie typu \"loopback\", wybierz inny"
 
-#
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "Plik ju� istnieje. U�y� go?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1172,11 +1418,11 @@ msgstr ""
 "Zapasowa tablica partycji ma inny rozmiar\n"
 "Kontynuowa�?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Ostrze�enie"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1184,79 +1430,79 @@ msgstr ""
 "W�� dyskietk� do stacji.\n"
 "Wszystkie dane na niej zostan� utracone"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Pr�ba odzyskania tablicy partycji"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "urz�dzenie"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "poziom"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "rozmiar kawa�ka"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Wybierz istniej�cy RAID aby doda� do niego"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "nowy"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formatowania z %s nieudane"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Nie wiem jak sformatowa� %s typu %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "nieudane montowanie nfs"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "nieudane montowanie"
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "b��d odmontowania %s; %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Punkty montowania musz� zaczyna� si� od /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Istnieje partycja z punktem montowania %s\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Zap�tlone montowanie %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr "Ten katalog powinien by� wewn�trz systemu plik�w / (root)"
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
-"Potrzebujesz porz�dnego systemu plik�w (ext2,reiserfs) dla tego punku "
-"montowania\n"
+"Dla tego punktu montowania potrzebujesz porz�dnego systemu plik�w "
+"(ext2,reiserfs)\n"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "B��d otwarcia %s do zapisu: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1264,76 +1510,124 @@ 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:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Nie masz �adnych partycji!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
-msgstr "Wybierz j�zyk instalacji i u�ywania systemu."
+#: ../../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:10
+#: ../../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 ""
+"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."
+
+#: ../../help.pm_.c:22
 msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Wybierz odpowiedni uk�ad klawiatury z listy powy�ej"
+msgstr "Wybierz odpowiedni j�zyk i uk�ad klawiatury z listy powy�ej"
 
-#
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:25
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"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"
 "\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).\n"
 "\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
-"  - 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"
+"\t* Recommanded: 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"
-"  - 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"
+"\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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 ""
-"Wybierz \"Instalacja\" je�li nie masz zainstalowanej �adnej starszej wersji\n"
-"Linuxa, lub je�li chcesz u�ywa� wielu dystrybucji lub wersji.\n"
+"Wybierz \"Instalacja\" je�li nie masz zainstalowanej starszej wersji\n"
+"Linux-Mandrake, lub je�li chcesz u�ywa� wielu dystrybucji lub wersji.\n"
 "\n"
-"Wybierz \"Aktualizacja\" je�li chcesz zaktualizowa� poprzedni� wersj�\n"
-" Mandrake Linux: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 "
-"(Helios), Gold 2000 or 7.0 (Air).\n"
 "\n"
+"Wybierz \"Aktualizacja\" je�li chcesz zaktualizowa� ju� zainstalowan� wersj� "
+"Mandrake Linux:\n"
 "\n"
-"Wybierz:\n"
 "\n"
-"  - Automatyczna (zalecane): Wybierz, je�li nie instalowa�e� Linuxa nigdy "
-"wcze�niej\n"
-"     UWAGA: sie� nie jest konfigurowana w czasie instalacji, u�yj "
-"\"LinuxConf\"    by j� skonfigurowa� po zako�czeniu instalacji\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"
 "\n"
-"  - U�ytkownika: Je�li jeste� obeznany z GNU/Linux, mo�esz okre�li�\n"
-"    podstawowe zastosowanie komputera. Szczeg�y poni�ej\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"
 "\n"
-"  - Dla eksperta: �wietnie znasz  GNU/Linux i chcesz zainstalowa� go\n"
-"    w nietypowy, odpowiedni dla Ciebie spos�b . Podobnie jak w klasie "
-"instalacji\n"
-"    \"U�ytkownika\" masz mo�liwo�c okre�lenia zastosowania systemu\n"
-"    Ale bardzo, bardzo prosimy, NIE WYBIERAJ TEJ OPCJI, JE�LI NIE WIESZ CO "
-"ROBISZ!\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 "
+"sposobieinstalacji \"Zalecany\".\n"
+"\t  tak wi�c powiniene� troch� zna� GNU/Linuksa, by wybra� ten "
+"rodzajinstalacji\n"
+"\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."
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1341,12 +1635,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Wybierz:\n"
 "\n"
@@ -1354,94 +1649,97 @@ msgstr ""
 "  - U�ytkownika: Je�li jeste� obeznany z Linuxem, masz mo�liwo��\n"
 "     okre�lenia zastosowania zainstalowanego systemu. Szczeg�y poni�ej\n"
 "\n"
-"- Dla eksperta: �wietnie znasz  GNU/Linux i chcesz zainstalowa� go\n"
-"    w nietypowy, odpowiedni dla Ciebie spos�b . Podobnie jak w klasie "
-"instalacji\n"
-"    \"U�ytkownika\" masz mo�liwo�c okre�lenia zastosowania systemu\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!\n"
+"ROBISZ!"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
-"R�ne przeznaczenia twojej maszyny ( zak�adam, �e wybra�e� wcze�niej\n"
-"opcj� \"uzytkownika\" lub \"ekspert\" ) to:\n"
+"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"
 "\n"
-"  - Typowa: wybierz j�, je�eli chcesz u�ywa� komputera do codziennej pracy\n"
-"    typu biurowego ( edycja, grafika i.t.d.). Nie oczekuj instalacji �adnych "
 "\n"
-"    narz�dzi programowych.\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"
 "\n"
-"  - Programowanie: wybierz t� opcj�, je�eli chcesz si� pos�ugiwa� "
-"komputerem\n"
-"    do tworzenia oprogramowania. Zostan� zainstalowane pakiety, "
-"umo�liwiaj�ce \n"
-"    kompilacj� , debugowanie program�w oraz tworzenie pakiet�w "
-"oprogramowania.\n"
 "\n"
-"  - Serwer: wybierz t� opcj�, je�eli twoja maszyna ma s�u�y� jako serwer - \n"
-"    plik�w (NFS lub SMB ), serwer drukarek uniksowy - lp lub \"windo�sowy\"\n"
-"    (SMB), serwer NIS, serwer baz danych itp.\n"
-"    Nie oczekuj wtedy �adnych kwiatk�w do ko�ucha typu KDE lub GNOME\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."
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 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"
-"\n"
 "Je�li posiadasz kontroler  SCSI ISA, lub PCI, ale DrakX nie\n"
-"wykry� sterownika do niego, lub je�li nie masz kontroler�w SCSI\n"
-"zostaniesz o to zapytany. Je�li nie masz �adnego, odpowiedz\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"
-"lista sterownik�w, z kt�rej nale�y wybra� w�a�ciwy.\n"
+"w�wczas lista sterownik�w, z kt�rej nale�y wybra� w�a�ciwy.\n"
 "\n"
 "\n"
 "Po wybraniu sterownika, DrakX spyta Ci�, czy chcesz okre�li�\n"
@@ -1450,47 +1748,217 @@ msgstr ""
 "\n"
 "\n"
 "Je�li nie, podaj sterownikowi opcje znalezione w dokumentacji,\n"
-"lub takie, jak w Windows (je�li je posiadasz)"
+"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:94
+#: ../../help.pm_.c:108
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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."
+msgstr ""
+"W tym etapie instalacji okre�lasz, gdzie na dysku zostanie zainstalowany\n"
+"Linux-Mandrake. Je�li dysk jest pustylub istniej�ce systemy operacyjne\n"
+"zajmuj� ca�e dost�pne miejsce, nale�y podzieli� dysk na partycje\n"
+"Partycjonowanie to po prostu logiczny podzia� twrdego dysku na oddzielne\n"
+"obszary w celu zainstalowania systemu Linux-Mandrake\n"
+"\n"
+"\n"
+"Poniewa� efekt partycjonowania jest nieodwracalny, czynno�� wydaje si�\n"
+"straszna i jest stresuj�ca dla niedo�wiadczonych u�ytkownik�w.\n"
+"Kreator ten upraszcza ten proces, tak wi�c nie si� czego obawia�,\n"
+"tym niemniej warto po�wi�ci� nieco czasu na wcze�niejsze\n"
+"zapoznanie si� z dokumentacj�\n"
+"\n"
+"\n"
+"Niezb�dne s� co najmniej 2 partycje: jedna dla systemu operacyjnego\n"
+"oraz druga na pami�� wirtualn� (swap).\n"
+"\n"
+"\n"
+"Je�li partycje tes ju� zosta�y utworzone (w czasie poprzedniej instalacji\n"
+"lub przy pomocy innego narz�dzia), nale�y je wybra� do zainstalowania\n"
+"systemu Linux\n"
+"\n"
+"\n"
+"Je�li partcje te nie istniej� , nale�y je utworzy�.\n"
+"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 "
+"istniej�cych partycji linuksowych,\n"
+"\t   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"
+"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"
 "\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"
+"\t*  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 "
+"eksperta\") lub zmieni�\n"
+"\t  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-Mandrake, jak i Windows\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"
+"\t  Nale�y pami�ta�, �e w ten spos�b partycja Windows b�dzie mniejsza ni� "
+"dotej pory. Oznacza to\n"
+"\t mniej wolnego miejsca na dane oraz instalacj� nowych program�w\n"
 "\n"
 "\n"
-"You can reach any option using the keyboard: navigate through the "
+"\t* 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!"
+
+#: ../../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"
-"using Tab and Up/Down arrows. When a partition is selected, you can use:\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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\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"
 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"
@@ -1499,388 +1967,934 @@ msgstr ""
 "na na oddzielne obszary\n"
 "\n"
 "\n"
-"Je�li zak�adasz nowe partycje, u�yj przycisku \"Rozmie�� automatycznie\", "
-"by\n"
-"je utworzyc. Nale�y wcze�niej okre�li� dysk, na kt�rym maj� by� za�o�one\n"
-"partycje - hda dla pierwszego dysku IDE, hdb dla drugiego, sda, dla\n"
-"pierwszego dysku SCSI.\n"
+"Utworzenie partycji nale�y rozpocz�� os wybrania dysku. Robi si� to przez\n"
+"klikni�cie na zak�adce \"hda\" dla pierwszego dysku IDE, \"hdb\" dla "
+"drugiego,\n"
+"lub \"sda1\" dla pierwszego dysku SCSI, itd.\n"
 "\n"
 "\n"
-"Dwie podstawowe partycje to partycja / (root)  b�d�ca punktem startowym\n"
-"systemu plik�w oraz ma�a partycja /boot zawieraj�ca pliki konieczne do\n"
-"uruchomienia systemu Linux po w��czeniu komputera\n"
+"W celu podzielenia dysku na partycje mo�na u�y� nast�puj�cych opcji:\n"
 "\n"
+"   * Wyczy�� wszystko: ta opcja kasuje wszystkie partycje na wybranym "
+"dysku.\n"
 "\n"
-"Poniewa� efekt partycjonowania jest nieodwracalny, czynno�� wydaje si�\n"
-"straszna i stresuj�ca dla niedo�wiadczonych u�ytkownik�w. DiskDrake \n"
-"upraszcza ten proces, tak wi�c nie si� czego obawia�, tym niemniej warto\n"
-"po�wi�ci� nieco czasu na wcze�niejsze zapoznanie si� z dokumentacj�\n"
+"\n"
+"   * Rozmie�� automatycznie: ta opcja automatycznie tworzy partycje ext2\n"
+"oraz swap na wolnym (niespartycjonowanym) miejscu dysku\n"
+"\n"
+"\n"
+"   * Odzyskaj tablic� partycji: je�li tablica partycji jest uszkodzona, "
+"mo�na\n"
+"spr�bowa� j� odzyska� przy pomocy tej opcji. B�d� ostro�ny i pami�taj,\n"
+"�e ta opcja mo�e zawie��\n"
+"\n"
+"\n"
+"   * Cofnij: u�yj tej opcji by anulowa� zmiany.\n"
+"\n"
+"\n"
+"   * Prze�aduj: u�yj tej opcji, je�li chcesz cofn�� wszystkie zmiany i "
+"za�adowa�\n"
+"pocz�tkow� tablic� partycji\n"
+"\n"
+"\n"
+"   * Kreator: Mo�esz u�y� kreatora, kt�ry pomo�e Ci podzieli� dysk na "
+"partycje\n"
+"Zalecane, je�li niewiele wiesz o podziale na partycje.\n"
+"\n"
+"\n"
+"   * Przywr�� z dyskietki: je�li podczas poprzedniej instalacji zapisa�e� "
+"tabel�\n"
+"partycji na dyskietce, mo�esz odzyska� j� korzystaj�c z tej opcji.\n"
+"\n"
+"\n"
+"   * Zapisz na dyskietk�: Mo�esz zapisa� na dyskietk� tablic� partycji, by "
+"mie�\n"
+"mo�liwo�� jej odzyskania w przypadku pomy�ki\n"
+"U�ycie tej opcji jest bardzo zalecane\n"
+"\n"
+"\n"
+"   * Zrobione: po zako�czeniu partycjonowania dysku u�yj tej opcji do "
+"zapisania\n"
+"na dysku zmian.\n"
+"\n"
+"\n"
+" Mo�esz wybra� odpowiedni� opcj� u�ywaj�c klawisza \n"
+"TAB i strza�ek g�ra/d� klawiatury. \n"
 "\n"
 "\n"
-" Mo�esz wybra� odpowiedni� opcj� u�ywaj�c przycisk�w \n"
-"TAB i strza�ek g�ra(d�) z klawiatury. \n"
 "Po wybraniu partycji mo�esz nacisn��:\n"
-"- Ctrl-c by utworzy� now� partycj� ( je�eli zosta�a zaznaczony pusty obszar\n"
 "\n"
-"- Ctrl-d by usun�� partycj�\n"
+"           * Ctrl-c by utworzy� now� partycj� ( je�eli zosta� wybrany pusty "
+"obszar\n"
+"\n"
+"           * Ctrl-d by usun�� partycj�\n"
+"\n"
+"           * Ctrl-m by okre�li� punkt montowania"
+
+#: ../../help.pm_.c:218
+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 ""
+"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:252
+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 skasowa�, 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:257
+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"
+"\n"
+"Wybierz \"Anuluj\", by anulowa� t� operacj� bez utraty danych."
+
+#: ../../help.pm_.c:267
+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 ""
+"Na dysku wykryto wi�cej ni� jedn� partycj� Windows. Wybierz, kt�r�\n"
+"z nich chcesz zmniejszy� w celu zainstalowania Linux-Mandrake\n"
+"\n"
 "\n"
-"- Ctrl-m by okre�li� punkt montowania\n"
+"Dla informacji, ka�da partycja jest okre�lona przez\n"
+" \"Nazw� linuksow�\", \"Nazw� Windows\" i \"Rozmiar\".\n"
+"\n"
+"\n"
+"Nazwa linuksowa 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.\n"
+"\n"
+"\"Nazwa Windows\" to litera dysku pod Windows (pierwszy dysk \n"
+"lub partycja to \"C:\")."
+
+#: ../../help.pm_.c:300
+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:131
+#: ../../help.pm_.c:303
 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."
+"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 ""
-"Wszystkie nowo utworzone partycje musz� by� sformatowane przed\n"
-"u�yciem (formatowanie tj. utworzenie systemu plik�w). Mo�esz teraz\n"
-"powt�rnie sformatowa� wcze�niej istniej�ce partycje, by usun��\n"
-"znajduj�ce si� na nich dane. Uwaga: nie jest konieczne powt�rne\n"
-"formatowanie wcze�niej za�ozonych partycji, szczeg�lnie, je�li\n"
-"zawieraj� one pliki lub dane, kt�re chcesz zachowa�.\n"
-"Zwykle zachowywane s� /home oraz /usr/local."
+"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 knieczne 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"
+"\n"
+"Wybierz \"OK\", je�li jeste� ju� gotowy do formatowania partycji.\n"
+"\n"
+"\n"
+"Wybierz \"Anuluj\", je�li chcesz wybra� do zainstalowania\n"
+"Linuksa-Mandrake inne partycje."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
 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\n"
-"the 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\n"
-"through more than 1000 packages..."
-msgstr ""
-"Mo�esz teraz wybra� grup� pakiet�w, kt�re chcesz \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"
-"DrakX sprawdzi, czy masz na to do�� miejsca na dysku. Je�eli nie, to\n"
-"zostaniesz ostrze�ony. Jednak je�eli postanowisz mimo to kontynuowa�,\n"
-"to cz�� mniej wa�nych pakiet�w nie zostanie zainstalowana.\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 wi�cej ni� 1000 pakiet�w ..."
 
-#: ../../help.pm_.c:150
-msgid ""
-"If you have all the CDs in the list above, 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 ""
-"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:155
-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."
-msgstr ""
-"Wybrane pakiety s� teraz instalowane. Operacja ta trwa zazwyczaj\n"
-"kilkana�cie minut, jedynie w przypadku aktualizacji istniej�cego\n"
-"systemu przygotowywanie akualizacji mo�e trwa� d�u�ej"
-
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:341
 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 choose individually all the packages you\n"
+"wish to install.\n"
 "\n"
 "\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
+"You can expand or collapse the tree by clicking on options in the left "
+"corner of\n"
+"the packages window.\n"
 "\n"
 "\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"Je�li DrakX nie wykryje myszy, lub je�li chcesz sprawdzi�\n"
-"jak� wykry�, zobaczysz powy�ej list� typ�w myszy\n"
+"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"
-"Je�li zgadzasz si� z ustawieniami DrakX, przeskocz t� sekcj�\n"
-"przez klikni�cie w menu z lewej strony. W przeciwnym razie\n"
-"wybierz z menu w�a�ciwy typ myszy\n"
+"Klikni�cie na \"Prze��cz mi�dzy p�askim i grupowym sortowaniem\"\n"
+"umo�liwia zobaczenie pakiet�w posortowanych alfabetycznie\n"
 "\n"
 "\n"
-"W przypadku myszy szeregowej, nale�y takze wskaza�, do \n"
-"kt�rego portu szeregowego jest ona pod��czona"
+"Je��i nie chcesz by� informowany o zalezno�ciach miedzy pakietami,\n"
+"kliknij na \"Automatyczne sprawdzanie zale�no�ci\". Po w��czeniu tej opcji\n"
+"odznaczenie pakietu spowoduje automatyczne odznaczenie innych pakiet�w,\n"
+"kt�re wymagaj� go do dzia�anie."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:358
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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 ""
-"Wybierz w�a�ciwy port. Np. dosowski COM1 odpowiada \n"
-"linuxowemu ttyS0"
+"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:180
+#: ../../help.pm_.c:363
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"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"
-"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"
+"Please be patient."
+msgstr ""
+"Trwa instalacje 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"
-"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"
+"B�d� cierpliwy."
+
+#: ../../help.pm_.c:371
+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."
+
+#: ../../help.pm_.c:376
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows 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:380
+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 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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"Ta sekcja umo�liwia konfiguracj� sieci lokalnej (LAN) lub po��czenia\n"
-"modemowego.\n"
+"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"
-"Je�li wybierzesz \"Sie� lokalna\", DrakX spr�buje wykry� kart� sieciow�\n"
-"znajduj�c� si� w Twoim komputerze. Karty PCI powinny zosta�\n"
-"wykryte i uruchomione automatycznie. Je�li jednak posiadasz kart� ISA,\n"
-"autodetekcja nie zadzia�a, nale�y w�wczas samodzielnie wybrac w�a�ciwy\n"
-"sterownik z listy.\n"
 "\n"
+"Je�li nie u�ywasz sieci lokalnej ani Internetu, wybierz\n"
+"\"Wy��czenie siecie\".\n"
 "\n"
-"Podobnie jak w przypadku kontrolera SCSI, mo�esz pozwoli� \n"
-"sterownikowi samodzielnie wykry� ustawienia. Je�li si� to nie\n"
-"powiedzie, podaj dane z dokumentacji Windows.\n"
 "\n"
+"Je�li chcesz skonfigurowa� sie� po instalacji, lub  zako�czy�e�\n"
+"konfigurowanie sieci, wybierz \"Zrobione\"."
+
+#: ../../help.pm_.c:393
+msgid ""
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"Je�li instalujesz Linux-Mandrake na komputerze b�d�cym cz�ci�\n"
-"istniej�cej sieci, administrator sieci poda Ci wszystkie konieczne\n"
-"informacje (adres IP, mask� sieci, nazw� hosta). Je�li konfigurujesz\n"
-"prywatn� sie� np. w domu, powiniene� sam okre�li� adresy\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"
-"Wybierz \"��czno�� przez modem\", by skonfigurowa� po��czenie \n"
-"z internetem. DrakX spr�buje wykry� Tw�j modem. \n"
-"Je�li si� to nie powiedzie,nale�y wybra� port, do kt�rego\n"
-"pod��czony jest modem"
+"Dla informacji: pierwszy port szeregowy (COM1 w Windows)\n"
+"w GNU/Linux nazywa si� \"ttyS0\". "
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:400
 msgid ""
-"Enter:\n"
-"\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
-"\n"
+"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 jeste� pewien, 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:407
+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:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr "W��cz modem i wybierz w�asciwy model."
+
+#: ../../help.pm_.c:413
+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 este� pewien, �e powy�sze informacje s� prawid�owe, lub\n"
+"lub nie jeste� pewien, 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:420
+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:425
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
 "Podaj:\n"
 "\n"
-" - adres IP, je�eli go nie znasz, spytaj administratora sieci.\n"
+" - adres IP, je�eli go nie znasz, spytaj administratora sieci\n"
 "\n"
 "\n"
 " - mask� sieci, \"255.255.255.0\" na og� dzia�a. \n"
 "Je�eli  nie jeste� pewien, spytaj administratora sieci.\n"
 "\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"
+" 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:437
+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 "
+"odadministratora sieci."
+
+#: ../../help.pm_.c:441
+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:225
+#: ../../help.pm_.c:445
 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, "
+"Mo�esz teraz poda� opcje po��czenia modemowego. Je�eli ich nie znasz, \n"
 "skontaktuj si� z dostawc� Internetu (ISP)."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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�eli b�dziesz u�ywa� proxy, skonfiguruj go teraz.\n"
+"Je�eli 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:233
+#: ../../help.pm_.c:453
 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"
-"internetowe zosta�o odpowiednio skonfigurowane. Najpierw wybierz mirror \n"
+"Mo�esz u�y� pakiet�w kryptograficznych, je�eli Twoje po��czenie \n"
+"z Internetem zosta�o odpowiednio skonfigurowane. Najpierw wybierz mirror \n"
 "(miejsce, sk�d chcesz �ci�ga� pakiety) i wybierz pakiety do instalacji\n"
 "\n"
-"Pami�taj, �e musisz dzia�a� zgodnie z prawem."
+"\n"
+"Pami�taj, �e wyb�r mirrora i pakiet�w musi by� zgodny z prawem."
+
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr "Nale�y teraz okre�li� stref� czasow� miejsca, w kt�rym przebywasz."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:465
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
-"Nale�y teraz wybra� stref� czasow� odpowiadaj�c� miejscu Twojego\n"
-"zamieszkania\n"
+"GNU/Linux korzysta z czasu GMT \"Czas uniwersalny Greenwich\" t�umacz�c go\n"
+"na czas lokalny odpowiednio do wybranej strefy czasowej.\n"
 "\n"
-"\n"
-"Linux korzysta z czasu GMT \"Czas uniwersalny Greenwich\" t�umacz�c go\n"
-"na czas lokalny odpowiednio do wybranej strefy czasowej."
+"Je�li u�ywasz te� Windows na tym komputerze, wybierz \"Nie\"."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 "
+"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, bo niekt�rych us�ug nie b�dziesz chcia� "
-"uruchamia�"
+"swojej maszyny jako serwera, bo 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:257
+#: ../../help.pm_.c:486
 msgid ""
-"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"
+"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:490
+msgid ""
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"Linux obs�uguje wiele typ�w drukarek. Ka�dy typ wymaga innej\n"
-"konfiguracji. Pami�taj, �e domy�lna drukarka w systemie nazywa si�\n"
-"'lp'. Jedna drukarka mo�e mie� wiele nazw, oddzielonych znakiem '|'\n"
-"Je�li wi�c lubisz przyjazne nazwy, mo�esz z nich korzysta�:\n"
-"np. \"Moja drukarka|lp\".\n"
+"Je�li chcesz uaktywni� mo�liwo�� drukowania, wybierz system drukowania\n"
+"(dost�pne s� CUPS i LPR)\n"
 "\n"
 "\n"
-"Je�li Twoja drukarka jest bezpo�rednio pod��czona do komputera, wybierz\n"
-"\"Drukarka lokalna\". Nast�pnie okre�l port, do kt�rego jest pod��czona\n"
-"oraz wybierz w�asciwy filtr (sterownik)\n"
+"CUPS to nowy, silny i elastyczny system drukowania dla system�w Unixowych\n"
+"(CUPS oznacza \"Common Unix Printing System\"). Jest to domy�lny system\n"
+"wydruku w Linux-Mandrake.\n"
 "\n"
 "\n"
-"Je�li chcesz uzyska� dost�p do drukarki za�o�onej na zdalnej maszynie\n"
-"Unixowej, powiniene� wybra� \"Zdaln� kolejk� lpd\".Do jej pracy nie\n"
-"trzeba podawa� u�ytkownika ani has�a, wystarczy zna� nazw� serwera\n"
-"oraz nazw� kolejki na serwerze\n"
+"LPR to stary system wydruku u�ywany w poprzednich\n"
+" wersjach Linux-Mandrake.\n"
 "\n"
 "\n"
-"Je�li chcesz mie� dost�p do drukarki SMB (to znaczy za�o�onej na\n"
-"zdalnym komputerze Windows 9x/NT), musisz okre�li� jego nazw� SMB\n"
-"(nie zawsze jest ona r�wnoznaczna z nazw� TCP/IP), adres TCP/IP\n"
-"nazw� u�ytkownika, grup�, has�o oraz oczywi�cie nazw� drukarki.\n"
-"Podobnie jest w przypadku drukarki NetWare (poza informacj� o grupie)"
+"Je�li nie u�ywasz drukarki, wybierz \"Brak\"."
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:505
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"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"
+"w�asnej konfiguracji.\n"
+"\n"
+"\n"
+"Je�li drukarka jest fizycznie pod��czona do Twojego komputera, wybierz\n"
+"\"Lokalna drukarka\".\n"
+"\n"
+"\n"
+"Je�li chcesz uzyska� dost�p do drukarki na zdalnym komputerze z Unixem,\n"
+"wybierz \"Zdalna drukarka\".\n"
+"\n"
+"\n"
+"Je�li chcesz uzyska� dost�p do drukarki za�ozonej na zdalnym komputerze\n"
+"z Microsoft Windows (lub Unixie z Samb�), wybierz \"SMB/Windows 95/98/NT\"."
+
+#: ../../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"
+"\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 ""
-"Teraz nale�y wpisa� has�o roota Twojego Mandrake-Linuxa.\n"
-"Has�o wpisuje si� dwa razy w celu weryfikacji poprawno�ci jego\n"
-"wpisania\n"
+"Nale�y teraz w��czy� drukark�, by umo�liwi� DrakX wykry� j�.\n"
+"\n"
+"Koniezne te� jest podanie kilku informacji.\n"
+"\n"
+"\n"
+"...*.Nazwa drukraki: 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"
+"   * 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:542
+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"
+"     \"Lokalna drukarka \".\n"
+"\n"
+"\n"
+"     Je�li chcesz uzyska� dost�p do drukarki na zdalnym komputerze z "
+"Unixem,\n"
+"     wybierz \"Zdalna drukarka lpd\".\n"
+"\n"
+"\n"
+"     Je�li chcesz uzyska� dost�p do drukarki za�ozonej na zdalnym 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:567
+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 "
+"portur�wnoleg�ego\n"
+"Nazywa si� on w GNU/Linuksie \"/dev/lp0\", natomiast w Windows\"LPT1\""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr "Wybierz drukark� z listy powy�ej."
+
+#: ../../help.pm_.c:578
+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 konfiguracjioraz jej "
+"modyfikacja, je�li nie b�dzie dzia�a� jak nale�y."
+
+#: ../../help.pm_.c:585
+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 ""
+"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. Has�o powinno by� mieszank� znak�w alfanumery-\n"
+"pod��czonych do niego.\n"
+"\n"
+"\n"
+" Has�o powinno by� mieszank� znak�w alfanumery-\n"
 "cznych o d�ugo�ci co najmniej 8 znak�w. *Nigdy* nie powinno by�\n"
-"zapisywane. Nie wymy�laj jednak has�a zbyt d�ugiego lub nazbyt\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:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
 msgstr ""
-"Wi�kszy poziom bezpiecze�stwa systemu zapewniaj� opcje:\n"
+"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:306
+#: ../../help.pm_.c:607
 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"
+"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:310
+#: ../../help.pm_.c:611
 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"
@@ -1907,7 +2921,7 @@ msgstr ""
 "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 preferencje (�rodowisko graficzne, ustawienia program�w,itp.)\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"
@@ -1919,50 +2933,46 @@ msgstr ""
 "\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"
+"do administracji oraz konfiguracji systemu."
 
-#
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Bardzo, bardzo prosimy, odpowiedz \"Tak\" tutaj. Na przyk�ad, kiedy\n"
-"przeinstalujesz Windows, zama�e on sektor startowy. Je�li nie zrobisz\n"
-"dysku startowego jak sugerujemy, nie b�dziesz m�g� ju� wi�cej\n"
-"uruchomi� Linuxa"
+"Utworzenie dysku startowego jest bardzo zalecane. Je�li nie b�dzie\n"
+"mo�na uruchomi� komputera, b�dzie to jedyny spos�b na napraw�\n"
+"bez reinstalacji."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
 "Powiniene� wskaza�, gdzie chcesz\n"
-"umie�ci� informacje wymagane do uruchomienia Linuxa\n"
+"umie�ci� informacje wymagane do uruchomienia GNU/Linuxa\n"
 "\n"
 "\n"
-"Je�li nie wiesz dok�adnie, co robisz, wybierz \"Pierwszy sektor na\n"
-"dysku (MBR)\"."
+"Je�li nie wiesz dok�adnie, co robisz, wybierz\n"
+" \"Pierwszy sektor na dysku (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 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 "
-"IDE)\n"
-"lub  \"/dev/sda\" pierwszy dysk SCSI (first SCSI disk)."
+"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:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1972,16 +2982,18 @@ msgid ""
 "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 ) i Grub to bootloadery systemu: potrafi� uruchomi�\n"
-"Linuxa lub inny system operacyjny, zainstalowany na twoim komputerze.\n"
+"LILO ( LInux LOader ) i Grub to programy rozruchowe: potrafi� 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"
+"powiniene� \"r�cznie\" wprowadzi� odpowiednie dane. B�d� ostro�ny\n"
 "i wybierz w�a�ciwe parametry.\n"
-" Mo�esz oczywi�cie r�wnie� uniemo�liwi� dost�p do nich przy starcie przez \n"
-" usuni�cie ich z listy. Musisz jednak posiada� dysketki startowe, aby do "
-"nich \"wej��\""
+"\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\n"
+"startowe, by je uruchomi�."
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1998,33 +3010,87 @@ msgid ""
 "\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."
 msgstr ""
 "G��wne opcje LILO i Grub to:\n"
-"  - Urz�dzenie �aduj�ce system: Wybiera urz�dzenie, kt�re zawiera sektor "
-"�aduj�cy\n"
-"    zwykle jest to \"/dev/hda\". Wybierz tak, je�eli nie masz pewno�ci.\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"
-"    To przydaje si� w systemach, kt�re s� tak skonfigurowane, �e "
-"uruchamianie \n"
-"    nast�puje z twardego dysku, natychmiast po w�aczeniu klawiatury.\n"
-"    Program �aduj�cy nie czeka, je�eli op�nienie jest r�wne zero,\n"
-"    lub pominiesz t� opcj�,\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\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"
-"  * normal: wybierz tryb 80x25.\n"
-"  * <numer>: wybierz tryb o danym numerze."
+"podczas �adowania. Opcje to:\n"
+"\n"
+"    * normal: wybierz tryb 80x25.\n"
+"\n"
+"    * <numer>: wybierz tryb o danym numerze."
+
+#: ../../help.pm_.c:680
+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�."
+
+#: ../../help.pm_.c:692
+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�."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2036,18 +3102,18 @@ msgid ""
 "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) Linuxa. W tym celu musisz\n"
+"GUI (graficznego interfejsu u�ytkownika) GNU/Linuxa. W tym celu musisz\n"
 "skonfigurowa� kart� graficzn� oraz monitor. Wi�kszo�� krok�w jest\n"
-"zautomatyzowana, tak wi�� Twoje zadanie polega na weryfikacji tego,\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� wystartowane\n"
+"Kiedy konfiguracja zostanie zako�czona, X-y zostan� uruchomione\n"
 "(o ile tego chcesz), by� m�g� 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"
+"razy jak jest to potrzebne."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2055,85 +3121,92 @@ msgstr ""
 "Je�eli z konfiguracj� X-�w jest co� nie tak, u�yj tych opcji,\n"
 "aby poprawnie skonfigurowa� X Window System"
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
 msgstr ""
 "Je�eli chcesz u�ywa� graficznego trybu przy rejestrowaniu si� w systemie \n"
-"( login) wybierz \"Tak\". w przeciwnym wypadku wybierz \"Nie\"."
+"( logowaniu) wybierz \"Tak\". w przeciwnym wypadku wybierz \"Nie\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\n"
-"\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
-"\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
-"\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
-msgstr ""
-" Teraz mo�esz wybra� r�ne dodatkowe opcje dla twojego systemu.\n"
-"\n"
-"  - U�ywa� optymalizacji dysku: ta opcja mo�e zwi�kszy� szybko�� twardego "
-"dysku\n"
-"    ale jest opcj� tylko dla zaawansowanych u�ytkownik�w: \n"
-"    niekt�re tanie uk�ady scalone mog� zniszczy� Twoje dane, wi�c b�d� "
-"czujny!\n"
-"    Kernel ma wprawdzie wbudowan� ochron� przed tego rodzaju mo�liwo�ci�,\n"
-"    a le na wszelki wypadek, lepiej nie wybiera� tej opcji.\n"
-"\n"
-" - Wybierz poziom bezpiecze�stwa: mo�esz wybra� poziom bezpiecze�stwa \n"
-"   dla twojego systemu. Zajrzyj do podr�cznika po kompletn� informacj�.\n"
-"   Zasadniczo: je�eli nie wiesz co zrobi� , wybierz \"�redni\" ; \n"
-"   Je�eli chcesz mie� naprawd� bezpieczny system wybierz \"Paranoidalny\".\n"
-"   Ale ostrzegam: W TYM TRYBIE NIE MO�NA LOGOWA� SI� NA KONSOLI JAKO "
-"``ROOT''\n"
-"   Musisz si� zalogowa� jako zwyk�y u�ytkownik, i u�y� ``su''. \n"
-"   Generalnie , twoja maszyna b�dzie mog�a s�u�y� tylko jako serwer.\n"
-"\n"
-" - Sprecyzuj rozmiar pami�ci, je�eli trzeba: niestety w dzisiejszym �wiecie "
-"pecet�w\n"
-"   nie ma standardowej metody zapytania BIOSa o wielko�� pami�ci.\n"
-"   Tak wi�c Linux mo�e wykry� nieprawid�owo twoj� pami��. \n"
-"   W tym wypadku podaj prawid�ow� wielko��\n"
-"   Uwaga: pomy�ka o dwa lub cztery MB jest normalna.\n"
-"\n"
-" - Automatyczne montowanie wyjmowanych dysk�w: Je�eli nie chcesz \"r�cznie\" "
-"montowa�\n"
-"   medi�w typu CD, stacja dyskietek, Zip, wybierz t� opcj�\n"
-"\n"
-" - W��cz NumLock przy starcie: \n"
-"   Uwaga : W X-ach klawisz NumLock mo�e nie dzia�a�."
-
-#: ../../help.pm_.c:428
+"* 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"
+"\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"
+"\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"
+"\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"
+"\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"
+"\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."
+msgstr ""
+"Teraz mo�esz wybra� r�ne dodatkowe opcje dla Twojego systemu.\n"
+"\n"
+"* U�ywa� optymalizacji dysku: ta opcja mo�e zwi�kszy� szybko�� twardego\n"
+"dysku, ale jest opcj� tylko dla zaawansowanych u�ytkownik�w: \n"
+"niekt�re kiepskie chipsety mog� zniszczy� Twoje dane, b�d� wi�c czujny!\n"
+"Kernel ma wprawdzie wbudowan� czarn� list� chipset�w, ale je�li chcesz \n"
+"unikn�� przykrej niespodzianki, lepiej nie wybiera� tej opcji.\n"
+"\n"
+"\n"
+"* Wybierz poziom bezpiecze�stwa: mo�esz wybra� poziom bezpiecze�stwa \n"
+"dla twojego systemu. Zajrzyj do podr�cznika po szczeg�ow� informacj�,\n"
+"lub po prostu,je�li nie wiesz, co zrobi� , wybierz \"�redni\" ; \n"
+"\n"
+"\n"
+"* Sprecyzuj rozmiar pami�ci, je�eli trzeba: niestety w dzisiejszym �wiecie\n"
+"pecet�w nie ma standardowej metody zapytania BIOS-u o wielko�� pami�ci.\n"
+"Tak wi�c GNU/Linux mo�e wykry� nieprawid�owo Twoj� pami��. \n"
+"W tym wypadku podaj prawid�ow� wielko��\n"
+"Uwaga: r�nica o 2 lub 4 MB jest normalna.\n"
+"\n"
+"\n"
+"* Automatyczne montowanie wyjmowanych dysk�w: Je�eli nie chcesz\n"
+"\"r�cznie\" montowa� medi�w typu CD, stacja dyskietek, Zip,\n"
+"zaznacz t� opcj�\n"
+"\n"
+"\n"
+"* Wyczy�� /tmp przy ka�dym starcie systemu: zaznacz t� opcj�, je�li\n"
+"je�li chcesz kasowa� wszystkie pliki i katalogi zapiasane w /tmp przy \n"
+"starcie systemu,\n"
+"\n"
+"\n"
+" - W��cz NumLock przy starcie: zaznacz t� opcj�, je�li chcesz uaktywni�\n"
+" klawiatur� numeryczn� po stacie Uwaga : W X-ach klawisz NumLock mo�e "
+"dzia�a� lub nie, nie uaktywniaj te�\n"
+"tej opcji w przypadku laptop�w."
+
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2144,344 +3217,371 @@ msgstr ""
 "Teraz nast�pi ponowne uruchomienie systemu.\n"
 "\n"
 "Tw�j nowy Linux Mandrake zostanie za�adowany automatycznie.\n"
-"Je�eli chcia�by� za�adowa� inny system operacyjny \n"
+"Je�eli chcia�by� za�adowa� inny z posiadanych system�w operacyjnych \n"
 "przeczytaj dodatkowe instrukcje."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Wyb�r j�zyka"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Rodzaj instalacji"
 
-#
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Kontrolery SCSI"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Konfiguracja myszy"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
-msgstr "Uk�ad klawiatury"
+msgstr "Wyb�r klawiatury"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "R�ne"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Systemy plik�w"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Formatowanie"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Wyb�r pakiet�w"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Instalacja pakiet�w"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Konfiguracja sieci"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Szyfrowanie"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Wyb�r strefy czasowej"
 
-#
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Konfiguracja us�ug"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Konfiguracja drukarki"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Has�o roota"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "U�ytkownicy"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Dysk startowy"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
-msgstr "Instalacja bootloadera"
+msgstr "Program rozruchowy"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Konfiguracja X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
-msgstr "Dyskietka automatycznej instalacji"
+msgstr "Dysk auto-instalacji"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Wyj�cie z instalacji"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "B��d odczytu pliku $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "Przetestuj mysz"
+
+#: ../../install_gtk.pm_.c:427
+msgid "To activate the mouse,"
+msgstr "By uaktywni� mysz,"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr "RUSZ KӣKIEM MYSZY!"
+
+#: ../../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 ""
+"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
 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 ""
-" Musisz mie� partycj� root.\n"
-" W tym celu, utw�rz partycj� ( lub kliknij na istniej�c�).\n"
-" Wybierz \"Punkt montowania\" `/'"
+"Musisz mie� partycj� root.\n"
+"W tym celu, utw�rz partycj� ( lub kliknij na istniej�c�),\n"
+"nast�pnie Wybierz \"Punkt montowania\" `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Nie mog� odczyta� tablicy partycji, jest zbyt uszkodzona :(\n"
-"Spr�buj� kontynuwa� z pustymi partycjami"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "Musisz mie� partycj� wymiany (swap)"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake nie mo�e odczyta� poprawnie tablicy partycji.\n"
-"Kontynuuj na w�asn� odpowiedzialno��!"
+"Nie masz partycji swap\n"
+"\n"
+"Kontynuowa� mimo to?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Wyszukiwanie partycji root"
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Wykorzystaj wolne miejsce"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Informacje"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "Brak wolnego miejsca do stworzenia nowych partycji"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: To nie jest partycja root, prosz� wybra� inn�."
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "Skorzystaj z istniej�cej partycji"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Nie znaleziono partycji root"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "Brak istniej�cych partycji do wykorzystania"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Nie mo�na u�ywa� rozg�aszania bez domeny NIS"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Dla loopback u�yj partycji Windows"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "B��d odczytu pliku $f"
+#: ../../install_interactive.pm_.c:90
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Kt�r� partycj� chcesz u�y� dla Linux4Win?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Wyst�pi� jaki� b��d. Nie potrafi� poprawnie go obs�u�y�\n"
-"Kontynuuj na w�asn� odpowiedzialno��."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Okre�l rozmiary"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Powielony punkt montowania %s"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Rozmiar partycji root w MB:"
 
-#: ../../install_steps.pm_.c:323
-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 ""
-"Pewne istotne pakiety nie zosta�y poprawnie zainstalowane.\n"
-"Prawdopodobnie uszkodzona jest p�yta lub nap�d CDROM.\n"
-"Sprawd� p�yt� w innym komputerze u�ywaj�c polecenia:\n"
-"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Rozmiar partycji swap w MB: "
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Witaj w %s"
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "Wykorzystaj wolne miejsce na partycji Windows"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Niedost�pna stacja dyskietek"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Kt�r� partycj� chcesz zmniejszy�?"
+
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "Obliczanie granic systemu plik�w Windows"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "Przechodz� do kroku `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"Program zmniejszaj�cy partycj� FAT nie potrafi obs�u�y�\n"
+"Twojej partycji. Wyst�pi�� nast�puj�cy b��d: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "Musisz mie� partycj� wymiany (swap)"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr "Twoja partycja Windows jest zbyt sfragmentowana, uruchom \"defrag\""
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"Nie masz partycji swap\n"
+"OSTRZE�ENIE!\n"
 "\n"
-"Kontynuowa� mimo to?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Okre�l rozmiar przeznaczony na instalacj�"
+"DrakX musi teraz zmieni� rozmiar partycji Windows.\n"
+"Uwa�aj, jest to niebezpieczne. Je�li wcze�niej tego nie zrobi�e�,\n"
+"nale�y przerwa� instalacj�, wr�ci� do Windows, zeskanowa�\n"
+"i zdefragmentowa� dysk nast�pnie zrestartowa� instalacj�. \n"
+"Warto r�wnie� zarchiwizowa� dane na dysku.\n"
+"Je�li jeste� pewny, wybierz OK."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Ca�kowity rozmiar: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "Jaki ma by� docelowy rozmiar partycji Windows?"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "Wersja: %s\n"
+msgid "partition %s"
+msgstr "partycja %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "Rozmiar: %d kB\n"
+msgid "FAT resizing failed: %s"
+msgstr "Zmiana rozmiaru partycji FAT nie powiod�a si�: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Wybierz pakiety do zainstalowania"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+"Nie ma partycji FAT do zmiany rozmiaru lub u�ycia jako loopback\n"
+"(lub brak wolnego miejsca)"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Informacje"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "Wyma� ca�y dysk"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Instalacja"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Usu� Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Instalowanie"
+#: ../../install_interactive.pm_.c:153
+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 chcesz zainstalowa� linuxa?"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Prosz� czeka�, "
+#: ../../install_interactive.pm_.c:156
+#, 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_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Pozosta�o czasu "
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "Tryb eksperta"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Ca�kowity czas "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "U�yj diskdrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Przygotowywanie instalacji"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "U�yj fdiska"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "Instalowanie pakietu %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Mo�esz teraz tworzy� partycje  %s \n"
+"Gdy sko�czysz, pami�taj o zapisaniu u�ywaj�c `w'"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Kontynuowa�?"
+#: ../../install_interactive.pm_.c:195
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Masz za ma�o wolnego miejsca na partycji Windows"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Wyst�pi� b��d porz�dkowania pakiet�w:"
+#: ../../install_interactive.pm_.c:210
+msgid "I can't find any room for installing"
+msgstr "Brak miejsca na instalacj�"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Wykorzysta� istniej�c� konfiguracj� X11?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "Kreator podzia�u na partycje DrakX znalaz� nast�puj�ce rozwi�zania:"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Wybierz jedn� z klas instalacyjnych:"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Partycjonowanie nie powiod�o si�: %s"
 
-#
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Nie masz �adnych ``windowsowych'' partycji!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Uruchamianie sieci"
 
-#
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Nie masz do�� miejsca na Lnx4win."
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Zatrzymywanie sieci"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"OSTRZE�ENIE!\n"
-"\n"
-"DrakX musi teraz zmieni� rozmair partycji Windows.\n"
-"Uwa�aj, to mo�e by� niebezpieczne. Lepiej przerwa� instalacj�,\n"
-"wr�ci� do Windows zeskanowa� i zdefragmentowa� dysk, \n"
-"i potem zrestartowa� instalacj�. Powiniene� r�wnie� sporz�dzi� kopie "
-"zapasowe.\n"
-"Ale je�eli nie boisz si� , naci�nij ``enter''"
+"Wyst�pi� jaki� b��d. Nie potrafi� poprawnie go obs�u�y�\n"
+"Kontynuuj na w�asn� odpowiedzialno��."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Automatyczna zmiana rozmiaru nie powiod�a si�"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Powielony punkt montowania %s"
 
-#
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Kt�r� partycj� chcesz u�y� dla Linux4Win?"
+#: ../../install_steps.pm_.c:375
+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 ""
+"Pewne istotne pakiety nie zosta�y poprawnie zainstalowane.\n"
+"Prawdopodobnie uszkodzona jest p�yta lub nap�d CDROM.\n"
+"Sprawd� p�yt� w innym komputerze u�ywaj�c polecenia:\n"
+"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Okre�l rozmiary"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Witaj w %s"
 
-#
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Rozmiar partcji root w MB:"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Niedost�pna stacja dyskietek"
 
-#
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Rozmiar partycji swap w MB: "
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Przechodz� do kroku `%s'\n"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"Tw�j system ma ma�o zasob�w. Mo�esz mie� problemy z instalacj�.\n"
+"Je�li te problemy wyst�pi�, 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:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Wybierz jedn� z nast�puj�cych klas instalacji:"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
-msgstr "Ca�kowity rozmair dla wybranych grup to oko�o %d MB.\n"
+msgstr "Ca�kowity rozmiar dla wybranych grup to oko�o %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2494,7 +3594,7 @@ msgstr ""
 "Ma�y procent spowoduje instalacj� tylko najwa�niejszych pakiet�w,\n"
 "100%% spowoduje zainstalowanie wszystkiego."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2505,113 +3605,220 @@ msgid ""
 msgstr ""
 "Masz miejsce na dysku tylko na %d%% pakiet�w.\n"
 "\n"
-"Je�li chcesz zainstalowa� mniej, okre�l procentowo,\n"
-"ile pakiet�w chcesz zainstalowa�.Ma�y procent spowoduje instalacj� tylko "
+"Je�li chcesz zainstalowa� mniej, okre�l procentowo, ile pakiet�w\n"
+" chcesz zainstalowa�. Ma�y procent spowoduje instalacj� tylko\n"
 "najwa�niejszych pakiet�w,\n"
 "Wyb�r  %d%% spowoduje zainstalowanie tylu pakiet�w ile si� da."
 
-#
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 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:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Procent pakiet�w do instalacji"
 
-#
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Wybierz pakiety do zainstalowania"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Informacje"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Instalacja"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
-msgstr "Automatyczne sprawdzenie zale�no�ci"
+msgstr "Automatyczne sprawdzanie zale�no�ci"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Rozwi� drzewo"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Zwi� drzewo"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Prze��cz mi�dzy p�askim i grupowym sortowaniem"
 
-#
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Z�y pakiet"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nazwa: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Wersja: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Rozmiar: %d kB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
-msgstr "Przydatno��: %s\n"
+msgstr "Znaczenie: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Ca�kowity rozmiar: %d  / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+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:386
+msgid "The following packages are going to be installed"
+msgstr "Nast�puj�ce pakiety zostan� zainstalowane"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr "Nast�puj�ce pakiety zostan� usuni�te"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Nie mo�na zmieni� statusu tego pakietu."
+
+#: ../../install_steps_gtk.pm_.c:416
 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:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
-msgstr "Nie mo�esz odznaczy� tego pakietu. Zosta� ju� zainstalowany."
+msgstr "Nie mo�na odznaczy� tego pakietu. Zosta� ju� zainstalowany."
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
-"Ten pakiet musi by� uakualniony.\n"
+"Ten pakiet musi by� uaktualniony.\n"
 "Jeste� pewien, �e chcesz go odznaczy�?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
-msgstr "Nie mo�esz odznaczy� tego pakietu. Musi zosta� zamieniony na nowszy"
-
-#
-#: ../../install_steps_gtk.pm_.c:493
-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�"
+msgstr "Nie mo�na odznaczy� tego pakietu. Musi zosta� zamieniony na nowszy"
 
-#
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Nast�puj�ce pakiety zostan� zainstalowane/usuniete"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "Nie mo�esz zmieni� statusu tego pakietu."
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Instalowanie"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Szacowanie"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Prosz� czeka�, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Pozosta�o czasu "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Ca�kowity czas "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Przygotowywanie instalacji"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pakiet�w"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Instalowanie pakietu %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
+msgstr "Akceptuj"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2622,194 +3829,504 @@ msgid ""
 msgstr ""
 "Zmie� p�yt� CD!\n"
 "\n"
-"W�� p�yt� zatytu�owan� \"%s\" do kieszeni czytnika i naci�nij Ok\n"
-"Jesli jej nie masz, naci�nij Anuluj, by pomin�� instalacj� pakiet�w z tej "
-"p�yty."
+"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:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Refuse"
+msgstr "Odrzu�"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Kontynuowa�?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Wyst�pi� b��d porz�dkowania pakiet�w:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Wyst�pi� b��d podczas instalowania pakiet�w:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Wyst�pi� b��d"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Wybierz j�zyk u�ywania systemu"
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr "Umowa licencyjna"
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" 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:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Klawiatura"
 
-#
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
-msgstr "Wybierz uk�ad Twojej klawiatury."
+msgstr "Wybierz uk�ad klawiatury."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 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\n"
-"po instalacji"
-
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Partycja root"
+"Mo�esz wybra� inne j�zyki, kt�re chcesz mie� do dyspozycji po instalacji"
 
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Kt�ra partycja jest w Twoim systemie partycj� root (/)"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr "Wszystkie"
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Klasa instalacji"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
-msgstr "Okre�l rodzaj instalacji"
+msgstr "Okre�l klas� instalacji"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Install/Update"
 msgstr "Instalacja/Uaktualnienie"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Is this an install or an update?"
 msgstr "Czy to instalacja, czy uaktualnienie?"
 
-#
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Automatyczna"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Zalecana"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "U�ytkownika"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Dla eksperta"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "Jeste� pewien, �e jeste� ekspertem? \n"
-"B�dziesz mia� du�e uprawnienia, co mo�e byc niebezpieczne."
+"B�dziesz mia� du�e uprawnienia, co mo�e by� niebezpieczne.\n"
+"\n"
+"B�dziesz pytany np. o \"U�yj pliku shadow dla hase�?\n"
+"Czy potrafisz odpowiedzie� na tego typu pytania?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+msgid "Update"
 msgstr "Uaktualnienie"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Typowe"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr "Stacja robocza"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Programowanie"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Serwer"
 
-#
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
-msgstr "Jakie ma byc zastosowanie Twojego systemu?"
+#: ../../install_steps_interactive.pm_.c:228
+msgid "What is your system used for?"
+msgstr "Do czego ma by� u�ywany komputer?"
 
-#
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Wybierz typ myszy."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Port myszy"
 
-#
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 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:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Konfiguracja kart PCMCIA..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
-msgstr " Konfiguracja IDE"
+msgstr "Konfiguracja IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "brak dost�pnych partycji"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%d MB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Kt�r� partycj� wybierasz jako root (/)?"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr "Przeszukiwanie partycji w celu okre�lenia punkt�w montowania"
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Wybierz punkty montowania"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Nie mo�na odczyta� tablicy partycji, jest zbyt uszkodzona :(\n"
+"Mo�na kontynuowa� USUWAJ�C WSZYSTKIE DANE\n"
+"Innym rozwi�zaniem jest zabronienie DrakX-owi modyfikowania tabeli partycji\n"
+" (b��d: %s)\n"
+"\n"
+"Czy zgadzasz si� na utrat� wszystkich partycji?\n"
+
+#: ../../install_steps_interactive.pm_.c:329
+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"
+"Kontynuuj na w�asn� odpowiedzialno��!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Partycja root"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Kt�ra partycja jest w Twoim systemie partycj� root (/)"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Musisz zrestartowa�, by uaktywni� zmiany w tablicy partycji"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Wybierz partycje do sformatowania"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Sprawdzi� fizycznie partycje?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Formatowanie partycji"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Tworzenie i formatowanie pliku %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
-msgstr "Wielko�� swapa jest niewystaczaj�ca, prosz� go zwi�kszy�"
+msgstr "Wielko�� swapa jest niewystarczaj�ca, prosz� go zwi�kszy�"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
-msgstr "Szukanie dost�pnych pakiet�w"
+msgstr "Wyszukiwanie dost�pnych pakiet�w"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Wyszukiwanie pakiet�w do uaktualnienia"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr "Nie ma do�� miejsca na instalacj� lub uaktualnienie"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
+msgstr "Nie ma do�� miejsca na instalacj� lub uaktualnienie (%d > %d)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "Pe�na (%d MB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "Minimalna (%d MB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Recommended (%dMB)"
+msgstr "Zalecana (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:455
+msgid "Custom"
+msgstr "U�ytkownika"
+
+#: ../../install_steps_interactive.pm_.c:462
+msgid "Select the size you want to install"
+msgstr "Okre�l rozmiar przeznaczony na instalacj�"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Wyb�r grup pakiet�w"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Samodzielny wyb�r pakiet�w"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2819,12 +4336,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:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr "Cd-Rom oznaczony \"%s\" "
+msgstr "CD-ROM oznaczony \"%s\" "
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2832,177 +4349,11 @@ msgstr ""
 "Instalowanie pakietu %s\n"
 "%d%%"
 
-#
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Trwa konfiguracja poinstalacyjna"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Zachowa� bie��c� konfiguracj� IP"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Ponownie skonfigurowa� sie�"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Nie konfigurowa� sieci"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Konfiguracja sieci"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Sie� lokalna jest ju� skonfigurowana. Mo�esz:"
-
-#
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Czy chcesz skonfigurowa� sie� lokaln� w Twoim systemie?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "nie znaleziono karty sieciowej"
-
-#
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Konfiguracja modemu"
-
-#
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "Czy chcesz skonfigurowa� po��czenie modemowe?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Konfiguracja urz�dzenia sieciowego %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Prosz� poda� konfiguracj� IP dla komputera.\n"
-"Ka�da pozycja powinna by� wpisana w zapisie dziesi�tnym\n"
-"oddzielonym kropkami (np. 192.168.1.1)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Automatyczne IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "Adres IP:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Maska:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "Adres IP powinien byc w formacie typu 192.168.1.1"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Konfiguracja sieci"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Prosz� wpisa� nazw� hosta.\n"
-"Nazwa ta powinna by� w postaci pe�nej,\n"
-"np. \"mojhost.mojadomena.pl\".\n"
-"Je�li jest to potrzebne, nale�y wpisa� te� adres routera."
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "Serwer DNS:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Interfejs (np. eth0):"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Router:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Nazwa hosta:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Spr�bowa� wykry� modem?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Do kt�rego portu szeregowego pod��czony jest modem?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Opcje po��czenia"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Nazwa po��czenia"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Numer telefonu"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "U�ytkownik"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Autoryzacja"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Oparta o skrypt"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Oparta o terminal"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Domena"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Pierwszy serwer DNS"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Drugi serwer DNS"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3040,23 +4391,23 @@ msgid ""
 "Altadena California 91001\n"
 "USA"
 msgstr ""
-"Masz teraz mo�liwo�� za�adowania oprogramowania, s�u�acego do szyfrowania\n"
+"Masz teraz mo�liwo�� za�adowania oprogramowania, s�u��cego do szyfrowania\n"
 "z Sieci\n"
 "OSTRZE�ENIE:\n"
-"Z powodu r�nych og�lnych ogranicze� prawnych maj�cych zastosowanie do \n"
-"tego oprogramowania, Klient lub(i) u�ytkownik powinien by� pewien,\n"
+"Z powodu r�nych ogranicze� prawnych maj�cych zastosowanie do \n"
+"tego oprogramowania, Klient lub (i) u�ytkownik powinien by� pewien,\n"
 "�e przepisy jego dotycz�ce pozwalaj� na kopiowanie, przechowywanie\n"
 "i u�ywanie tego oprogramowania.\n"
 "\n"
-"Dodatkowo klient lub(i) u�ytkownik, powinien by� ostrze�ony,\n"
-"aby nie z�ama� praw obowi�zuj�cyvh w jego jurysdykcji.\n"
-"Je�eli klient lub(i) u�ytkownik nie przestrzega�by obowi�zuj�cych \n"
+"Dodatkowo klient lub (i) u�ytkownik, powinien by� ostrze�ony,\n"
+"aby nie z�ama� praw obowi�zuj�cych w jego jurysdykcji.\n"
+"Je�eli klient lub (i) u�ytkownik nie przestrzega�by obowi�zuj�cych \n"
 "go przepis�w, mog� dotkn�� go powa�ne sankcje.\n"
 "\n"
 "Ani Mandrakesoft ani jego producenci lub dostawcy nie s� odpowiedzialni\n"
 "za jakiekolwiek celowe, przypadkowe lub po�rednie szkody\n"
 "powsta�e z u�ywania, posiadania lub tylko zainstalowania oprogramowania,\n"
-"do kt�rego klient lub(i) u�ytkownik b�dzie mia� dost�p po wyra�eniu \n"
+"do kt�rego klient lub (i) u�ytkownik b�dzie mia� dost�p po wyra�eniu \n"
 "zgody na powy�sze zastrze�enia .\n"
 "Wszystkie zapytania, dotycz�ce niniejszego uzgodnienia prosz� kierowa� do:\n"
 "Mandrakesoft, Inc.\n"
@@ -3064,88 +4415,92 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Wybierz mirror, z kt�rego chcesz pobra� pakiety"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 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:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Wybierz pakiety do zainstalowania."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
 msgstr "Wybierz swoj� stref� czasow�."
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Czy ustawi� zegar sprz�towy na czas GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+msgid "Which printing system do you want to use?"
+msgstr "Kt�ry system wydruku zamierzasz u�ywa�?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Bez has�a"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "U�yj pliku shadow"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "U�yj d�ugich hase� MD5"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "U�yj NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
-msgstr "z�te strony"
+msgstr "��te strony"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
-msgstr "To has�o jest zbyt proste ( musi by� conajmniej %d znak�w)"
+msgstr "To has�o jest zbyt proste ( musi by� co najmniej %d znak�w)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
-msgstr "Autentyfikacja NIS"
+msgstr "Uwierzytelnienie NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "Domena NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "Serwer NIS"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Akceptuj u�ytkownika"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Dodaj u�ytkownika"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(ju� dodano %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3155,64 +4510,87 @@ msgstr ""
 "Podaj dane u�ytkownika\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Nazwisko"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Nazwa u�ytkownika"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Pow�oka"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Has�o jest zbyt proste"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Prosz� poda� nazw� u�ytkownika"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
-"Nazwa u�ytkownika mo�e sk�adac si� tylko  z ma�ych liter, cyfr, `-'i `_'"
+"Nazwa u�ytkownika mo�e sk�ada� si� tylko  z ma�ych liter, cyfr, `-'i `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Ten u�ytkownik zosta� ju� dodany"
 
-#
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Dysk startowy umo�liwia uruchomienie systemu Linux niezale�nie od "
+"normalnego\n"
+"programu rozruchowego. Jest u�yteczny, je�li nie chcesz instalowa� SILO,\n"
+"lub SILO w Twoim systemie nie dzia�a oraz je�li inny system operacyjny\n"
+"usun�� SILO. Dysk u�ytkownika mo�na tak�e u�ywa� z obrazem ratunkowym,\n"
+"u�atwiaj�c naprawienie systemu w przypadku awarii.\n"
+"Je�li chcesz utworzy� dysk startowy dla swojego systemu, w�� dyskietk�\n"
+"do stacji i wybierz \"OK\"."
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Pierwsza stacja dyskietek"
 
-#
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Druga stacja dyskietek"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Pomi�"
 
-#
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3225,213 +4603,174 @@ msgid ""
 "system\n"
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
-"Dysk startowy umo�liwia startowanie systemu Linux niezale�nie od\n"
-"mormalnego bootloadera. Jest u�yteczny, je�li nie chcesz instalowa� LILO,\n"
-"lub Grub w twoim systemie nie dzia�a oraz je�li inny system operacyjny\n"
-"usun�� LILO/grub. Dysk u�ytkownika mo�na tak�e u�ywa� z obrazem ratunkowym,\n"
+"Dysk startowy umo�liwia uruchomienie systemu Linux niezale�nie od\n"
+"normalnego programu rozruchowego. Jest u�yteczny, je�li nie chcesz\n"
+"instalowa� LILO/Grub, lub programy te w Twoim systemie nie dzia�aj�\n"
+"oraz je�li inny system operacyjny usun�� LILO/grub.\n"
+"Dysku tego mo�na tak�e u�ywa� z obrazem ratunkowym,\n"
 "u�atwiaj�c naprawienie systemu w przypadku awarii.\n"
 "Czy chcesz utworzy� dysk startowy dla swojego systemu?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Niestety, stacja dyskietek jest niedost�pna."
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
-msgstr "Wybierz stacje dyskietek, kt�r� u�yjesz do stworzenia dysku startowego"
+msgstr ""
+"Wybierz stacj� dyskietek, kt�rej u�yjesz do stworzenia dysku startowego"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "W�� dyskietk� do stacji %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Tworzenie dysku startowego"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "Instalacja LILO nie powiod�a si�. Wyst�pi� nast�puj�cy b��d:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Czy chcesz u�ywa� SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "Podstawowe opcje SILO"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Masz nast�puj�ce pozycje w SILO.\n"
-"Mo�esz doda� nast�pne lub zmieni� istniej�ce."
-
-#
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Partycja"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Ta etykieta jest ju� u�ywana"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "Instalacja SILO nie powiod�a si�. Wyst�pi� nast�puj�cy b��d:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
-msgstr "Przygotowanie bootloadera"
+msgstr "Przygotowanie programu rozruchowego"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "Czy chcesz u�ywa� aboot?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 "B��d podczas instalowania aboot. \n"
-"Mam wymusi� instalacj�, nawet gdyby grozi�o to zniszczeniem pierwszej "
-"partycji?"
-
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Konfiguracja proxy"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "Proxy HTTP"
+"Wymusi� instalacj�, nawet gdyby grozi�o to zniszczeniem pierwszej partycji?"
 
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "Proxy FTP"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy powinno by� http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy powinno by� ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+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:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Witajcie, w�amywacze"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Z�y"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Niski"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "�redni"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Wysoki"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoidalny"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "R�ne pytania"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(mo�e by� przyczyn� zniszczenia danych)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "U�ywa� optymalizacji dysku?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Wybierz poziom bezpiecze�stwa"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Sprecyzuj rozmiar pami�ci, je�li trzeba (znaleziono %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Automatyczne montowanie wyjmowanych dysk�w"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Wyczy�ci� /tmp przy ka�dym starcie systemu"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "W��czy� wieloprofile?"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Uaktywnienie num lock przy starcie"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
-msgstr "Podaj rozmiar pami�ci w Mb"
+msgstr "Podaj rozmiar pami�ci w MB"
 
-#
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Wysoki poziom bezpiecze�stwa wyklucza stosowanie supermount"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
+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."
+msgstr ""
+"Ostrze�enie: PRZY TYM POZIOMIE BEZPIECZE�STWA NIE JEST MO�LIWE\n"
+"BEZPO�REDNIE REJESTROWANIE SI� Z KONSOLI NA ROOTA! \n"
+"Nale�y zarejestrowa� si� jako zwyk�y u�ytkownik, nast�pnie u�y� \"su\".\n"
+"W og�lno�ci: komputer w tej konfiguracji nadaje si� wy��cznie na serwer.\n"
+"Zosta�e� ostrze�ony."
+
+#: ../../install_steps_interactive.pm_.c:982
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
 msgstr ""
-"DrakX wygeneruje zbiory konfiguracyjne zar�wno dla XFree 3.3 i XFree 4.0\n"
-"Domy�lnie jest u�ywany serwer 3.3, bo obs�uguje wi�ksz� ilo�� kart "
-"graficznych.\n"
-"\n"
-"Chcesz spr�bowa� XFree 4.0?"
+"B�d� ostro�ny, uaktywnienie numlock mo�e powodowa�\n"
+"problemy z wypisywaniem cyfr zamiast liter (np. naci�ni�cie \"p\" daje \"6\")"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Wykry� urz�dzenia PCI?"
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Wykorzysta� istniej�c� konfiguracj� X11?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 "Czy utworzy� dyskietk� instalacji automatycznej dla powielenia instalacji?"
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "W�� pust� dyskietk� do stacji %s"
 
-#
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Tworzenie dyskietki automatycznej instalacji"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
-"Nie zako�czono pewnych etap�w instalacji.\n"
+"Pewne etapy instalacji nie zosta�y zako�czone\n"
 "\n"
-"Czy na pewno chcesz teraz wyj��?"
+"Czy na pewno chcesz teraz zako�czy�?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3443,164 +4782,26 @@ msgid ""
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
-"Gratulacje, instalacja zako�czona.\n"
-"Wyjmij no�nik startowy i naci�nij enter, by zrestartowa�.\n"
-"\n"
-"Informacje i poprawki dla tej wersji Linuxa Mandrake\n"
-"dost�pne s� na stronie http://www.linux-mandrake.com/,\n"
+"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 konfiguracji systemu znajduj� si� w rozdziale\n"
-"post install Oficjalnego Podr�cznika U�ytkownka Linux Mandrake."
-
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Zamykanie systemu"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Instalacja sterownika %s do karty %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(modu� %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Kt�ry sterownik %s wypr�bowa�?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"W pewnych przypadkach sterownik %s potrzebuje dodatkowych\n"
-"informacji do poprawnego dzia�ania, mimo �e zazwyczaj dzia�a\n"
-"bez nich. Czy chcesz poda� dodatkowe parametry, czy te� \n"
-"pozwolisz sterownikowi wykry� je automatycznie?\n"
-"Czasami wykrywanie mo�e zawiesi� komputer, nie powoduje to jednak �adnych\n"
-"problem�w (utraty danych)"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Autowykrywanie"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Okre�l parametry"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Mo�esz teraz okre�li� parametry modu�u %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Mo�esz przekaza� do modu�u %s parametry.\n"
-"S� one w formacie \"nazwa1=warto��1 nazwa2=warto��2 ...\n"
-"Np. \"io=0x300 irq=7\" "
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Opcje modu�u:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Nieudane za�adowanie modu�u %s.\n"
-"Chcesz spr�bowa� z innymi parametrami?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Wykry� karty PCI?"
+"Informacje o poprawkach dotycz�cych tej wersji Linux-Mandrake\n"
+"znajdziesz na stronach http://www.linux-mandrake.com/.\n"
+"Informacje o konfiguracji systemu znajduj� si�\n"
+"w Oficjalnym Podr�czniku U�ytkownika Linux Mandrake."
 
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Konfiguracja kart PCMCIA..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Wykry� urz�dzenia %s?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Znaleziono %s  %s interfejs�w"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Masz inne?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Czy masz interfejs %s?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Nie"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Tak"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Poka� informacj� o sprz�cie"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Uruchamianie sieci"
-
-#
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Zatrzymywanie sieci"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Instalacja Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
-" <Tab>/<Alt-Tab> pomi�dzy elementami  | <Space> wyb�r | <F12> nast�pny ekran "
-
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"Mo�esz teraz utworzy� partycje na dysku %s \n"
-"Po sko�czeniu, nie zapomnij zapisa� zmian, u�ywaj�c `w'"
+" <Tab>/<Alt-Tab> mi�dzy element.  | <Spacja> wyb�r | <F12> nast�pny ekran "
 
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Prosz� czeka�"
 
@@ -3610,7 +4811,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Niejednoznaczny (%s), sprecyzuj\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Z�y wyb�r, spr�buj ponownie\n"
 
@@ -3624,489 +4825,971 @@ msgstr "? (domy�lnie %s)"
 msgid "Your choice? (default %s) "
 msgstr "Tw�j wyb�r? (domy�lnie %s)"
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
-msgstr "Tw�j wyb�r? (domy�lnie %s, wpisz none dla �adnego) "
+msgstr "Tw�j wyb�r? (domy�lnie %s, wpisz \"none\" dla �adnego) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "czeski"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "niemiecki"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvoraka"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "hiszpa�ski"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "fi�ski"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "francuski"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "norweski"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "polski"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "rosyjski"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
-msgstr "Klawiatura UK"
+msgstr "angielski"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
-msgstr "Klawiatura US"
+msgstr "ameryka�ski"
 
-#
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "arme�ski (stary)"
 
-#
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "arme�ski - fonetyczny"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "arme�ski - fonetyczny"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "azerski (latin)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "azerski (cyrilic)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "belgijski"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "bu�garski"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "brazylijski(ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "bia�oruski"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "szwajcarski (uk�ad niemiecki)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "szwajcarski (uk�ad francuski)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Niemiecka ( bez martwych klawiszy)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "du�ski"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvoraka (US)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvoraka (norweski)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "esto�ski"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "gruzi�ski (uk�ad rosyjski)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "gruzi�ski (uk�ad �aci�ski)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "grecki"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "w�gierski"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Chorwacki"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "izraelski"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "izraelski (fonetyczny)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "Ira�ski"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "islandzki"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "w�oski"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "japo�ski 106 klawiszy"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "latyno-ameryka�ski"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "holenderski"
 
-#
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "litewski AZERTY"
 
-#
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "litewski AZERTY"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "litweski QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "litewski QWERTY - fonetyczny"
 
-#
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "polski (programisty)"
 
-#
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "polski (maszynistki)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "portugalski"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "kanadyjski (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "rosyjski (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "szwedzki"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "s�owe�ski"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "s�owacki"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
-msgstr "Klawiatura tajska"
+msgstr "tajski"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "turecki"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "turecki (nowy)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "ukrai�ski"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
-msgstr "klawiatura US (mi�dzynarodowa)"
+msgstr "klawiatura US (mi�dzynarodowy)"
+
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "wietnamski QWERTY"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "jugos�owia�ski - �aci�ska"
 
-# 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.
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Mysz Sun"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "Standardowa"
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Konfiguracja podstawowa"
+
+#: ../../mouse.pm_.c:44
+msgid "Wheel"
+msgstr "z k�kiem"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "szeregowa"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Mysz standardowa 2-przyciskowa"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Mysz standardowa 3-przyciskowa"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech seria CC"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "Seria MM"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet (szeregowy)"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Mysz Logitech (szeregowa, stary typ C7)"
+
+#: ../../mouse.pm_.c:64
+msgid "busmouse"
+msgstr "busmouse"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr "2-przyciskowa"
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr "3-przyciskowa"
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "brak"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Brak myszy"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr "Dalej ->"
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Dzia�a prawid�owo?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "Internet - konfiguracja"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Czy chcesz teraz spr�bowa� po��czy� si� Internetem?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr ""
+"\n"
+"Mo�esz zrekonfigurowa� po��czenie."
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Nie jeste� teraz po��czony z Internetem."
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"Mo�esz po��czy� si� z Internetem lub zrekonfigurowa� po��czenie."
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "Konfiguracja ISDN"
+
+#: ../../netconnect.pm_.c:141
+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:158
+msgid "Connection Configuration"
+msgstr "Konfiguracja po��czenia"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "Wype�nij lub zaznacz pole poni�ej"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "IRQ karty"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "DMA karty"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "IO karty"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "IO_0 karty"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "IO_1 karty"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "Numer Twojego telefonu"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "Nazwa dostawcy us�ug (np. Dialog, Netia, TPSA)"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "Numer telefonu dostawcy us�ug"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "DNS 1 dostawcy"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "DNS 2 dostawcy"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "Spos�b wybierania"
+
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
+msgstr "Konto (nazwa u�ytkownika)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "Has�o:"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "Potwierd� has�o"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "Europa"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "Europa (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world"
+msgstr "Reszta �wiata"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "Reszta �wiata - bez kana�u D (linie dzier�awione)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "Jakiego protoko�u chcesz u�y�?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "Nie wiem"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "Jaki rodzaj karty posiadasz?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "Kontynuuj"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "Przerwij"
+
+#: ../../netconnect.pm_.c:245
+msgid ""
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
-"Witamy w programie wybierajacym system - LILO\n"
-"\n"
-"By zobaczyc dostepne mozliwosci, nacisnij <TAB>.\n"
 "\n"
-"By zaladowac jedna z nich, wpisz jej nazwe i nacisnij <ENTER>\n"
-"lub czekaj %d sekund na domyslny start.\n"
+"Je�li posiadasz kart� ISA, warto�ci na nast�pnym ekranie\n"
+"powinny by� odpowiednie\n"
+"Je�li posiadasz kart� PCMCIA, powiniene� zna� IRQ i IO swojej karty.\n"
+
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "Wybierz swoj� kart� ISDN"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "Wykryto kart� ISDN:\n"
+
+#: ../../netconnect.pm_.c:287
+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 ""
+"Wykryto kart� ISDN PCI nieznanego typu. Prosz� wybra� jedn� z listy na "
+"kolejnym ekranie."
+
+#: ../../netconnect.pm_.c:299
+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:331
+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:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Wybierz interfejs sieciowy"
+
+#: ../../netconnect.pm_.c:336
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Prosz� wybra�, kt�r� kart� sieciow�chcesz u�y� do po��czenia z Internetem"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "Interfejs sieciowy"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
+"Do you agree?"
+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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Witamy w programie wybierajacym system - GRUB"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Nale�y zrestartowa� interfejs $device. Zgadzasz si�?"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "U�yj %c i %c klawiszy , aby pod�wietli� pozycj�."
+#: ../../netconnect.pm_.c:468
+msgid "ADSL configuration"
+msgstr "Konfiguracja ADSL"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "Czy chcesz ��czy� si� Internetem przy uruchamianiu komputera?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Spr�bowa� wykry� modem?"
+
+#: ../../netconnect.pm_.c:539
+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:544
+msgid "Dialup options"
+msgstr "Opcje dzwonienia"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Nazwa po��czenia"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "Numer telefonu"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Identyfikator"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Autoryzacja"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Oparta o skrypt"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Poprzez terminal"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Domena"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Pierwszy serwer DNS"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Drugi serwer DNS"
+
+#: ../../netconnect.pm_.c:582
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
 msgstr ""
-"Naci�nij Enter, aby za�adowa� wybrany system operacyjny, \n"
-"`e' aby wyedytowa�"
+"\n"
+"Mo�esz po��czy� si� z Internetem lub zrekonfigurowa� po��czenie."
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can reconfigure your connection."
 msgstr ""
-"komendy przed za�adowaniem albo `c' , aby pracowa�\n"
-"w linii polece�"
+"\n"
+"Mo�esz zrekonfigurowa� po��czenie."
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Pod�wietlony system zostanie uruchomiony po %d sekundach."
+#: ../../netconnect.pm_.c:582
+msgid "You are not currently connected to Internet."
+msgstr "Nie jeste� teraz po��czony z Internetem."
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "nie maj ju� miejsca na /boot"
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
+"\n"
+"Mo�esz roz��czy� si� lub zrekonfigurowa� po��czenie."
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Pulpit"
+#: ../../netconnect.pm_.c:586
+msgid "You are currently connected to internet."
+msgstr "Jeste� teraz po��czony z Internetem."
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Menu startowe"
+#: ../../netconnect.pm_.c:590
+msgid "Connect to Internet"
+msgstr "Po��cz z Internetem"
 
-#
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Mysz Sun"
+#: ../../netconnect.pm_.c:592
+msgid "Disconnect from Internet"
+msgstr "Roz��cz po��czenie z Internetem"
 
-#
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Mysz Apple ADB"
+#: ../../netconnect.pm_.c:594
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Konfiguracja po��czenia z sieci� (LAN lub Internet)"
 
-#
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Mysz Apple ADB (2 przyciski)"
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "Internet - po�aczenie i konfiguracja"
 
-#
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Mysz Apple ADB (3 przyciski lub wi�cej)"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+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�?"
 
-#
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Mysz USB Apple"
+#: ../../netconnect.pm_.c:641
+msgid "Configure a normal modem connection"
+msgstr "Konfiguracja po��czenia modemowego"
 
-#
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Mysz Apple USB (2 przyciski)"
+#: ../../netconnect.pm_.c:661
+msgid "Configure an ISDN connection"
+msgstr "Konfiguracja po��czenia ISDN"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Mysz USB (3 przyciski lub wi�cej)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "Wewn�trzna karta ISDN"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Mysz standardowa (PS/2)"
+#: ../../netconnect.pm_.c:668
+msgid "External ISDN modem"
+msgstr "Zewn�trzny modem ISDN"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (PS/2)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "Po��czenie z Internetem"
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Mysz standardowa 3-przyciskowa (PS/2)"
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "Okre�l rodzaj po��czenia ISDN"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:691
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Konfiguracja po��czenia DSL (lub ADSL)"
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "Francja"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "Inne kraje"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr "W jakim kraju przebywasz?"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr "Modem Alcatel"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:714
+msgid "ECI modem"
+msgstr "Modem ECI"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "Je�li T�j modem to Alcatel, wybierz Alcatel, je�li nie, wybierz ECI."
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr "u�yj pppoe"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus Mouse"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr "nie u�ywaj pppoe"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus Mouse"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"Typowym sposobem po��cznia przez ADSL jest DHCP+pppoe.\n"
+"Isteniej� jednak po��czenia u�ywaj�ce wy��cznie DHCP.\n"
+"Je�li nie wiesz, wybierz \"u�yj pppoe\""
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus Mouse"
+#: ../../netconnect.pm_.c:765
+msgid "Configure a cable connection"
+msgstr "Konfiguracja po��czenia przez kabl�wk�"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "Mysz USB"
+#: ../../netconnect.pm_.c:787
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"Kt�rego klienta DHCP chcesz u�y�?\n"
+"Domy�lnym jest dhcpd"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "Mysz USB (3 przyciski lub wi�cej)"
+#: ../../netconnect.pm_.c:800
+msgid "Disable Internet Connection"
+msgstr "Wy��czenie po��czenia z Internetem"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Brak myszy"
+#: ../../netconnect.pm_.c:811
+msgid "Configure local network"
+msgstr "Konfiguracja sieci lokalnej"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Ver. 2.1A lub wy�sza (szeregowa)"
+#: ../../netconnect.pm_.c:815
+msgid "Network configuration"
+msgstr "Konfiguracja sieci"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech seria CC (szeregowa)"
+#: ../../netconnect.pm_.c:816
+msgid "Do you want to restart the network"
+msgstr "Chcesz zrestartowa� sie�?"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (szeregowa)"
+#: ../../netconnect.pm_.c:824
+msgid "Disable networking"
+msgstr "Wy��czenie sieci"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (szeregowa)"
+#: ../../netconnect.pm_.c:834
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Konfiguracja po��czenia z Intenetem / Konfiguracja sieci lokalnej"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (szeregowa)"
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"Sie� lokalna zosta�a ju� skonfigurowana.\n"
+"Czy chcesz:"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (szeregowa)"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "Jak chcesz ��czy� si� Internetem?"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "Seria MM (szeregowa)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Konfiguracja sieci"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (szeregowy)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
+"Twoje po��czenie z Internetem zosta�o skonfigurowane.\n"
+"Mo�na skonfigurowa� komputer jako wsp�dziel�cy po��czenie z Internetem\n"
+"Uwaga:  wymagana jest dedekowana karta sieciowa w��czaj�ca komputer w sie� "
+"lokaln� (LAN)\n"
+"\n"
+"Czy skonfigurowa� wsp�dzielenie po��czenia z Internetem?\n"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Mysz Logitech (szeregowa, stary typ C7)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "nie znaleziono karty sieciowej"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (szeregowa)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Konfiguracja sieci"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Mysz standardowa (szeregowa)"
+#: ../../network.pm_.c:274
+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\"."
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Kompatybilna z Microsoft (szeregowa)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr "Nazwa komputera"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Mysz standardowa 3-przyciskowa (szeregowa)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+"OSTRZE�ENIE: Urz�dzenie to zosta�o poprzednio skonfigurowane do po��czenia z "
+"Internetem.\n"
+"Naci�nij OK by zachowa� konfiguracj�.\n"
+"Modyfikacja p�l poni�ej spowoduje nadpisanie istniej�cej konfiguracji."
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (szeregowa)"
+#: ../../network.pm_.c:302
+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 ""
+"Prosz� poda� konfiguracj� IP dla komputera.\n"
+"Ka�da pozycja powinna by� wpisana w zapisie dziesi�tnym\n"
+"oddzielonym kropkami (np. 192.168.1.1)."
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Dzia�a prawid�owo?"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Konfiguracja urz�dzenia sieciowego %s"
+
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Automatyczne IP"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr "Adres IP"
+
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr "Maska"
+
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+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:341
+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 ""
+"Prosz� wpisa� nazw� komputera.\n"
+"Nazwa ta powinna by� w postaci pe�nej,\n"
+"np. \"mojkomputer.mojadomena.pl\".\n"
+"Je�li jest to potrzebne, nale�y wpisa� te� adres routera."
+
+#: ../../network.pm_.c:346
+msgid "DNS server"
+msgstr "Serwer DNS"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr "Router"
+
+#: ../../network.pm_.c:348
+msgid "Gateway device"
+msgstr "Interfejs (np. eth0)"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "Konfiguracja po�rednika"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "Po�rednik HTTP"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "Po�rednik FTP"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Nazwa po�rednika powinna by� typu: http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Nazwa po�rednika powinna by� typu: ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr "Na tej platformie nie istniej� partycje rozszerzone"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 ""
-"W tablicy partycji jest puste miejsce pomi�dzy partycjami, kt�rego nie "
-"mo�na\n"
-"wykorzysta�. Jedynym rozwi�zaniem jest przesuni�cie partycji podstawowych,\n"
-"by puste miejsce by�o obok partycji rozszerzonych"
+"W tablicy partycji jest puste miejsce pomi�dzy partycjami, kt�rego\n"
+"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:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "B��d odczytu pliku %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Przywracanie z pliku %s nie powiod�o si�: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
-msgstr "Z�y plik backupu"
+msgstr "Z�y plik archiwum"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "B��d zapisu do pliku %s"
@@ -4117,7 +5800,7 @@ msgstr "niezb�dny"
 
 #: ../../pkgs.pm_.c:21
 msgid "must have"
-msgstr "musi by�"
+msgstr "musisz mie�"
 
 #: ../../pkgs.pm_.c:22
 msgid "important"
@@ -4127,59 +5810,64 @@ msgstr "wa�ny"
 msgid "very nice"
 msgstr "bardzo fajny"
 
-#
 #: ../../pkgs.pm_.c:25
 msgid "nice"
 msgstr "fajny"
 
-#
 #: ../../pkgs.pm_.c:26 ../../pkgs.pm_.c:27
 msgid "interesting"
 msgstr "ciekawy"
 
-#
 #: ../../pkgs.pm_.c:28 ../../pkgs.pm_.c:29 ../../pkgs.pm_.c:30
 #: ../../pkgs.pm_.c:31
 msgid "maybe"
-msgstr "taka sobie"
+msgstr "taki sobie"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n( wa�ny)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (�wietny)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (przydatny)"
 
-#
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Poka� mniej"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Poka� wi�cej"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Lokalna drukarka"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
-msgstr "Zdalny lpd"
+#: ../../printer.pm_.c:20
+msgid "Remote printer"
+msgstr "Zdalna drukarka"
+
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
+msgstr "Zdalny serwer CUPS"
+
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
+msgstr "Zdalny serwer lpd"
+
+#: ../../printer.pm_.c:23
+msgid "Network printer (socket)"
+msgstr "Drukarka sieciowa (socket)"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+msgid "Printer Device URI"
+msgstr "Port drukarki URI:"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Wykrywanie urz�dze�..."
@@ -4193,12 +5881,11 @@ msgstr "Testowanie port�w"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Wykryto drukark� model \"%s\" na"
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Port drukarki lokalnej"
 
-#
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4206,39 +5893,37 @@ msgstr ""
 "Do jakiego portu jest pod��czona drukarka?\n"
 "(pami�taj, �e /dev/lp0 to odpowiednik LPT1:)\n"
 
-#
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Port drukarki:"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Opcje zdalnej drukarki lpd"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 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."
 msgstr ""
 "By u�ywa� zdalnej kolejki drukarki, nale�y poda�\n"
-"nazw� hosta serwera wydruku, oraz nazw� kolejki na\n"
+"nazw� serwera wydruku, oraz nazw� kolejki na\n"
 "serwerze, do kt�rej kierowane b�d� zadania wydruku."
 
-#
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
-msgstr "Nazwa zdalnego hosta:"
+msgstr "Nazwa serwera:"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Zdalna kolejka"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opcje drukarki SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4249,29 +5934,29 @@ msgstr ""
 "By drukowa� na drukarce SMB, musisz okre�li� nazw� serwera SMB\n"
 "(nie zawsze jest ona r�wnoznaczna z nazw� TCP/IP), o ile mo�liwe\n"
 "adres IP serwera wydruku,nazw� u�ytkownika, grup�, has�o oraz\n"
-" oczywi�cie nazw� drukarki."
+"oczywi�cie nazw� drukarki."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "Nazwa serwera SMB"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP serwera SMB"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Nazwa drukarki"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Grupa"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "Opcje drukarki NetWare"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4279,137 +5964,158 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 "By drukowa� na drukarce NetWare, nale�y poda� nazw� serwera\n"
-"wydruku NetWare (nie zawsze to samo co nazwa hosta TCP/IP!),\n"
-"nazw� kolejki drukarki, do kt�rej chcesz uzyska� dost�p, oraz\n"
-"w�a�ciw� nazw� u�ytkownika i has�o."
+"wydruku NetWare (nie zawsze to samo co nazwa TCP/IP!),\n"
+"nazw� kolejki drukarki, do kt�rej chcesz uzyska� dost�p,\n"
+"oraz w�a�ciw� nazw� u�ytkownika i has�o."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Serwer wydruku"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Nazwa kolejki drukarki"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+msgid "Socket Printer Options"
+msgstr "Opcje drukarki sieciowej"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+"By drukowa� na drukarce sieciowej, nale�y poda�\n"
+"nazw� sieciow� drukarki oraz opcjonalnie numer portu."
+
+#: ../../printerdrake.pm_.c:141
+msgid "Printer Hostname"
+msgstr "Nazwa sieciowa drukarki"
+
+#: ../../printerdrake.pm_.c:142
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:155
+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:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Jaki typ drukarki posiadasz?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Czy chcesz sprawdzi� drukowanie?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Drukowanie stron/y testowych/ej"
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\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"
+"Status drukowania:\n"
+"%s\n"
+"\n"
+"Czy wydruk jest prawid�owy?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+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:230
 msgid "Yes, print ASCII test page"
 msgstr "Tak, wydrukuj stron� testow� ascii"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
-msgstr "Tak, wydrukuj graficzn� stron� testow�"
+msgstr "Tak, wydrukuj graficzn� stron� testow�"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Tak, wydrukuj obie strony testowe"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Konfiguracja drukarki"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Jaki typ drukarki posiadasz?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Opcje drukarki"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Rozmiar papieru"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Wysun�� stron� po wydruku?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Opcje sterownika uniprint"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Opcje g��bi kolor�w"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Drukowa� tekst jako PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Odwrotna kolejno�� stron"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Usun�� efekt schodk�w?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Ilo�� stron na stronie wydruku"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Lewy/Prawy margines w punktach (1/72 cala) "
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "G�rny/Dolny margines w punktach (1/72 cala)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
-msgstr "Dodatkowe opcie GhostScriptu"
+msgstr "Dodatkowe opcje GhostScriptu"
 
-#
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
-msgstr "Dodatowe opcje dla tekstu"
-
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Czy chcesz sprawdzi� drukowanie?"
+msgstr "Dodatkowe opcje dla tekstu"
 
-#
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Drukowanie stron/y testowych/ej"
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\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"
-"Status drukowania:\n"
-"%s\n"
-"\n"
-"Czy wydruk jest prawid�owy?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-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:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Drukarka"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Czy chcesz skonfigurowa� drukark�?"
 
-#
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4417,21 +6123,65 @@ msgstr ""
 "Istniej� nast�puj�ce kolejki wydruku.\n"
 "Mo�esz doda� nast�pne lub zmieni� istniej�ce."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+msgid "CUPS starting"
+msgstr "Uruchamianie CUPS"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr "Odczytywanie bazy sterownik�w CUPS..."
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Wybierz spos�b pod��czenia drukarki"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Jak jest pod��czona drukarka?"
 
-#
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+msgid "Select Remote Printer Connection"
+msgstr "Wybierz spos�b pod��czenia zdalnej drukarki"
+
+#: ../../printerdrake.pm_.c:388
+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 ze zdalnego serwera CUPS, drukarki\n"
+"zostan� automatycznie wykryte, nie ma potrzeby ich konfiguracji.\n"
+"W przypadku w�tpliow�ci, wybierz \"Zdalny serwer CUPS\"."
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Zdalna kolejka"
 
-#
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+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?"
+
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
+msgstr "Nazwa drukarki"
+
+#: ../../printerdrake.pm_.c:405
+msgid "Description"
+msgstr "Opis"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
+msgstr "Lokalizacja"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4442,56 +6192,53 @@ msgstr ""
 "wymaga nazwania (cz�sto lp) oraz przypisania katalogu na bufor.\n"
 "Jak nazwa� katalog przypisany do kolejki oraz jak drukarka jest pod��czona?"
 
-#
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Nazwa kolejki:"
 
-#
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Katalog bufora:"
 
-#
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Pod��czenie drukarki"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, 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:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
-msgstr "Nie mog� zapisa� pliku $file"
+msgstr "Nie mo�na zapisa� pliku $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid pad�"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid pad� ( mo�e brak raidtools)?"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Za ma�o partycji dla RAID poziom %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
-msgstr "Anacron - program uruchamiaj�cy okresowo zadania"
+msgstr "Anacron - program uruchamiaj�cy okresowo zadania."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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 przekazuje przez syslog informacje o stanie baterii.\n"
-"Umo�liwia tak�e zamkni�cie systemu, gdy bateria jest zbyt wy�adowana."
+"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:17
+#: ../../services.pm_.c:18
 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."
@@ -4500,18 +6247,18 @@ msgstr ""
 "\"at\"\n"
 "oraz wykonuje zadania wsadowe, gdy obci��enie systemu jest niewielkie."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 jest standartowym programem unixowym, kt�ry zarz�dza wykonywaniem\n"
+"cron jest standardowym programem unixowym, kt�ry zarz�dza wykonywaniem\n"
 "program�w u�ytkownika w okre�lonych przez u�ytkownika porach;\n"
 "vixie cron ma dodatkowe opcje, zabezpieczenia i konfiguracji."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4519,10 +6266,10 @@ msgid ""
 "and includes support for pop-up menus on the console."
 msgstr ""
 "GPM umo�liwia pos�ugiwanie si� mysz� w aplikacjach,\n"
-"pracuj�cych pod konsol� Linuxa jak n.p. Midnigth Commander.\n"
+"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:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4530,7 +6277,7 @@ msgstr ""
 "Apache to serwer WWW. Jest u�ywany do udost�pniania plik�w \n"
 "HTML i CGI w Internecie/Intranecie."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4541,9 +6288,10 @@ msgid ""
 msgstr ""
 "Internetowy (super)demon, zwany inetd startuje wiele us�ug internetowych,\n"
 "takich jak telnet, ftp, rsh i rlogin. Wy��czenie go uniemo�liwia korzystanie "
+"\n"
 "z tych us�ug."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4553,23 +6301,23 @@ 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:34
+#: ../../services.pm_.c:35
 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 to demon, konieczny do prawid�owego dzia�ania lpr,a przez to ca�ego "
+"lpd to demon, konieczny do prawid�owego dzia�ania lpr,a przez to ca�ego \n"
 "systemu drukowania."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
 "named (BIND)   to DNS -czyli serwer, umo�liwiaj�cy t�umaczenie\n"
-"nazw host�w (komputer�w, pod��czonych do WWW) na ich adresy IP."
+"nazw komputer�w na ich adresy IP."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4577,24 +6325,24 @@ 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:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
-"W��cza/wy��cza interfejsy sieciowe skonfigurowane\n"
-"do dzia�ania podczas uruchamiania systemu."
+"W��cza/wy��cza skonfigurowane interfejsy sieciowe\n"
+"podczas uruchamiania systemu."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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 jest popularnym protoko�em udost�pniania plik�w w sieci TCP/IP.\n"
-"Us�uga uruchamia konfigurowany przez plik /etc.exports serwer NFS."
+"Ta us�uga uruchamia konfigurowany przez plik /etc/exports serwer NFS."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4602,30 +6350,30 @@ 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:47
+#: ../../services.pm_.c:48
 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 uzywany jest zwykle do obs�ugi kart ethernetowych i modem�w\n"
+"PCMCIA u�ywany jest zwykle do obs�ugi kart ethernetowych i modem�w\n"
 "w laptopach. Nie jest uruchamiany, je�eli si� go nie skonfiguruje\n"
-"a wi�c bezpiecznie mo�e by� instalowany nawet na maszynach, kt�re go nie "
+"a wi�c bezpiecznie mo�e by� instalowany nawet na maszynach, kt�re go nie \n"
 "potrzebuj�."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 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 zarz�dza po�aczeniami RPC, u�ywanymi przez protoko�y takie, jak\n"
-"NFS i NIS . Je�eli twoja maszyna jest serwerem dla protoko��w, kt�re \n"
-"wykorzystuj� RPC, musisz go uruchomi� na starcie."
+"Portmapper zarz�dza po��czeniami RPC, u�ywanymi przez protoko�y takie, jak\n"
+"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:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4633,13 +6381,13 @@ msgstr ""
 "Postfix to agent pocztowy (MTA),\n"
 "przesy�aj�cy poczt� mi�dzy maszynami."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr "Polepsza generacj� liczb pseudolosowych."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4649,97 +6397,261 @@ 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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
-"Protoku� rstat umo�liwia u�ytkownikowi sieci monitorowanie \n"
+"Protok� rstat umo�liwia u�ytkownikowi sieci monitorowanie \n"
 "wydajno�ci innych maszyn w sieci."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
-"Protoku� rusers pozwala na sprawdzanie, kto jest zalogowany na innych,\n"
+"Protok� rusers pozwala na sprawdzanie, kto jest zalogowany na innych,\n"
 "dost�pnych maszynach w sieci."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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 dzia�a jak who ( podaje list� u�ytkownik�w) dla innych maszyn w sieci.\n"
+"Protok� rwho dzia�a jak who ( podaje list� u�ytkownik�w) dla innych maszyn "
+"w sieci.\n"
 "kt�re maj� w��czony demon rwho (podobny do finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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 to narz�dzie, pozwalaj�ce r�nym demonom uaktualnianie wpis�w do\n"
-"r�nych plik�w \"dziennikowych\" ( log files). Jego uruchomienie jest "
-"zalecane."
+"r�nych plik�w \"dziennikowych\" ( log files).\n"
+"Jego uruchomienie jest zalecane."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
-msgstr "Ten skrypt startowy �aduje modu� ob�uguj�cy mysz usb."
+msgstr "Ten skrypt startowy �aduje modu� obs�uguj�cy mysz usb."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
-"Uruchamia przy starcie i zatrzymuje przy zamykaniu systemu X serwer font�w."
+"Uruchamia przy starcie i zatrzymuje przy zamykaniu systemu X serwer czcionek."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Wybierz us�ugi automatycznie uruchamiane podczas startu"
 
-# 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.
-#
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Witamy w programie wybierajacym system - SILO\n"
-"\n"
-"By zobaczyc dostepne mozliwosci, nacisnij <TAB>.\n"
-"\n"
-"By zaladowac jedna z nich, wpisz jej nazwe i nacisnij <ENTER>\n"
-"lub czekaj %d sekund na domyslny start.\n"
-"\n"
+"Nie mo�na odczyta� tablicy partycji, jest zbyt uszkodzona :(\n"
+"Mo�na pr�bowa� kontynuowa� z pustymi partycjami"
 
-#
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Konfiguracja LILO/GRUB"
 
-#
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Tworzenie dysku startowego"
 
-#
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
-msgstr "Formatownie dyskietki"
+msgstr "Formatowanie dyskietki"
 
-#
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Wyb�r"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "Instalacja LILO nie powiod�a si�. Wyst�pi� nast�puj�cy b��d:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Wsp�dzielenie po��czenia z Internetem jest w��czone"
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+"Konfiguracja wsp�dzielenia po��czenia z Internetem zosta�a ju� wykonana.\n"
+"Jest teraz uaktywniona.\n"
+"\n"
+"Co chcesz zrobi�?"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+msgid "disable"
+msgstr "wy��czy�"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr "zwolni�"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+msgid "reconfigure"
+msgstr "rekonfigurowa�"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Wsp�dzielenie po��czenia z Internetem jest wy��czone"
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+"Konfiguracja wsp�dzielenia po��czenia z Internetem zosta�a ju� wykonana.\n"
+"Jest teraz nieaktywna.\n"
+"\n"
+"Co chcesz zrobi�?"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+msgid "enable"
+msgstr "w��czy�"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "Zawarto�� pliku konfiguracyjnego nie mo�e zosta� zinterpretowana."
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "Wsp�dzielenie po��czenia z Internetem"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+"Komputer mo�e by� skonfigurowany do wsp�dzielenia po��czenia z Internetem.\n"
+"\n"
+"Uwaga: wymagana jest dedykowana karta sieciowa w��czaj�ca komputer w sie� "
+"lokaln� (LAN)\n"
+"\n"
+"Czy skonfigurowa� wsp�dzielenie po��czenia z Internetem?"
+
+#: ../../standalone/drakgw_.c:177
+msgid "using module"
+msgstr "u�ywanie modu�u"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "Nie wykryto w systemie karty sieciowej!"
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Nie wykryto w systemie karty sieciowej. Prosz� uruchomi� program "
+"konfiguracji sprz�tu."
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"W Twoim systemie istnieje tylko jedna skonfigurowana karta sieciowa:\n"
+"\n"
+"$interface\n"
+"\n"
+"Czy skonfigurowa� sie� lokaln� (LAN) przy wykorzystaniu tej karty?"
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"Wska�, kt�ra karta sieciowa b�dzie po��czona\n"
+"z sieci� lokaln� (LAN)."
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"Uwaga, karta sieciowa zosta�a ju� skonfigurowana.\n"
+"Czy chcesz j� konfigurowa� ponownie?"
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+"W bie��cej konfiguracji wykryto mo�liwy konflikt adres�w sieciowych: $_!\n"
+
+#: ../../standalone/drakgw_.c:268
+msgid "Firewalling configuration detected!"
+msgstr "Wykryto konfiguracj� firewalla!"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+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:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+"Konfiguracja skrypt�w, instalowanie program�w, uruchamianie serwer�w..."
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring..."
+msgstr "Konfiguracja..."
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "Przy pomocy urpmi nie mo�na zainstalowa� pakietu RPM ipchains."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "Przy pomocy urpmi nie mo�na zainstalowa� pakietu RPM dhcp."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "Przy pomocy urpmi nie mo�na zainstalowa� pakietu RPM linuxconf."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "Przy pomocy urpmi nie mo�na zainstalowa� pakietu RPM bind."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+"Przy pomocy urpmi nie mo�na zainstalowa� pakietu RPM caching-nameserver."
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Gratulacje!"
+
+#: ../../standalone/drakgw_.c:513
+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 ""
+"Wszytko zosta�o skonfigurowane.\n"
+"Mo�esz udost�pnia� po��czenie z Internetem innym komputeremw sieci lokalnej, "
+"u�ywaj�c automatycznej konfiguracji sieci (DHCP)"
+
 #: ../../standalone/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4772,7 +6684,7 @@ msgid ""
 "to connect to the Internet as a client. There are now security checks. "
 msgstr ""
 "To jest standardowy poziom zabezpiecze� dla komputera, kt�ry b�dzie\n"
-"korzysta� z sieci jako klient."
+"korzysta� z sieci jako klient. "
 
 #: ../../standalone/draksec_.c:36
 msgid ""
@@ -4782,8 +6694,8 @@ msgid ""
 "connections from many clients. "
 msgstr ""
 "Ten poziom umo�liwia u�ycie komputera jako serwera, kt�ry akceptuje\n"
-"po�aczenia z wieloma klientami przy zachowaniu wysokiego \n"
-"poziomu bezpieczenstwa."
+"po��czenia z wieloma klientami przy zachowaniu wysokiego \n"
+"poziomu bezpiecze�stwa."
 
 #: ../../standalone/draksec_.c:39
 msgid ""
@@ -4801,27 +6713,34 @@ msgstr "Ustawienie poziomu bezpiecze�stwa"
 msgid "Choose the tool you want to use"
 msgstr "Wyb�r u�ywanych narz�dzi"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Wyb�r uk�adu klawiatury"
+#: ../../standalone/livedrake_.c:23
+msgid "Change Cd-Rom"
+msgstr "Zmiana CD-ROM"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Wyb�r rodzaju myszy"
+#: ../../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 ""
+"W�� p�yt� Installation CD-Rom do kieszeni czytnika i naci�nij Ok.\n"
+"Je�li jej nie masz, naci�nij Anuluj, by omin�� uaktualnienie."
+
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr "Nie mo�na uruchomi� uaktualnienia!!!\n"
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "nie znaleziono serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Emulowa� �rodkowy przycisk?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Do kt�rego portu szeregowego jest pod��czona mysz?"
 
-#
 #: ../../standalone/rpmdrake_.c:25
 msgid "reading configuration"
 msgstr "odczyt konfiguracji"
@@ -4834,19 +6753,16 @@ msgstr "Plik"
 #: ../../standalone/rpmdrake_.c:48 ../../standalone/rpmdrake_.c:229
 #: ../../standalone/rpmdrake_.c:253 ../../standalone/rpmdrake_.c:269
 msgid "Search"
-msgstr "Szukaj"
+msgstr "Znajd�"
 
-#
 #: ../../standalone/rpmdrake_.c:49 ../../standalone/rpmdrake_.c:56
 msgid "Package"
 msgstr "Pakiet"
 
-#
 #: ../../standalone/rpmdrake_.c:51
 msgid "Text"
 msgstr "Tekst"
 
-#
 #: ../../standalone/rpmdrake_.c:53
 msgid "Tree"
 msgstr "Drzewo"
@@ -4859,22 +6775,18 @@ msgstr "Sortowanie wg"
 msgid "Category"
 msgstr "Kategoria"
 
-#
 #: ../../standalone/rpmdrake_.c:58
 msgid "See"
 msgstr "Widok"
 
-#
 #: ../../standalone/rpmdrake_.c:59 ../../standalone/rpmdrake_.c:163
 msgid "Installed packages"
 msgstr "Zainstalowane pakiety"
 
-#
 #: ../../standalone/rpmdrake_.c:60
 msgid "Available packages"
 msgstr "Dost�pne pakiety"
 
-#
 #: ../../standalone/rpmdrake_.c:62
 msgid "Show only leaves"
 msgstr "Poka� tylko pozosta�e"
@@ -4883,25 +6795,22 @@ msgstr "Poka� tylko pozosta�e"
 msgid "Expand all"
 msgstr "Rozwi� wszystko"
 
-#
 #: ../../standalone/rpmdrake_.c:68
 msgid "Collapse all"
 msgstr "Zwi� wszystko"
 
-#
 #: ../../standalone/rpmdrake_.c:70
 msgid "Configuration"
 msgstr "Konfiguracja"
 
 #: ../../standalone/rpmdrake_.c:71
 msgid "Add location of packages"
-msgstr "Dodaj po�ozenie pakiet�w"
+msgstr "Dodaj po�o�enie pakiet�w"
 
 #: ../../standalone/rpmdrake_.c:75
 msgid "Update location"
 msgstr "Aktualizuj po�o�enie"
 
-#
 #: ../../standalone/rpmdrake_.c:79 ../../standalone/rpmdrake_.c:328
 msgid "Remove"
 msgstr "Usu�"
@@ -4910,7 +6819,6 @@ msgstr "Usu�"
 msgid "Configuration: Add Location"
 msgstr "Konfiguracja: Dodaj po�o�enie"
 
-#
 #: ../../standalone/rpmdrake_.c:103
 msgid "Find Package"
 msgstr "Znajdowanie pakiet�w"
@@ -4927,12 +6835,10 @@ msgstr "Prze��czenie mi�dzy Zainstalowane i Dost�pne"
 msgid "Files:\n"
 msgstr "Pliki:\n"
 
-#
 #: ../../standalone/rpmdrake_.c:161 ../../standalone/rpmdrake_.c:209
 msgid "Uninstall"
 msgstr "Odinstaluj"
 
-#
 #: ../../standalone/rpmdrake_.c:163
 msgid "Choose package to install"
 msgstr "Wyb�r pakiet�w do zainstalowania"
@@ -4945,12 +6851,10 @@ msgstr "Sprawdzanie zale�no�ci"
 msgid "Wait"
 msgstr "Czekaj"
 
-#
 #: ../../standalone/rpmdrake_.c:209
 msgid "The following packages are going to be uninstalled"
 msgstr "Nast�puj�ce pakiety zostan� usuni�te"
 
-#
 #: ../../standalone/rpmdrake_.c:210
 msgid "Uninstalling the RPMs"
 msgstr "Usuwanie pakiet�w"
@@ -4961,7 +6865,7 @@ msgstr "Wyra�enie regularne"
 
 #: ../../standalone/rpmdrake_.c:229
 msgid "Which package are looking for"
-msgstr "Jakiego pakietu szukasz"
+msgstr "Jakiego pakietu szukasz?"
 
 #: ../../standalone/rpmdrake_.c:238 ../../standalone/rpmdrake_.c:262
 #: ../../standalone/rpmdrake_.c:278
@@ -4972,12 +6876,12 @@ msgstr "nie znaleziono %s "
 #: ../../standalone/rpmdrake_.c:238 ../../standalone/rpmdrake_.c:262
 #: ../../standalone/rpmdrake_.c:278
 msgid "No match"
-msgstr "Nie znaleziono"
+msgstr "Nic nie pasuje"
 
 #: ../../standalone/rpmdrake_.c:238 ../../standalone/rpmdrake_.c:262
 #: ../../standalone/rpmdrake_.c:278
 msgid "No more match"
-msgstr "Wi�cej nie znaleziono"
+msgstr "Nic wi�cej nie pasuje"
 
 #: ../../standalone/rpmdrake_.c:246
 msgid ""
@@ -4985,7 +6889,7 @@ msgid ""
 "I'm going to relaunch rpmdrake to allow searching files"
 msgstr ""
 "Teraz rpmdrake zostanie ponownie uruchomiony,\n"
-"aby umo�liwi� szukonie zbior�w."
+"aby umo�liwi� szukanie zbior�w."
 
 #: ../../standalone/rpmdrake_.c:253
 msgid "Which file are you looking for?"
@@ -4999,7 +6903,6 @@ msgstr "Czego szukasz?"
 msgid "Give a name (eg: `extra', `commercial')"
 msgstr "Podaj termin (n.p. ``extra'', ``commercial'')"
 
-#
 #: ../../standalone/rpmdrake_.c:291
 msgid "Directory"
 msgstr "Katalog"
@@ -5022,7 +6925,7 @@ msgstr ""
 
 #: ../../standalone/rpmdrake_.c:302
 msgid "Please submit the following information"
-msgstr "Prze�lij nast�puj�c� informacj�"
+msgstr "Wy�lij nast�puj�c� informacj�"
 
 #: ../../standalone/rpmdrake_.c:304
 #, c-format
@@ -5046,3 +6949,167 @@ msgstr "Znajdowanie pozosta�ych"
 #: ../../standalone/rpmdrake_.c:360
 msgid "Finding leaves takes some time"
 msgstr "Znajdowanie pozosta�ych zajmie troch� czasu"
+
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Wi�cej pulpit�w graficznych (Gnome, IceWM)"
+
+# ../../share/compssUsers
+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"
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr "Zarz�dzanie osobistymi informacjami"
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr "Narz�dzia do tworzenia i nagrywania CD"
+
+msgid "Internet Tools"
+msgstr "Narz�dzia Internetowe"
+
+msgid "Internet"
+msgstr "Internet"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr "Finanse osobiste"
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itp."
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr "Programy graficzne, np. Gimp"
+
+msgid "Office"
+msgstr "Biuro"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr "Bazy danych (mysql i postgresql)"
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Narz�dzia do Palmi Pilota lub Visior"
+
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Grafika"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr "Odtwarzacze video i edytory"
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programy rozrywkowe: zr�czno�ciowe, planszowe, strategiczne, itp."
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programy biurowe: procesory tekstu (kword, abiword), arkusze kalkulacyjne "
+"(kspread, gnumeric), przegl�darki pdf, itp."
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Zestaw narz�dzi do czytania i wysy�ania poczty i grup dyskusyjnych (pin, "
+"mutt, tin) oraz przegl�dania sieci Web"
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Dzwi�k: odtwarzacze mp3 i midi, miksery, itp."
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+"Rozmowy chat: (IRC lub natychamiastowa komunikacja) programy jak xchat, "
+"licq, gaim, oraz narz�dzia transferu plik�w"
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Podr�czniki i HOWTO o Linuksie i wolnym oprogramowaniu"
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itp"
+
+# ../../share/compssUsers
+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
+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 "Multimedia - Video"
+msgstr "Multimedia - Video"
+
+msgid "KDE"
+msgstr "KDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr "Programy do odtwarzania / edycji d�wi�ku i video"
+
+msgid "Multimedia"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr "Inne pulpity graficzne"
+
+msgid "Multimedia - Sound"
+msgstr "Multimedia - D�wi�k"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Dokumentacja"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programy do zarz�dzania finansami, np gnucash"
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr "Obr�bka grafiki"
+
+msgid "Games"
+msgstr "Gry"
+
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - Nagrywanie p�yt CD"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr "U�atwienia komunikacyjne"
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr "Bazy danych"
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Okre�l rozmiar przeznaczony na instalacj�"
+
+#~ msgid "Total size: "
+#~ msgstr "Ca�kowity rozmiar: "
+
+#~ msgid "Reconfigure local network"
+#~ msgstr "Rekonfiguracja sieci lokalnej"
diff --git a/perl-install/share/po/pt.po b/perl-install/share/po/pt.po
index 05b5b2246..1d119568c 100644
--- a/perl-install/share/po/pt.po
+++ b/perl-install/share/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 1999-11-28 23:04-0300\n"
 "Last-Translator: Paulo Cardoso <paulo@ejs.is>\n"
 "Language-Team: Portuguese\n"
@@ -14,43 +14,91 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Placa Gr�fica"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Selecione uma placa gr�fica"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Escolha um X server"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "servidor  X"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, fuzzy, c-format
+msgid "XFree %s"
+msgstr "Server XFree86: %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Qual tipo de entrada voc� quer adicionar?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+#, fuzzy
+msgid "XFree configuration"
+msgstr "Configura��o p�s-instal��o"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Selecione o tamanho da mem�ria de sua placa gr�fica"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Escolha as op��es do server"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Escolha um monitor"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -73,39 +121,40 @@ msgstr ""
 "monitor.\n"
 " Se tiver d�vida, escolha caracter�sticas conservadoras."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Taxa de atualiza��o horizontal"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Taxa de atualiza��o vertical"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Monitor n�o configurado"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Placa gr�fica ainda n�o configurado"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Resolu��es ainda n�o escolhidas"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Voc� quer testar a configura��o"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+#, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Aten��o: o teste � perigoso nessa placa gr�fica"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Testar configura��o"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -113,186 +162,170 @@ msgstr ""
 "\n"
 "tente mudar alguns par�metros"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Ocorreu um erro:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Saindo em %d segundos"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 #, fuzzy
 msgid "Is this the correct setting?"
 msgstr "Isto est� correto?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Ocorreu um erro, tente mudar alguns par�metros"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Resolu��es Autom�ticas"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Para encontrar as resolu��es dispon�veis eu irei tentar algumas diferentes.\n"
-"Sua tela vai piscar...\n"
-"Voc� pode deslig�-la se quiser, voc� ouvir� um beep quando terminar"
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Resolu��o"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Escolha a resolu��o e n�mero de cores"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Placa Gr�fica: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Server XFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Mostrar tudo"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Resolu��es"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Eu posso tentar achar as resolu��es dispon�veis (ex.: 800x600).\n"
-"Algumas vezes, por�m, pode travar o computador.\n"
-"Voc� quer tentar?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Nenhuma resolu��o v�lida encontrada\n"
-"Tente selecionar outra placa de v�deo ou monitor"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Estilo do teclado: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipo do Mouse: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Dispositivo do mouse: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Sincroniza��o Horizontal do Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Atualiza��o Vertical do Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Placa Gr�fica: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Mem�ria gr�fica: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Op��es da profundidade das cores"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Resolu��es"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Server XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "Server XFree86: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Preparando configura��o X-Window"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Mudar Monitor"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Mudar Placa Gr�fica"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Mudar op��es do Server"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Mudar Resolu��o"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Procura autom�tica de resolu��es"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Mostrar informa��o"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Testar de novo"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Sair"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "O que voc� quer fazer?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Esquecer as altera��es?"
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Manter a configura��o IP atual"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Favor relogar em %s para ativar as mudan�as"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 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:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X ao iniciar"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -300,231 +333,229 @@ msgstr ""
 "Eu posso fazer seu computador automaticamento iniciar no X ap�s o boot.\n"
 "Voc� gostaria de inicar o X quando reiniciar?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1152
+#, 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."
+msgstr ""
+"Eu posso fazer seu computador automaticamento iniciar no X ap�s o boot.\n"
+"Voc� gostaria de inicar o X quando reiniciar?"
+
+#: ../../Xconfigurator.pm_.c:1154
+#, fuzzy
+msgid "Choose the default user:"
+msgstr "Escolha o novo tamanho"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Escolha a ferramente que voc� quer usar"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 cores (8 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil cores (15 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil cores (16 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 milh�es de cores (24 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 bilh�es de cores (32 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB ou mais"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA Padr�o, 640x480 a 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 a 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 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:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "SVGA de Alta Frequ�ncia, 1024x768 a 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 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:123
+#: ../../Xconfigurator_consts.pm_.c:126
 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:124
+#: ../../Xconfigurator_consts.pm_.c:127
 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:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor que pode fazer 1600x1200 a 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor que pode fazer 1600x1200 a 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr ""
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "default"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-#, fuzzy
-msgid "tie"
-msgstr "Ativo"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr ""
-
-#: ../../any.pm_.c:19
-#, fuzzy
-msgid "automagic"
-msgstr "IP Autom�tico"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Primeiro setor da parti��o de boot"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Primeiro setor do drive (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
+#: ../../any.pm_.c:95
+#, fuzzy
+msgid "SILO Installation"
 msgstr "Instala��o do LILO/grub"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Onde voc� quer instalar o carregador de boot?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "Instala��o do LILO/grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 #, fuzzy
 msgid "None"
-msgstr "Pronto"
+msgstr "pronto"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 #, fuzzy
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Qual setor voc� quer mover?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+#, fuzzy
+msgid "Bootloader installation"
+msgstr "Principais op��es do LILO"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Dispositivo de boot"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr ""
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Compacto"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "Compacto"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Tempo antes de entrar na imagem padr�o"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Modo de V�deo"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Tempo antes de entrar na imagem padr�o"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Senha"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Senha (de novo)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Restringir op��es da linha de comando"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "restrito"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 #, fuzzy
 msgid "Bootloader main options"
 msgstr "Principais op��es do LILO"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Favor tentar novamente"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "As senhas n�o conferem"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 #, fuzzy
 msgid ""
 "Here are the different entries.\n"
@@ -533,167 +564,345 @@ msgstr ""
 "A seguir est�o as entradas do LILO.\n"
 "Voc� pode adicionar mais ou modificar as existentes."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Pronto"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Qual tipo de entrada voc� quer adicionar?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
-msgid "Other OS (windows...)"
+#: ../../any.pm_.c:175
+#, fuzzy
+msgid "Other OS (SunOS...)"
 msgstr "Outros SO (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Qual tipo de entrada voc� quer adicionar?"
+#: ../../any.pm_.c:175
+msgid "Other OS (windows...)"
+msgstr "Outros SO (windows...)"
 
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Image"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Append"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Read-write"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Table"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Unsafe"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Label"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Default"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Remover entrada"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "N�o � permitido label vazio"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Esse label j� est� sendo utilizado"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Interfaces %s %s encontradas"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Voc� tem alguma outra?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Voc� tem alguma interface %s?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "N�o"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Sim"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Instalando driver para %s placa %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(m�dulo %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Qual driver %s eu deveria tentar?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"Em alguns casos, o driver %s precisa de informa��es extra para funcionar\n"
+"corretamente, mas ele normalmente funciona bem sem essas informa��es. Voc�\n"
+"gostaria de especificar op��es extras ou deixar o driver localizar na sua\n"
+"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:547
+msgid "Autoprobe"
+msgstr "Auto localizar"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Especificar op��es"
+
+#: ../../any.pm_.c:551
+#, 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:557
+#, 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 ""
+"Agora voc� pode prover as op��es para o m�dulo %s.\n"
+"As op��es est�o no formato ``nome=valor nome2=valor2 ...''\n"
+"Para inst�ncia, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Op��es do m�dulo:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Falha carregando m�dulo %s.\n"
+"Voc� quer tentar novamente com outros par�mentros?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Bem-vindo ao %s, o selecionador de sistema operacional!\n"
+"\n"
+"Para listar as opcoes possives, tecle <TAB>.\n"
+"\n"
+"Para carregar um deles, escreva o nome e pressione <ENTER>\n"
+"ou aguarde %d segundos para o boot padrao.\n"
+
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr ""
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr ""
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr ""
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr ""
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr ""
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr ""
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr ""
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr ""
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "Saindo em %d segundos"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Criar"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Desmontar"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Deletar"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Formatar"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Ponto de Montagem"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Gravar /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Mudar para modo expert"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Mudar para modo normal"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Restaurar do arquivo"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Salvar no arquivo"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Restaurar do disquete"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Salvar em disquete"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Limpar tudo"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Formatar tudo"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Auto alocar"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Todas as parti��es prim�rias est�o sendo usadas"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Eu n�o posso adicionar mais nenhuma parti��o"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -701,59 +910,63 @@ msgstr ""
 "Para ter mais parti��es, favor deletar uma para poder criar uma parti��o "
 "extendida"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Recuperar tabela de parti��o"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Desfazer"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Gravar tabela de parti��o"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Atualizar"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Vazio"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Outro"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Vazio"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Outro"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Tipos de sistema de arquivo:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -765,94 +978,94 @@ msgstr ""
 "Eu sugiro voc� a primeiro redimensionar a parti��o\n"
 "(clique nela, depois clique em \"Redimensinar\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Favor primeiro fazer um backup de seus dados"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Ler com aten��o!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 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:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Erro"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Ponto de montagem: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, 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:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Iniciar: setor: %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Tamanho: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s setores"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Cilindro %d ao cilindro %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Formatado\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "N�o formatado\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Montado\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -860,79 +1073,79 @@ msgstr ""
 "Parti��o de boot padr�o\n"
 "    (para boot do MS-DOS, n�o para o lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "N�vel %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Tamanho do bloco %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "Discos RAID %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Favor clicar em uma parti��o"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Tamanho: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometria: %s cilindros, %s cabe�as, %s setores\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, fuzzy, c-format
 msgid "Partition table type: %s\n"
 msgstr "Gravar tabela de parti��o"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "no barramento %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Montar"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Ativo"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Adicionar ao RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Remover do RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Modificar RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Escolher a��o"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -944,7 +1157,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:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -957,204 +1170,210 @@ msgstr ""
 "Se voc� quer usar o gerenciador de boot LILO, tenha cuidade para adicinar "
 "uma parti��o /boot."
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Use ``%s'' ao inv�s"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Use ``Desmontar'' primeiro"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, fuzzy, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "todos os dados desta parti��o ser�o perdidos"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Continuar mesmo assim?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Sair sem salvar"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Sair sem gravar na tabela de parti��o?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Mudar tipo de parti��o"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Qual tipo de parti��o voc� quer?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "Qual l�ngua voc� quer?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, fuzzy, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Onde voc� quer montar o dispositivo %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Onde voc� quer montar o dispositivo %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, fuzzy, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "todos os dados desta parti��o ser�o perdidos"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Formatando"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, fuzzy, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formatando parti��o %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formatando parti��o %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Ap�s formatar todas as parti��es,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "todos os dados nessas parti��es ser�o perdidos"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Mover"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 #, fuzzy
 msgid "Which disk do you want to move it to?"
 msgstr "Qual disco voc� quer mover?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Setor"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 #, fuzzy
 msgid "Which sector do you want to move it to?"
 msgstr "Qual setor voc� quer mover?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Movendo"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Movendo parti��o..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, 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!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 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:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Computando limites do sistema de arquivo FAT"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Qual tipo de parti��o voc� quer?"
+
+#: ../../diskdrake.pm_.c:597
 #, fuzzy
 msgid "All data on this partition should be backed-up"
 msgstr "todos os dados desta parti��o ser�o perdidos"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, fuzzy, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "todos os dados desta parti��o ser�o perdidos"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Escolha o novo tamanho"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Criar uma nova parti��o"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Setor inicial: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Tamanho em MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Tipo do Sistema de Arquivos: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Prefer�ncia: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 #, fuzzy
 msgid "File already exists. Use it?"
 msgstr "Uma entrada %s j� existe"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Selecione arquivo"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1162,11 +1381,11 @@ msgstr ""
 "O backup da tabela de parti��o n�o tem o mesmo tamanho\n"
 "Ainda continuar?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1174,77 +1393,77 @@ msgstr ""
 "Insira um disquete no drive\n"
 "Todos os dados no disquete ser�o perdidos"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Tentando resgatar tabela de parti��o"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "dispositivo"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "n�vel"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "tamanho do bloco"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Escolha um RAID existente para adicionar"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "novo"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formata��o de %s falhou"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "N�o sabe como formatar %s no tipo %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "falhou ao montar nfs"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "falhou ao montar: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "erro desmontando %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Pontos de montagem devem come�ar com uma /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, 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:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Erro arbindo %s para grava��o: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1252,75 +1471,81 @@ 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:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Voc� n�o tem nenhuma parti��o!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "Escolha linguagem preferido para a instala��o e utiliza��o do sistema"
 
-#: ../../help.pm_.c:10
-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:13
-#, fuzzy
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "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 ""
+
+#: ../../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"
-"  - 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"
-msgstr ""
-"Escolha \"Instalar\" se voc� n�o tem vers�es anteriores do Linux\n"
-"instaladas, ou se voc� deseja usar m�ltiplas distribui��es ou vers�es.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Escolha \"Atualizar\" se voc� deseja atualizar sua vers�o do\n"
-"Linux Mandrake: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000 ou 7.0 (Air).\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"
-"Selecione:\n"
+"\t* Recommanded: 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"
-"  - Recomendado: Se voc� nunca instalou Linux antes.\n"
 "\n"
-"  - Customizado: Se voc� j� � familiar com Linux, voc� poder� \n"
-"selecionar o tipo de instala��o entre normal, desenvolvimento ou\n"
-"servidor. Escolha \"Normal\"  para uma instala��o gen�rica no seu\n"
-"computador. Voc� pode escolher \"Desenvolvimento\" se voc� usar� o "
-"computador\n"
-"principalmente para o desenvolvimento de software, ou escolha \"Server\" se\n"
-"voc� deseja instalar um servidor gen�rico (para correio, impress�o...).\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - Expert: Se voc� � fluente com GNU/Linux e quer fazer uma\n"
-"instala��o altamente customizada, esse � o tipo de instala��o para voc�.\n"
-"Voc� poder� escolher a utiliza��o do seu sistema como \"Customizado\".\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1328,16 +1553,16 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Selecione:\n"
 "\n"
-"\n"
 "  - Customizado: Se voc� j� � familiar com Linux, voc� poder� \n"
 "selecionar o tipo de instala��o entre normal, desenvolvimento ou\n"
 "servidor. Escolha \"Normal\"  para uma instala��o gen�rica no seu\n"
@@ -1349,313 +1574,517 @@ msgstr ""
 "\n"
 "  - Expert: Se voc� � fluente com GNU/Linux e quer fazer uma\n"
 "instala��o altamente customizada, esse � o tipo de instala��o para voc�.\n"
-"Voc� poder� escolher a utiliza��o do seu sistema como \"Customizado\".\n"
+"Voc� poder� escolher a utiliza��o do seu sistema como \"Customizado\"."
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 ir� tentar detectar um ou mais adaptador(es) PCI\n"
-"SCSI. Se encontrar algum e tiver o driver dele(s), ele(s) ser�(ser�o)\n"
-"instalado(s) automaticamente.\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"
+"\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"
-"Se seu adaptador SCSI est� em uma placa ISA, ou � PCI mas DrakX\n"
-"n�o saber qual driver utilizar, ou se voc� n�o possui nenhum adaptador\n"
-"SCSI, voc� ser� perguntado se voc� possui algum ou n�o. Se voc� n�o\n"
-"tiver, escolha \"N�o\". Se voc� tiver um ou mais, responda \"Sim\". Uma\n"
-"lista de drivers vai aparecer, e dela voc� dever� escolher qual\n"
-"voc� possui.\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"
-"Ap�s voc� ter selecionado o driver, DrakX ir� perguntar se\n"
-"voc� quer especificar op��es para ele. Primeiro, tente e deixe\n"
-"o driver procurar pelo hardware: normalmente funciona.\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"
-"Se n�o, n�o esque�a que voc� pode conseguir informa��o sobre seu\n"
-"hardware pelo Windows (se voc� o possui no seu computador), como\n"
-"sugerido pelo guia de instala��o. Essas s�o as op��es que voc�\n"
-"precisar� para configurar o driver."
+"\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 ""
 
-#: ../../help.pm_.c:94
-#, fuzzy
+#: ../../help.pm_.c:160
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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"
 "\n"
+"   * Auto allocate:: this option allows you to automatically create Ext2 and "
+"swap partitions in free space of your\n"
+"     hard drive.\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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
-"- Ctrl-d  to delete a partition\n"
+"For information, you can reach any option using the keyboard: navigate "
+"trough the partitions using Tab and Up/Down arrows.\n"
 "\n"
-"- Ctrl-m  to set the mount point\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"
 msgstr ""
-"A esse ponto, voc� pode escolher qual(is) parti��o(�es) usar para instalar\n"
-"seu sistema Linux-Mandrake se eles j� tiverem sidos definidos (em uma\n"
-"instala��o anterior do Linux ou outra ferramenta de parti��o). Em outros\n"
-"casos, devem ser definidas algumas parti��es. Essa opera��o consiste em\n"
-"dividir logicamente o disco r�gido do seu computador em separadas �reas\n"
-"de uso.\n"
+
+#: ../../help.pm_.c:218
+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"
-"Se voc� tiver que criar novas parti��es, use \"Auto alocar\" para "
-"automaticamente\n"
-"criar parti��es para o Linux. Voc� pode selecionar o disco para \n"
-"particionamente clicando em \"hda\" para o primeiro drive IDE,\n"
-"\"hdb\" para o segundo ou \"sda\" para o primeiro drive SCSI e assim por\n"
-"diante\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"
-"Duas parti��es comuns s�o: a parti��o root (/), que � o come�o da\n"
-"hierarquia do sistema de arquivo e /boot, que cont�m todos os arquivos\n"
-"necess�rios para iniciar o sistema operacional quando o\n"
-"computador � ligado.\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"
-"Como os efeitos desse processo s�o normalmente irrevers�veis, "
-"particionamento\n"
-"pode ser intimidador e estressante para um usu�rio inexperiente. DiskDrake\n"
-"simplifica o processo para o usu�rio. Consulte a documenta��o\n"
-"e n�o se apresse antes de continuar."
+"   * \"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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:252
 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."
+"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 ""
-"Qualquer nova parti��o deve ser formatada para ser utilizada\n"
-"(formatar significa cria sistema de arquivo). A esse ponto, voc� pode\n"
-"re-formatar alguma parti��o existente para apagar as informa��es\n"
-"que ela cont�m. Nota: n�o � necess�rio re-formatar parti��es\n"
-"pr�-existentes, particularmente se eles cont�m arquivos que voc� deseja "
-"manter.\n"
-"Normalmente as parti��es mantidas s�o /home e /usr/local."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:257
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"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"
-"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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"\n"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:267
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
 
-#: ../../help.pm_.c:155
-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."
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
-"Os pacotes selecionados est�o sendo instalados. Essa opera��o\n"
-"deve demorar alguns minutos a n�o ser que voc� tenha escolhido\n"
-"atualizar um sistema existente, nesse caso, pode demorar ainda\n"
-"mais tempo antes da atualiza��o iniciar."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:303
 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"
+"Any partitions that have been newly defined must be\n"
+"formatted for use (formatting meaning creating a filesystem).\n"
 "\n"
 "\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\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"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
-msgstr ""
-"Se DrakX falhar ao detectar o seu mouse, ou voc� checar\n"
-"o que ele fez, voc� ver� uma lista de mouses acima.\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"
-"Se voc� concordar com os configura��es do DrakX, apenas pule para\n"
-"a se��o que voc� quer clicando no menu na esquerda. Se n�o, escolha\n"
-"no menu o tipo de mouse mais pr�ximo ao que voc� possui.\n"
 "\n"
+"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
-"No caso de um mouse serial, voc� ter� que dizer ao DrakX\n"
-"a qual porta serial ele est� conectado."
+"\n"
+"Click on \"Cancel\" if you want to choose other partitions to install your "
+"new\n"
+"Linux-Mandrake operating system."
+msgstr ""
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:329
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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 ""
-"Favor selecionar a porta correta. Por exemplo, a porta COM1 no MS Windows\n"
-"� chamada ttyS0 no Linux."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:341
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
+"You can now choose individually all the packages you\n"
+"wish to install.\n"
 "\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"
+"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 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"
+"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
+"\"Toggle flat and group sorted\".\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."
+"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 ""
-"Essa se��o � dedicada � configura��o a configura��o\n"
-"de uma rede local (LAN) ou de um modem.\n"
-"\n"
-"Escolha \"Rede Local\" e DrakX ir�\n"
-"tentar localizar um adaptador Ethernet na sua m�quina. Adaptadores\n"
-"PCI provalvemente ser�o encontrados e inicializados automaticamente.\n"
-"Mesmo assim, se seu perif�rio � ISA, a autodetec��o n�o funcionar�,\n"
-"e voc� ter� que escolher um driver da lista que ir� aparecer.\n"
+
+#: ../../help.pm_.c:358
+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:363
+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"
-"Para adaptadores SCSI, voc� pode deixar o driver procurar pelo\n"
-"adaptador na primeira vez ou voc� ter� que especificar as\n"
-"configura��es do driver que voc� deve possuir na documenta��o do\n"
-"hardware.\n"
+"Please be patient."
+msgstr ""
+
+#: ../../help.pm_.c:371
+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:376
+#, fuzzy
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
+msgstr ""
+"Favor selecionar a porta correta. Por exemplo, a porta COM1 no MS Windows\n"
+"� chamada ttyS0 no Linux."
+
+#: ../../help.pm_.c:380
+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"
-"Se voc� instalar o Linux-Mandrake em uma m�quina que j� � parte\n"
-"de uma rede existente, o administrador da rede ter� que lhe dar\n"
-"todas as informa��es necess�rias (endere�o IP, subm�scara da rede\n"
-"ou netmak para encurtar e o endere�o do host). Se voc� est� criando\n"
-"uma rede pessoal em casa por exemplo, voc� dever� escolher os\n"
-"endere�os.\n"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\n"
 "\n"
 "\n"
-"Escolha \"Conex�o por modem\" e a conex�o da Internet atrav�s do modem\n"
-"ser� configurada. Drakx ir� tentar localizar seu modem, se ele falhar\n"
-"voc� ter� que selecionar a porta serial onde seu modem est� conectado."
+"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:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"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:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
 "Preencha:\n"
 "\n"
@@ -1672,7 +2101,22 @@ msgstr ""
 "essa op��o. Se selecionada, nenhum valor � necess�rio em \"Endere�o IP\".\n"
 "Se voc� n�o tem certeza, pergunte ao administrador de rede.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 sua rede usa NIS, selecione \"Usar NIS\". Se voc� n�o sabe, pergunte\n"
+"ao seu administrador de rede."
+
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1680,7 +2124,7 @@ 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:229
+#: ../../help.pm_.c:449
 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."
@@ -1688,13 +2132,15 @@ 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:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1709,13 +2155,19 @@ msgstr ""
 "Note que voc� deve escolher o mirror (espelho) e pacotes criptogr�fico de\n"
 "acordo com a sua legisla��o."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "Agora voc� pode selecionar o fuso hor�rio de acordo com onde voc� vive.\n"
 "\n"
@@ -1724,87 +2176,176 @@ msgstr ""
 "e\n"
 "o traduz de acordo com o fuso hor�rio que voc� selecionou."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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:257
-#, fuzzy
+#: ../../help.pm_.c:486
+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:490
+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:505
+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 ""
+
+#: ../../help.pm_.c:521
 msgid ""
-"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"
+"Please turn on your printer before continuing to let DrakX detect it.\n"
 "\n"
+"You have to enter some informations here.\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"
 "\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"
-"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"
 "\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"
-"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."
+"\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 ""
-"Linux pode lidar com v�rios tipos de impressora. Cada uma delas\n"
-"requer uma configura��o diferente.\n"
+
+#: ../../help.pm_.c:542
+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"
-"Se sua impressora � conectada diretamente ao seu computador, selecione\n"
-"\"Impressora Local\". Voc� ter� que dizer em qual porta sua impressora\n"
-"est� conectada, e selecionar o filtro apropriado.\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"
-"Se voc� quiser acessar um impressora em uma m�quina Unix remota,\n"
-"voc� ter� que selecionar \"Lpd Remoto\". Para faz�-lo funcionar,\n"
-"n�o � necess�rio nome de usu�rio ou senha, mas voc� ter� que saber\n"
-"o nome da fila de impress�o no servidor.\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"
-"Se voc� quiser acessar uma impressora SMB (que significa: uma impressora\n"
-"localizada em um servidor Windows 9x/NT), voc� ter� que especificar seu\n"
-"nome SMB (que n�o � o nome TCP/IP), e possivelmente seu endere�o IP,\n"
-"mais o nome do usu�rio, grupo de trabalho e senha requeridos para poder\n"
-"acessar a impressora, e � claro o nome da impressora. O mesmo vale para\n"
-"uma impressora NetWare, exceto que voc� n�o precisa da informa��o sobre\n"
-"o grupo de trabalho."
+"\n"
+"     If you want to acces a printer located on NetWare network, select "
+"\"NetWare\".\n"
+msgstr ""
+
+#: ../../help.pm_.c:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:578
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
+"\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-\n"
 "Mandrake. A senha deve ser digitada duas vezes para verificar\n"
@@ -1820,7 +2361,7 @@ msgstr ""
 "anotada. N�o fa�a a senha muito grande ou muito complicada, voc�\n"
 "deve se lembrar dela sem muita dificuldade."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1828,7 +2369,7 @@ msgstr ""
 "Para ter um sistema mais segura, voc� deve escolher \"Usar arquivo shadow\"\n"
 "e \"Usar senhas MD5\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1836,7 +2377,7 @@ msgstr ""
 "Se sua rede usa NIS, selecione \"Usar NIS\". Se voc� n�o sabe, pergunte\n"
 "ao seu administrador de rede."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1880,22 +2421,18 @@ msgstr ""
 "que voc� criou aqui, e se logar como root somente para prop�sitos de\n"
 "manuten��o e administra��o."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"� altamente recomendado que voc� responda \"Sim\" aqui. Se voc� instalar\n"
-"o Microsoft Windows depois ele poder� sobrescrever o sector de boot.\n"
-"A n�o ser que voc� crie um disquete de boot como sugerido, voc� n�o\n"
-"conseguir� mais entrar no Linux."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
+#, fuzzy
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
@@ -1908,7 +2445,7 @@ msgstr ""
 "A n�o ser que voc� saiba exatamente o que est� fazendo, escolha \"Primeiro\n"
 "setor do drive (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 #, fuzzy
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
@@ -1917,10 +2454,10 @@ msgstr ""
 "A n�o ser que voc� saiba especificamente o contr�rio, a escolha comum �\n"
 "(o disco master do canal prim�rio)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1931,7 +2468,8 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1948,7 +2486,9 @@ msgid ""
 "\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."
 msgstr ""
 "As principais op��es do LILO s�o:\n"
@@ -1978,10 +2518,67 @@ msgstr ""
 "    * normal: seleciona o modo de texto normal 80x25.\n"
 "    * <n�mero>: usa o modo de texto correspondente."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 ""
+
+#: ../../help.pm_.c:692
+#, 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 principais op��es do LILO 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"
+"  - Linear: Cria endere�os de setor linear, ao inv�s de endere�os\n"
+"setor/cabe�a/cilindro. Endere�o lineares s�o traduzidos na hora de\n"
+"execu��o e n�o dependem da geometria do disco. Note que os discos de\n"
+"boot n�o pode ser \"linear\", porque o BIOS determina a geometria n�o\n"
+"funcionam corretamente nos discos de boot. Quando usar \"linear\"\n"
+"em discos grandes, /sbin/lilo pode gerar refer�ncias � �reas de\n"
+"disco inacess�veis, porque o endere�o do setor 3D n�o s�o conhecidos\n"
+"antes da hora do boot\n"
+"\n"
+"\n"
+"  - Compacto: Tenta unir os pedidos de leitura � setores adjacentes\n"
+"em um �nico arquivo. Isso reduz drasticamente o tempo de leitura e\n"
+"mant�m o arquivo pequeno. � recomendado usar \"compacto\" quando se\n"
+"boot por discos de boot\n"
+"\n"
+"\n"
+"  - Modo Visual: Isso especifique o modo de texto VGA que deve ser\n"
+"selecionada durante o boot. Os seguintes valores s�o dispon�veis: \n"
+"    * normal: seleciona o modo de texto normal 80x25.\n"
+"    * <n�mero>: usa o modo de texto correspondente."
+
+#: ../../help.pm_.c:705
+#, fuzzy
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2004,7 +2601,7 @@ msgstr ""
 "a configura��o lhe serviu. Se ela n�o servir, voc� pode voltar\n"
 "e mud�-las, quantas vezes for necess�rio."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2013,7 +2610,7 @@ msgstr ""
 "configurar\n"
 "corretamento o Sistema de Janelas X."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2021,43 +2618,47 @@ msgstr ""
 "Se voc� quiser usar o login gr�fico, selecione \"Sim\". Caso contr�rio,\n"
 "escolha \"N�o\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 #, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"\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"
+"\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"
+"\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."
 msgstr ""
 "Voc� agora pode fazer algumas op��es miscel�neas para o seu sistema.\n"
 "\n"
@@ -2086,7 +2687,7 @@ msgstr ""
 "ativado ap�s o boot, selecione essa op��o (Nota: o Num Lock ainda n�o\n"
 "funcionar� no X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2100,189 +2701,133 @@ msgstr ""
 "mente. Se voc� quiser dar boot em outro sistema operacional existente,\n"
 "favor ler as instru��es adicionais."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Escolha sua l�ngua"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Selecione a classe da instala��o"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 #, fuzzy
 msgid "Hard drive detection"
 msgstr "Usar optimiza��o do disco r�gido?"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Configurar mouse"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Escolha seu teclado"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Miscel�neos"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Setup dos sistemas de arquivos"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Formatar parti��es"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Escolha pacotes a serem instalados"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Instalar sistema"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Configurar rede"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Criptogr�fico"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Configurar fuso hor�rio"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 #, fuzzy
 msgid "Configure services"
 msgstr "Configurar impressora"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Configurar impressora"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Especificar senha do root"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Adicionar um usu�rio"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Criar um disco de boot"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Instalar carregador de boot"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Configurar X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr ""
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Sair da instala��o"
 
-#: ../../install2.pm_.c:337
-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 ""
-"Voc� deve ter uma parti��o root.\n"
-"Para isso, crie um parti��o (ou click em uma existen).\n"
-"Ent�o escolha a��o ``Ponto de montagem'' e coloque como `/'"
-
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Eu n�o consigo ler sua tabela de parti��o, � muito defeituosa\n"
-"para mim. Eu irei tentar continuar limpando as parti��es defeituosas"
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Erro lendo arquivo $f"
 
-#: ../../install_any.pm_.c:351
-msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
-msgstr ""
-"O DiskDrake falhou na leitura da tabela de parti��o.\n"
-"Continue a seu pr�prio risco!"
+#: ../../install_gtk.pm_.c:426
+#, fuzzy
+msgid "Please test the mouse"
+msgstr "Que tipo de mouse voc� tem?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "Procurando parti��o root."
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Que tipo de mouse voc� tem?"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Informa��o"
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
+#: ../../install_interactive.pm_.c:23
 #, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: Essa n�o � uma parti��o root, favor selecione outra."
-
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Nenhuma parti��o root encontrada"
-
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "N�o pode usar broadcast sem o dom�nio NIS"
-
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Erro lendo arquivo $f"
-
-#: ../../install_steps.pm_.c:75
 msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
+"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
+"You can find some information about them at: %s"
 msgstr ""
-"Um erro ocorreu, mas eu n�o sei como lidar com ele.\n"
-"Continue a seu pr�prio risco."
-
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Ponto de montagem %s duplicado"
 
-#: ../../install_steps.pm_.c:323
+#: ../../install_interactive.pm_.c:41
 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"
+"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 ""
+"Voc� deve ter uma parti��o root.\n"
+"Para isso, crie um parti��o (ou click em uma existen).\n"
+"Ent�o escolha a��o ``Ponto de montagem'' e coloque como `/'"
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Bem-vindo � %s"
-
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Nenhum drive de disquete dispon�vel"
-
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
-#, c-format
-msgid "Entering step `%s'\n"
-msgstr "Entrando no passo `%s'\n"
-
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
+#: ../../install_interactive.pm_.c:46
 msgid "You must have a swap partition"
 msgstr "Voc� tem que ter uma parti��o swap"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:47
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -2292,99 +2837,80 @@ msgstr ""
 "\n"
 "Continuar mesmo assim?"
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Escolha o tamanho que voc� deseja instalar"
+#: ../../install_interactive.pm_.c:68
+#, fuzzy
+msgid "Use free space"
+msgstr "Nome do usu�rio"
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Tamanho total:"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Vers�o: %s\n"
+#: ../../install_interactive.pm_.c:78
+#, fuzzy
+msgid "Use existing partition"
+msgstr "Formatando parti��os"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "Tamanho: %d KB\n"
+#: ../../install_interactive.pm_.c:80
+#, fuzzy
+msgid "There is no existing partition to use"
+msgstr "Tentando resgatar tabela de parti��o"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Escolha os pacotes que voc� quer instalar"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Informa��o"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Qual parti��o voc� quer usar como sua parti��o root"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Instalar"
+#: ../../install_interactive.pm_.c:92
+#, fuzzy
+msgid "Choose the sizes"
+msgstr "Escolha o novo tamanho"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "Instalando"
+#: ../../install_interactive.pm_.c:93
+#, fuzzy
+msgid "Root partition size in MB: "
+msgstr "Parti��o Root"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Por favor aguarde, "
+#: ../../install_interactive.pm_.c:94
+#, fuzzy
+msgid "Swap partition size in MB: "
+msgstr "Tamanho em MB: "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Tempo restante "
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Tempo total "
+#: ../../install_interactive.pm_.c:105
+#, fuzzy
+msgid "Which partition do you want to resize?"
+msgstr "Qual tipo de parti��o voc� quer?"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Preparando instala��o"
+#: ../../install_interactive.pm_.c:107
+#, fuzzy
+msgid "Computing Windows filesystem bounds"
+msgstr "Computando limites do sistema de arquivo FAT"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Installing package %s"
-msgstr "Instalando pacote %s"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Continuar mesmo assim?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Houve um erro ordenando os pacotes:"
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Usar o configura��o existente para o X11?"
-
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Voc� n�o tem nenhuma parti��o windows!"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:201
+#: ../../install_interactive.pm_.c:113
 #, fuzzy
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Voc� n�o tem nenhuma parti��o!"
-
-#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
 "dangerous. If you have not already done so, you should first exit the\n"
 "installation, run scandisk under Windows (and optionally run defrag), then\n"
 "restart the installation. You should also backup your data.\n"
@@ -2399,37 +2925,148 @@ msgstr ""
 "opcionalmente rodar o defrag) nesta parti��o e fazer backup de seus dados.\n"
 "Quando tiver certeza, pressione Ok."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
+#: ../../install_interactive.pm_.c:122
+#, fuzzy
+msgid "Which size do you want to keep for windows on"
+msgstr "Qual setor voc� quer mover?"
+
+#: ../../install_interactive.pm_.c:123
+#, fuzzy, c-format
+msgid "partition %s"
+msgstr "Parti��o"
+
+#: ../../install_interactive.pm_.c:129
+#, fuzzy, c-format
+msgid "FAT resizing failed: %s"
 msgstr "Falha no redimensionamento autom�tico"
 
-#: ../../install_steps_gtk.pm_.c:265
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:150
 #, fuzzy
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Qual parti��o voc� quer usar como sua parti��o root"
+msgid "Remove Windows(TM)"
+msgstr "Windows(TM)"
+
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:156
+#, fuzzy, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "todos os dados desta parti��o ser�o perdidos"
 
-#: ../../install_steps_gtk.pm_.c:284
+#: ../../install_interactive.pm_.c:164
 #, fuzzy
-msgid "Choose the sizes"
-msgstr "Escolha o novo tamanho"
+msgid "Expert mode"
+msgstr "Expert"
+
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:171
+#, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:286
+#: ../../install_interactive.pm_.c:195
 #, fuzzy
-msgid "Root partition size in MB: "
-msgstr "Parti��o Root"
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Voc� n�o tem nenhuma parti��o windows!"
 
-#: ../../install_steps_gtk.pm_.c:288
+#: ../../install_interactive.pm_.c:210
 #, fuzzy
-msgid "Swap partition size in MB: "
-msgstr "Tamanho em MB: "
+msgid "I can't find any room for installing"
+msgstr "Eu n�o posso adicionar mais nenhuma parti��o"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:218
+#, fuzzy, c-format
+msgid "Partitioning failed: %s"
+msgstr "O particionamento falhou: sem sistema de arquivo root"
+
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Trazendo (acessando) a rede"
+
+#: ../../install_interactive.pm_.c:238
+#, fuzzy
+msgid "Bringing down the network"
+msgstr "Trazendo (acessando) a rede"
+
+#: ../../install_steps.pm_.c:74
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
+"Um erro ocorreu, mas eu n�o sei como lidar com ele.\n"
+"Continue a seu pr�prio risco."
+
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Ponto de montagem %s duplicado"
+
+#: ../../install_steps.pm_.c:375
+msgid ""
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
+msgstr ""
+
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Bem-vindo � %s"
+
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Nenhum drive de disquete dispon�vel"
+
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Entrando no passo `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2438,7 +3075,7 @@ msgid ""
 "a percentage of 100%% will install all selected packages."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2448,104 +3085,190 @@ msgid ""
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "Voc� ser� capaz de escolher mais precisamente no pr�ximo passo"
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 #, fuzzy
 msgid "Percentage of packages to install"
 msgstr "Escolha pacotes a serem instalados"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Escolha os pacotes que voc� quer instalar"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Informa��o"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Instalar"
+
+#: ../../install_steps_gtk.pm_.c:272
 #, fuzzy
 msgid "Automatic dependencies"
 msgstr "Resolu��es Autom�ticas"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Pacote defeituoso"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Vers�o: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Tamanho: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Tamanho total: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "Escolha pacotes a serem instalados"
+
+#: ../../install_steps_gtk.pm_.c:387
+#, fuzzy
+msgid "The following packages are going to be removed"
+msgstr "Escolha pacotes a serem instalados"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:496
-#, fuzzy
-msgid "The following packages are going to be installed/removed"
-msgstr "Escolha pacotes a serem instalados"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr ""
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Instalando"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Estimando"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Por favor aguarde, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Tempo restante "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Tempo total "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Preparando instala��o"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pacotes"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Instalando pacote %s"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Accept"
+msgstr "Aceitar usu�rio"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2555,201 +3278,402 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Redimensionar"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Continuar mesmo assim?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Houve um erro ordenando os pacotes:"
+
+#: ../../install_steps_gtk.pm_.c:573
 #, fuzzy
 msgid "There was an error installing packages:"
 msgstr "Houve um erro ordenando os pacotes:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Ocorreu um erro"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
+#, fuzzy
 msgid "Please, choose a language to use."
-msgstr ""
+msgstr "Que tipo de mouse voc� tem?"
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 #, fuzzy
 msgid "Please, choose your keyboard layout."
 msgstr "Qual o layout do seu teclado?"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Parti��o Root"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Qual a parti��o root (/) do seu sistema?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Classe de Instala��o"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Qual classe de instala��o voc� quer?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Instalar/Atualizar"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "Isso � uma instala��o ou atualiza��o?"
 
-#: ../../install_steps_interactive.pm_.c:110
-#, fuzzy
-msgid "Automated"
-msgstr "IP Autom�tico"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Recomendado"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Customizado"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Expert"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Atualizar"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Normal"
+#: ../../install_steps_interactive.pm_.c:222
+#, fuzzy
+msgid "Workstation"
+msgstr "Informa��o"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Desenvolvimento"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Servidor"
 
-#: ../../install_steps_interactive.pm_.c:141
+#: ../../install_steps_interactive.pm_.c:228
 #, fuzzy
-msgid "Which usage is your system used for ?"
+msgid "What is your system used for?"
 msgstr "Qual o seu fuso hor�rio?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 #, fuzzy
 msgid "Please, choose the type of your mouse."
 msgstr "Que tipo de mouse voc� tem?"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Porta do Mouse"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 #, fuzzy
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Em que porta serial seu mouse est� conectado?"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Configurando cart�es PCMCIA..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 #, fuzzy
 msgid "Configuring IDE"
 msgstr "Testar configura��o"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "sem parti��es dispon�veis"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-#, fuzzy
-msgid "Please choose a partition to use as your root partition."
-msgstr "Qual parti��o voc� quer usar como sua parti��o root"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Escolha os ponto de montagem"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, fuzzy, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+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"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"O DiskDrake falhou na leitura da tabela de parti��o.\n"
+"Continue a seu pr�prio risco!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Parti��o Root"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Qual a parti��o root (/) do seu sistema?"
+
+#: ../../install_steps_interactive.pm_.c:352
 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:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Escolha as parti��es que voc� quer formatar"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Formatando parti��os"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 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:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "Procurando por pacotes dispon�veis"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Procurando pacotes � atualizar"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Complete (%dMB)"
+msgstr "Normal"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Minimum (%dMB)"
+msgstr "(%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Recommended (%dMB)"
+msgstr "Recomendado"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "Customizado"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Escolha o tamanho que voc� deseja instalar"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Sele��o de Grupo de Pacotes"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2757,177 +3681,11 @@ msgstr ""
 "Instalando pacote %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Configura��o p�s-instal��o"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Manter a configura��o IP atual"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Reconfigurar rede agora"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "N�o configurar rede"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Configura��o da Rede"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "A Rede Local j� foi configurado. Voc� quer:"
-
-#: ../../install_steps_interactive.pm_.c:421
-#, fuzzy
-msgid "Do you want to configure a local network for your system?"
-msgstr "Voc� quer configurar uma rede para o seu sistema?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "nenhuma placa de rede encontrada"
-
-#: ../../install_steps_interactive.pm_.c:449
-#, fuzzy
-msgid "Modem Configuration"
-msgstr "Testar configura��o"
-
-#: ../../install_steps_interactive.pm_.c:450
-#, fuzzy
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "Voc� quer configurar uma rede para o seu sistema?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Configurando dispositivo de rede %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Favor entrar com a configura��o IP para esta m�quina.\n"
-"Cada item deve ser entrando como endere�o IP pontilhado-decimal\n"
-"(por exemplo, 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "IP Autom�tico"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "Endere�o IP:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Netmask:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "O endere�o IP deve ser no formato 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Configurando rede"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Favor entrar com o nome do seu host.\n"
-"Seu nome do host deve ser um nome de host totalmente qualificado,\n"
-"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"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "Servidor DNS:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Dispositivo de gateway:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Gateway:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Host name (nome do host):"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "Tentar localizar modem?"
-
-#: ../../install_steps_interactive.pm_.c:521
-#, fuzzy
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Em qual porta serial seu modem est� conectada?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Op��es dialup"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Nome da conex�o"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "N�mero do telefone"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "ID de Login"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Autentica��o?"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Baseado em script"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Baseado em terminal"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Nome do dom�nio"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Primeiro Servidor DNS"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Segundo Servidor DNS"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3002,89 +3760,95 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 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:588
+#: ../../install_steps_interactive.pm_.c:676
 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:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "Escolha os pacotes que voc� quer instalar."
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
+#, fuzzy
 msgid "Which is your timezone?"
 msgstr "Qual o seu fuso hor�rio?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "O seu rel�gio do hardware est� configurado como GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "Qual tipo de parti��o voc� quer?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Nenhuma senha"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Usar arquivo shadow (sombra)"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow (sombra)"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Usar senhas MD5"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Usar NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "p�ginas amarela"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, 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:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Autentica��o NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "Dom�nio NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "Servidor NIS"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Aceitar usu�rio"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Adicionar usu�rio"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(j� adicionado %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3094,63 +3858,90 @@ msgstr ""
 "Entre com o usu�rio\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Nome real"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Nome do usu�rio"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Essa senha � muito simples"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Favor dar um nome de usu�rio"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 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 `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Esse usu�rio j� foi adicionado"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+#, fuzzy
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Um disco de boot prov� uma maneira de dar boot no Linux sem depender\n"
+"de um carregador de boot normal. Isso � necess�rio se voc� n�o quiser "
+"instalar\n"
+"o LILO (ou grub) no seu sistema, ou se outro sistema operacionarl remover\n"
+"o LILO, ou o se LILO n�o funcionar com o seu hardware. Um disco de boot\n"
+"customizado tamb�m pode ser usado com uma imagem de backup do Mandrake,\n"
+"fazendo muito mais f�cil recuperar o sistema com danos severos.\n"
+"Voc� gostaria de criar um disco de boot para o seu sistema?"
+
+#: ../../install_steps_interactive.pm_.c:869
 #, fuzzy
 msgid "First floppy drive"
 msgstr "Primeiro drive"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 #, fuzzy
 msgid "Second floppy drive"
 msgstr "Segundo drive"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Pular"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3172,187 +3963,149 @@ msgstr ""
 "fazendo muito mais f�cil recuperar o sistema com danos severos.\n"
 "Voc� gostaria de criar um disco de boot para o seu sistema?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Desculpe, nenhum drive de disquete dispon�vel"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 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 boot"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Insira um disquete no drive %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Criando disco de boot"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "A Instala��o do LILO falhou. Ocorreram os seguintes erros:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Voc� quer usar o SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "Principais op��es do SILO"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"A seguir est�o as entradas do SILO.\n"
-"Voc� pode adicionar mais ou modificar as existentes."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Parti��o"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Esse label j� est� sendo utilizado"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "A Instala��o do SILO falhou. Ocorreram os seguintes erros:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Preparando carregador de boot"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
+#, fuzzy
 msgid "Do you want to use aboot?"
-msgstr "Voc� quer usar o aboot?"
+msgstr "Voc� quer usar o SILO?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Configura��o de Proxies"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "Proxy HTTP"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "Proxy FTP"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "O proxy deve ser http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "O proxy deve ser ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+#, fuzzy
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "A Instala��o do LILO falhou. Ocorreram os seguintes erros:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Bem-vindo � Crackers"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Pobre"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Baixo"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "M�dio"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Alto"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paran�ico"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "Quest�es miscel�neas"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(pode causar corrup��o dos dados)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Usar optimiza��o do disco r�gido?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Escolha n�vel de seguran�a"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Especifique o tamanho da RAM se necess�rio (%d MB encontrados)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Automontagem de m�dia remov�vel"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Ativar num lock na inicializa��o"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Dar o tamanha da RAM em Mb"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 #, fuzzy
 msgid "Can't use supermount in high security level"
 msgstr "Op��es do n�vel de seguran�a"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Tentar localizar dispositivos PCI?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Usar o configura��o existente para o X11?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, fuzzy, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Insira um disquete no drive %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 #, fuzzy
 msgid "Creating auto install floppy"
 msgstr "Preparando instala��o"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3362,7 +4115,7 @@ msgstr ""
 "\n"
 "Voc� realmente quer sair agora?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3381,153 +4134,19 @@ msgstr ""
 "Informa��o sobre configurar seu sistema est� dispon�vel no cap�tulo\n"
 "p�s instala��o do Oficial Guia do Usu�rio Linux Mandrake."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Desligando"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Instalando driver para %s placa %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(m�dulo %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Qual driver %s eu deveria tentar?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"Em alguns casos, o driver %s precisa de informa��es extra para funcionar\n"
-"corretamente, mas ele normalmente funciona bem sem essas informa��es. Voc�\n"
-"gostaria de especificar op��es extras ou deixar o driver localizar na sua\n"
-"m�quina as informa��es que ele precisa? Ocasionalmente, isso poder� travar\n"
-"o computador, mas n�o deve causar nenhum dano."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Auto localizar"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Especificar op��es"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, 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."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Agora voc� pode prover as op��es para o m�dulo %s.\n"
-"As op��es est�o no formato ``nome=valor nome2=valor2 ...''\n"
-"Para inst�ncia, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Op��es do m�dulo:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Falha carregando m�dulo %s.\n"
-"Voc� quer tentar novamente com outros par�mentros?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Tentar localizar cart�es PCMCIA?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Configurando cart�es PCMCIA..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Tentar localizar dispositivos %s?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Interfaces %s %s encontradas"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Voc� tem alguma outra?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Voc� tem alguma interface %s?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "N�o"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Sim"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Ver informa��o do hardware"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Trazendo (acessando) a rede"
-
-#: ../../install_steps_interactive.pm_.c:1207
-#, fuzzy
-msgid "Bringing down the network"
-msgstr "Trazendo (acessando) a rede"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Instala��o do Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 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 "
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Por favor aguarde"
 
@@ -3537,7 +4156,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Ambiguidade (%s), seja mais preciso\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "M� escolha, tente novamente\n"
 
@@ -3551,445 +4170,973 @@ msgstr " ? (padr�o %s) "
 msgid "Your choice? (default %s) "
 msgstr "Sua escolha? (padr�o %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Sua escolha? (padr�o %s digite `none' para nenhum) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "Tcheco"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Alem�o"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Filand�s"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Franc�s"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Noruegu�s"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Polon�s"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Russo"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Teclado Ingl�s"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "Teclado Americano"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Arm�nio (Fon�tico)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "B�lgaro"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasileiro"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 #, fuzzy
 msgid "Belarusian"
 msgstr "B�lgaro"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Su��o (layout Alem�o)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Su��o (layout Franc�s)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Dinamarqu�s"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+#, fuzzy
+msgid "Dvorak (US)"
+msgstr "Dvorak"
+
+#: ../../keyboard.pm_.c:139
+#, fuzzy
+msgid "Dvorak (Norwegian)"
+msgstr "Noruegu�s"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Estoniano"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgiano (layout \"Russo\")"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgiano (layout \"Latin\")"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Grego"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "H�ngaro"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Israelense"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Israelense (Fon�tico)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+#, fuzzy
+msgid "Iranian"
+msgstr "Ucraniano"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Island�s"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Latino Americano"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Holand�s"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 #, fuzzy
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litu�nio AZERTY"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 #, fuzzy
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litu�nio AZERTY"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litu�nio \"n�mero de colunas\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litu�nio \"fon�tico\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Polon�s (layout QWERTY)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Polon�s (layout QWERTZ)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugu�s"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Canadense (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Russo (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Eslov�nio"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Eslov�quio"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Teclado Tailand�s"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turco (modelo \"F\" tradicional)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turco (modelo moderno \"Q\")"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "Teclado Americano (Internacional)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+#, fuzzy
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Litu�nio \"n�mero de colunas\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Iugosl�vio (layout latin)"
 
-# 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.
-#
-# '\241' is '�' (iacute) in cp437 encoding
-# '\207' is '�' (ccedilla) in cp437 encoding
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Mouse SUN"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan/FistMouse (serial)"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr ""
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "n�vel"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "serial"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Mouse Gen�rico com 2 Bot�es"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Mouse Gen�rico com 3 Bot�es"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech S�rie CC (serial)"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "S�rie MM"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Mouse Logitech (serial, tipo C7 antigo)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "Nenhum Mouse"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+#, fuzzy
+msgid "none"
+msgstr "pronto"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "Nenhum Mouse"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Isto est� correto?"
+
+#: ../../netconnect.pm_.c:93
+#, fuzzy
+msgid "Internet configuration"
+msgstr "Configura��o de Proxies"
+
+#: ../../netconnect.pm_.c:94
+#, fuzzy
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Voc� quer testar a configura��o"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Configurar rede"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Qual disco voc� quer mover?"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
 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"
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Nome da conex�o"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+#, fuzzy
+msgid "ISDN Configuration"
+msgstr "Configura��o"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
 msgstr ""
-"Bem-vindo ao LILO, o selecionador de sistema operacional!\n"
+
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "Configura��o de Proxies"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr ""
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr ""
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr ""
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:169
+#, fuzzy
+msgid "Provider phone number"
+msgstr "N�mero do telefone"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr ""
+
+#: ../../netconnect.pm_.c:172
+#, fuzzy
+msgid "Dialing mode"
+msgstr "Dialup com modem"
+
+#: ../../netconnect.pm_.c:174
+#, fuzzy
+msgid "Account Login (user name)"
+msgstr "Ponto de Montagem"
+
+#: ../../netconnect.pm_.c:175
+#, fuzzy
+msgid "Account Password"
+msgstr "Senha"
+
+#: ../../netconnect.pm_.c:176
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Senha"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "Testar configura��o"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:214
+#, fuzzy
+msgid "Which protocol do you want to use ?"
+msgstr "Qual tipo de parti��o voc� quer?"
+
+#: ../../netconnect.pm_.c:224
+#, fuzzy
+msgid "ISA / PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+#, fuzzy
+msgid "PCI"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr ""
+
+#: ../../netconnect.pm_.c:233
+#, fuzzy
+msgid "What kind of card do you have?"
+msgstr "Qual tipo de impressora voc� tem?"
+
+#: ../../netconnect.pm_.c:239
+#, fuzzy
+msgid "Continue"
+msgstr "Continuar mesmo assim?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr ""
+
+#: ../../netconnect.pm_.c:245
+msgid ""
 "\n"
-"Para listar as op�oes poss�ves, tecle <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"Para carregar um deles, escreva o nome e pressione <ENTER>\n"
-"ou aguarde %d segundos para o boot padrao.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
 
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
+#: ../../netconnect.pm_.c:257
+#, fuzzy
+msgid "Which is your ISDN card ?"
+msgstr "Qual o seu fuso hor�rio?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
 msgstr ""
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
+#: ../../netconnect.pm_.c:287
+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 ""
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "Escolha o novo tamanho"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Em que porta serial seu mouse est� conectado?"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
 msgstr ""
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:352
+msgid ""
+"\n"
+"Do you agree?"
 msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Voc� quer testar a configura��o"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "Configura��o"
+
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "Voc� quer usar o aboot?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "Tentar localizar modem?"
+
+#: ../../netconnect.pm_.c:539
+#, fuzzy
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Em qual porta serial seu modem est� conectada?"
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Op��es dialup"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Nome da conex�o"
+
+#: ../../netconnect.pm_.c:546
+#, fuzzy
+msgid "Phone number"
+msgstr "N�mero do telefone"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "ID de Login"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Autentica��o?"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Baseado em script"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Baseado em terminal"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "Nome do dom�nio"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Primeiro Servidor DNS"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Segundo Servidor DNS"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Nome da conex�o"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "Configurar rede"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Qual disco voc� quer mover?"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
 msgstr ""
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Qual disco voc� quer mover?"
+
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Nome da conex�o"
+
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Nome da conex�o"
+
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Configurar rede"
+
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "Cone��o da Impressora"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Mouse SUN"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Configurar rede"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Mouse ADB Apple"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Configurar rede"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Mouse ADB Apple (2 bot�es)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr ""
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Mouse ADB Apple (3 bot�es ou mais)"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Expert"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Mouse USB Apple"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+#, fuzzy
+msgid "Connect to the Internet"
+msgstr "Nome da conex�o"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Mouse USB Apple (3 bot�es ou mais)"
+#: ../../netconnect.pm_.c:672
+#, fuzzy
+msgid "What kind is your ISDN connection?"
+msgstr "Em que porta serial seu mouse est� conectado?"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Mouse USB Apple (3 bot�es ou mais)"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Configurar rede"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Mouse Gen�rico (PS/2)"
+#: ../../netconnect.pm_.c:700
+#, fuzzy
+msgid "France"
+msgstr "Cancelar"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Mouse Gen�rico com 3 Bot�es (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr ""
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr ""
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "Expert"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Configurar rede"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Qual tipo de parti��o voc� quer?"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus Mouse"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Configurar rede"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Mouse Microsoft Bus"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "Configurar rede"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Mouse Logitech Bus"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Configura��o da Rede"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "Mouse USB"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Voc� quer testar a configura��o"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "Mouse USB (3 bot�es ou mais)"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "Configurar rede"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "Nenhum Mouse"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Nome da conex�o"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft 2.1A ou superior (serial)"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "A Rede Local j� foi configurado. Voc� quer:"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech S�rie CC (serial)"
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "Qual disco voc� quer mover?"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (serial)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Configura��o da Rede"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (serial)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (serial)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "nenhuma placa de rede encontrada"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (serial)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Configurando rede"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "S�rie MM (serial)"
+#: ../../network.pm_.c:274
+#, fuzzy
+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.\n"
+"Seu nome do host deve ser um nome de host totalmente qualificado,\n"
+"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"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (serial)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+#, fuzzy
+msgid "Host name"
+msgstr "Host name (nome do host):"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Mouse Logitech (serial, tipo C7 antigo)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FistMouse (serial)"
+#: ../../network.pm_.c:302
+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 ""
+"Favor entrar com a configura��o IP para esta m�quina.\n"
+"Cada item deve ser entrando como endere�o IP pontilhado-decimal\n"
+"(por exemplo, 1.2.3.4)."
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Mouse Gen�rico (serial)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Configurando dispositivo de rede %s"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Compat�vel com Microsoft (serial)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "IP Autom�tico"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Mouse Gen�rico com 3 Bot�es (serial)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "IP address"
+msgstr "Endere�o IP:"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (serial)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Netmask"
+msgstr "Netmask:"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Isto est� correto?"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+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:341
+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 ""
+"Favor entrar com o nome do seu host.\n"
+"Seu nome do host deve ser um nome de host totalmente qualificado,\n"
+"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:346
+#, fuzzy
+msgid "DNS server"
+msgstr "Servidor DNS:"
+
+#: ../../network.pm_.c:347
+#, fuzzy
+msgid "Gateway"
+msgstr "Gateway:"
+
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "Dispositivo de gateway:"
+
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Configura��o p�s-instal��o"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "Proxy HTTP"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "Proxy FTP"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "O proxy deve ser http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "O proxy deve ser ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -3999,21 +5146,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:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erro lendo arquivo %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Restaura��o pelo arquivo %s falhou: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Arquivo de backup defeituoso"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Erro gravando no arquivo %s"
@@ -4050,42 +5197,56 @@ msgstr "redimensinando"
 msgid "maybe"
 msgstr "Image"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr ""
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr ""
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr ""
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Mostrar menos"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Mostrar mais"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Impressora local"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+#, fuzzy
+msgid "Remote printer"
+msgstr "Op��es da impressora lpd Remota"
+
+#: ../../printer.pm_.c:21
+#, fuzzy
+msgid "Remote CUPS server"
+msgstr "Fila remota"
+
+#: ../../printer.pm_.c:22
+#, fuzzy
+msgid "Remote lpd server"
 msgstr "Lpd remoto"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "Op��es de Impress�o NetWare"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Dispositivo da Impressora"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Detectando dispositivos..."
@@ -4099,11 +5260,11 @@ msgstr "Testar portas"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Uma impressora, modelo \"%s\", foi detectado no "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Dispositivo da Impressora Local"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4111,15 +5272,15 @@ msgstr ""
 "A qual dispositivo sua impressora est� conectada \n"
 "(note que /dev/lp0 � equivalente a LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Dispositivo da Impressora"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Op��es da impressora lpd Remota"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4129,19 +5290,19 @@ msgstr ""
 "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."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Nome do host remoto"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Fila remota"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Op��es de Impress�o SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4157,27 +5318,27 @@ msgstr ""
 "qualquer informa��o aplic�vel sobre nome de usu�rio, senha e grupo de "
 "trabalho."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "Host servidor SMB"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP do servidor SMB"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Nome compartilhado"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Grupo de trabalho"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "Op��es de Impress�o NetWare"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4189,131 +5350,156 @@ 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:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Servidor de Impress�o"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Nome da Fila de Impress�o"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "Op��es da Impressora Local"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "Op��es da impressora"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "Pobre"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Qual tipo de impressora voc� tem?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Voc� quer testar a impress�o?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Imprimindo p�gina(s) de teste..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"A(s) p�gina(s) foi(foram) enviada(s) para o daemon de impress�o.\n"
+"Pode demorar algum tempo antes da impress�o come�ar.\n"
+"Status da impress�o:\n"
+"%s\n"
+"\n"
+"Ela est� funcionando corretamente?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"A(s) p�gina(s) foi(foram) enviada(s) para o daemon de impress�o.\n"
+"Pode demorar algum tempo antes da impress�o come�ar.\n"
+"Ela est� funcionando corretamente?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Sim, imprimir p�gina de teste ASCII"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Sim, imprimir p�gina de teste PostScript"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Sim, imprimir ambas as p�ginas de teste"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Configurar Impressora"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Qual tipo de impressora voc� tem?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Op��es da impressora"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Tamanho do Papel"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Ejetar p�gina ap�s a impress�o?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Op��es do driver Uniprint"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Op��es da profundidade das cores"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Corrigir texto stair-stepping?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 #, fuzzy
 msgid "Extra Text options"
 msgstr "Op��es da profundidade das cores"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Voc� quer testar a impress�o?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Imprimindo p�gina(s) de teste..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"A(s) p�gina(s) foi(foram) enviada(s) para o daemon de impress�o.\n"
-"Pode demorar algum tempo antes da impress�o come�ar.\n"
-"Status da impress�o:\n"
-"%s\n"
-"\n"
-"Ela est� funcionando corretamente?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"A(s) p�gina(s) foi(foram) enviada(s) para o daemon de impress�o.\n"
-"Pode demorar algum tempo antes da impress�o come�ar.\n"
-"Ela est� funcionando corretamente?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Impressora"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Voc� gostaria de configurar um impressora?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 #, fuzzy
 msgid ""
 "Here are the following print queues.\n"
@@ -4322,20 +5508,69 @@ msgstr ""
 "A seguir est�o as entradas do LILO.\n"
 "Voc� pode adicionar mais ou modificar as existentes."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "Estimando"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Selecionar Cone��o da Impressora"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Como a impressora est� conectada?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+#, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "Selecionar Cone��o da Impressora"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 #, fuzzy
 msgid "Remove queue"
 msgstr "Fila remota"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+#, fuzzy
+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 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 este queue?"
+
+#: ../../printerdrake.pm_.c:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "Impressora local"
+
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "Especificar op��es"
+
+#: ../../printerdrake.pm_.c:406
+#, fuzzy
+msgid "Location"
+msgstr "Informa��o"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4346,57 +5581,57 @@ msgstr ""
 "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 este queue?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Nome da fila de impress�o"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Diret�rio spool"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Cone��o da Impressora"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, 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:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "N�o posso gravar arquivo $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr ""
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr ""
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, 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:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr ""
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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 ""
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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:19
+#: ../../services.pm_.c:20
 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 "
@@ -4404,7 +5639,7 @@ msgid ""
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4412,13 +5647,13 @@ msgid ""
 "and includes support for pop-up menus on the console."
 msgstr ""
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
 msgstr ""
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4428,51 +5663,51 @@ msgid ""
 "all of the services it is responsible for."
 msgstr ""
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
 "You should leave this enabled for most machines."
 msgstr ""
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP networks.\n"
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4480,7 +5715,7 @@ msgid ""
 "it installed on machines that don't need it."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4488,106 +5723,245 @@ msgid ""
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr ""
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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:66
+#: ../../services.pm_.c:67
 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:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr ""
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr ""
 " Escolha quais servi�os devem ser inicializados automaticamente na "
 "inicaliza��o"
 
-# 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.
-#
-# '\241' is '�' (iacute) in cp437 encoding
-# '\207' is '�' (ccedilla) in cp437 encoding
-#
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Bem-vindo ao SILO, o selecionador de sistema operacional!\n"
-"\n"
-"Para listar as op�oes poss�ves, tecle <TAB>.\n"
-"\n"
-"Para carregar um deles, escreva o nome e pressione <ENTER>\n"
-"ou aguarde %d segundos para o boot padrao.\n"
+"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/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Configurar LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Criar um disquete de boot"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Formatar disquete"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr ""
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "A Instala��o do LILO falhou. Ocorreram os seguintes erros:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Table"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Configurar X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Table"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+#, fuzzy
+msgid "Internet Connection Sharing"
+msgstr "Cone��o da Impressora"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Dialup com modem"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "Testar configura��o"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Testar configura��o"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Parab�ns!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4655,23 +6029,30 @@ msgstr "Op��es do n�vel de seguran�a"
 msgid "Choose the tool you want to use"
 msgstr "Escolha a ferramente que voc� quer usar"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Qual o layout do seu teclado?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Mudar Resolu��o"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Que tipo de mouse voc� tem?"
+#: ../../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 ""
+
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "nenhum usb_serial encontrado\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Deseja emula��o de 3 bot�es?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Em que porta serial seu mouse est� conectado?"
 
@@ -4891,8 +6272,774 @@ msgstr ""
 msgid "Finding leaves takes some time"
 msgstr ""
 
-#~ msgid "Recommended"
-#~ msgstr "Recomendado"
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Configura��o de Proxies"
+
+#, fuzzy
+msgid "Internet"
+msgstr "redimensinando"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+#, fuzzy
+msgid "Office"
+msgstr "dispositivo"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "KDE"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multim�dia"
+
+#, fuzzy
+msgid "Gnome"
+msgstr "pronto"
+
+#, fuzzy
+msgid "Documentation"
+msgstr "Autentica��o?"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multim�dia"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Escolha o tamanho que voc� deseja instalar"
+
+#~ msgid "Total size: "
+#~ msgstr "Tamanho total:"
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "Reconfigurar rede agora"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Nome da conex�o"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Nome da conex�o"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Nome da conex�o"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Nome da conex�o"
+
+#, fuzzy
+#~ msgid "Germany"
+#~ msgstr "Alem�o"
+
+#, fuzzy
+#~ msgid "Germany (1TR6)"
+#~ msgstr "Alem�o"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "O que voc� quer fazer?"
+
+#, fuzzy
+#~ msgid "Install/Rescue"
+#~ msgstr "Instalar"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "Redimensionar"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Qual tipo de parti��o voc� quer?"
+
+#, 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Escolha \"Instalar\" se voc� n�o tem vers�es anteriores do Linux\n"
+#~ "instaladas, ou se voc� deseja usar m�ltiplas distribui��es ou vers�es.\n"
+#~ "\n"
+#~ "Escolha \"Atualizar\" se voc� deseja atualizar sua vers�o do Linux "
+#~ "Mandrake:\n"
+#~ "%s ou %s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Selecione:\n"
+#~ "\n"
+#~ "  - Recomendado: Se voc� nunca instalou Linux antes.\n"
+#~ "\n"
+#~ "  - Customizado: Se voc� j� � familiar com Linux, voc� poder� \n"
+#~ "selecionar o tipo de instala��o entre normal, desenvolvimento ou\n"
+#~ "servidor. Escolha \"Normal\"  para uma instala��o gen�rica no seu\n"
+#~ "computador. Voc� pode escolher \"Desenvolvimento\" se voc� usar� o "
+#~ "computador\n"
+#~ "principalmente para o desenvolvimento de software, ou escolha \"Server\" se\n"
+#~ "voc� deseja instalar um servidor gen�rico (para correio, impress�o...).\n"
+#~ "\n"
+#~ "  - Expert: Se voc� � fluente com GNU/Linux e quer fazer uma\n"
+#~ "instala��o altamente customizada, esse � o tipo de instala��o para voc�.\n"
+#~ "Voc� poder� escolher a utiliza��o do seu sistema como \"Customizado\".\n"
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "A esse ponto, voc� pode escolher qual(is) parti��o(�es) usar para instalar\n"
+#~ "seu sistema Linux-Mandrake se eles j� tiverem sidos definidos (em uma\n"
+#~ "instala��o anterior do Linux ou outra ferramenta de parti��o). Em outros\n"
+#~ "casos, devem ser definidas algumas parti��es. Essa opera��o consiste em\n"
+#~ "dividir logicamente o disco r�gido do seu computador em separadas �reas\n"
+#~ "de uso.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se voc� tiver que criar novas parti��es, use \"Auto alocar\" para "
+#~ "automaticamente\n"
+#~ "criar parti��es para o Linux. Voc� pode selecionar o disco para \n"
+#~ "particionamente clicando em \"hda\" para o primeiro drive IDE,\n"
+#~ "\"hdb\" para o segundo ou \"sda\" para o primeiro drive SCSI e assim por\n"
+#~ "diante\n"
+#~ "\n"
+#~ "\n"
+#~ "Duas parti��es comuns s�o: a parti��o root (/), que � o come�o da\n"
+#~ "hierarquia do sistema de arquivo e /boot, que cont�m todos os arquivos\n"
+#~ "necess�rios para iniciar o sistema operacional quando o\n"
+#~ "computador � ligado.\n"
+#~ "\n"
+#~ "\n"
+#~ "Como os efeitos desse processo s�o normalmente irrevers�veis, "
+#~ "particionamento\n"
+#~ "pode ser intimidador e estressante para um usu�rio inexperiente. DiskDrake\n"
+#~ "simplifica o processo para o usu�rio. Consulte a documenta��o\n"
+#~ "e n�o se apresse antes de continuar."
+
+#~ 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."
+#~ msgstr ""
+#~ "Qualquer nova parti��o deve ser formatada para ser utilizada\n"
+#~ "(formatar significa cria sistema de arquivo). A esse ponto, voc� pode\n"
+#~ "re-formatar alguma parti��o existente para apagar as informa��es\n"
+#~ "que ela cont�m. Nota: n�o � necess�rio re-formatar parti��es\n"
+#~ "pr�-existentes, particularmente se eles cont�m arquivos que voc� deseja "
+#~ "manter.\n"
+#~ "Normalmente as parti��es mantidas s�o /home e /usr/local."
+
+#~ 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."
+#~ msgstr ""
+#~ "Os pacotes selecionados est�o sendo instalados. Essa opera��o\n"
+#~ "deve demorar alguns minutos a n�o ser que voc� tenha escolhido\n"
+#~ "atualizar um sistema existente, nesse caso, pode demorar ainda\n"
+#~ "mais tempo antes da atualiza��o iniciar."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Se DrakX falhar ao detectar o seu mouse, ou voc� checar\n"
+#~ "o que ele fez, voc� ver� uma lista de mouses acima.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se voc� concordar com os configura��es do DrakX, apenas pule para\n"
+#~ "a se��o que voc� quer clicando no menu na esquerda. Se n�o, escolha\n"
+#~ "no menu o tipo de mouse mais pr�ximo ao que voc� possui.\n"
+#~ "\n"
+#~ "\n"
+#~ "No caso de um mouse serial, voc� ter� que dizer ao DrakX\n"
+#~ "a qual porta serial ele est� conectado."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "Essa se��o � dedicada � configura��o a configura��o\n"
+#~ "de uma rede local (LAN) ou de um modem.\n"
+#~ "\n"
+#~ "Escolha \"Rede Local\" e DrakX ir�\n"
+#~ "tentar localizar um adaptador Ethernet na sua m�quina. Adaptadores\n"
+#~ "PCI provalvemente ser�o encontrados e inicializados automaticamente.\n"
+#~ "Mesmo assim, se seu perif�rio � ISA, a autodetec��o n�o funcionar�,\n"
+#~ "e voc� ter� que escolher um driver da lista que ir� aparecer.\n"
+#~ "\n"
+#~ "\n"
+#~ "Para adaptadores SCSI, voc� pode deixar o driver procurar pelo\n"
+#~ "adaptador na primeira vez ou voc� ter� que especificar as\n"
+#~ "configura��es do driver que voc� deve possuir na documenta��o do\n"
+#~ "hardware.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se voc� instalar o Linux-Mandrake em uma m�quina que j� � parte\n"
+#~ "de uma rede existente, o administrador da rede ter� que lhe dar\n"
+#~ "todas as informa��es necess�rias (endere�o IP, subm�scara da rede\n"
+#~ "ou netmak para encurtar e o endere�o do host). Se voc� est� criando\n"
+#~ "uma rede pessoal em casa por exemplo, voc� dever� escolher os\n"
+#~ "endere�os.\n"
+#~ "\n"
+#~ "\n"
+#~ "Escolha \"Conex�o por modem\" e a conex�o da Internet atrav�s do modem\n"
+#~ "ser� configurada. Drakx ir� tentar localizar seu modem, se ele falhar\n"
+#~ "voc� ter� que selecionar a porta serial onde seu modem est� conectado."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "Linux pode lidar com v�rios tipos de impressora. Cada uma delas\n"
+#~ "requer uma configura��o diferente.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se sua impressora � conectada diretamente ao seu computador, selecione\n"
+#~ "\"Impressora Local\". Voc� ter� que dizer em qual porta sua impressora\n"
+#~ "est� conectada, e selecionar o filtro apropriado.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se voc� quiser acessar um impressora em uma m�quina Unix remota,\n"
+#~ "voc� ter� que selecionar \"Lpd Remoto\". Para faz�-lo funcionar,\n"
+#~ "n�o � necess�rio nome de usu�rio ou senha, mas voc� ter� que saber\n"
+#~ "o nome da fila de impress�o no servidor.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se voc� quiser acessar uma impressora SMB (que significa: uma impressora\n"
+#~ "localizada em um servidor Windows 9x/NT), voc� ter� que especificar seu\n"
+#~ "nome SMB (que n�o � o nome TCP/IP), e possivelmente seu endere�o IP,\n"
+#~ "mais o nome do usu�rio, grupo de trabalho e senha requeridos para poder\n"
+#~ "acessar a impressora, e � claro o nome da impressora. O mesmo vale para\n"
+#~ "uma impressora NetWare, exceto que voc� n�o precisa da informa��o sobre\n"
+#~ "o grupo de trabalho."
+
+#, fuzzy
+#~ 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."
+#~ msgstr ""
+#~ "� altamente recomendado que voc� responda \"Sim\" aqui. Se voc� instalar\n"
+#~ "o Microsoft Windows depois ele poder� sobrescrever o sector de boot.\n"
+#~ "A n�o ser que voc� crie um disquete de boot como sugerido, voc� n�o\n"
+#~ "conseguir� mais entrar no Linux."
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Esquecer as altera��es?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "Cone��o da Impressora"
+
+#~ msgid "Host name:"
+#~ msgstr "Host name (nome do host):"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Que tipo de mouse voc� tem?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Resolu��es Autom�ticas"
+
+#~ 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"
+#~ msgstr ""
+#~ "Para encontrar as resolu��es dispon�veis eu irei tentar algumas diferentes.\n"
+#~ "Sua tela vai piscar...\n"
+#~ "Voc� pode deslig�-la se quiser, voc� ouvir� um beep quando terminar"
+
+#~ 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?"
+#~ msgstr ""
+#~ "Eu posso tentar achar as resolu��es dispon�veis (ex.: 800x600).\n"
+#~ "Algumas vezes, por�m, pode travar o computador.\n"
+#~ "Voc� quer tentar?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Nenhuma resolu��o v�lida encontrada\n"
+#~ "Tente selecionar outra placa de v�deo ou monitor"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Procura autom�tica de resolu��es"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Mouse ADB Apple"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Mouse ADB Apple (2 bot�es)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Mouse ADB Apple (3 bot�es ou mais)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Mouse USB Apple"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Mouse USB Apple (3 bot�es ou mais)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Mouse USB Apple (3 bot�es ou mais)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Mouse Gen�rico"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus Mouse"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Mouse Microsoft Bus"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Mouse Logitech Bus"
+
+#~ msgid "USB Mouse"
+#~ msgstr "Mouse USB"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "Mouse USB (3 bot�es ou mais)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft 2.1A ou superior (serial)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (serial)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (serial)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (serial)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Mouse Gen�rico (serial)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Compat�vel com Microsoft (serial)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Mouse Gen�rico com 3 Bot�es (serial)"
+
+#, fuzzy
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "falhou ao montar nfs"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Criptogr�fico"
+
+#~ msgid "Show less"
+#~ msgstr "Mostrar menos"
+
+#~ msgid "Show more"
+#~ msgstr "Mostrar mais"
+
+#~ msgid "default"
+#~ msgstr "default"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Qual o layout do seu teclado?"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Tentar localizar cart�es PCMCIA?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "Tentar localizar dispositivos %s?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "Tentar localizar dispositivos PCI?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "Procurando parti��o root."
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: Essa n�o � uma parti��o root, favor selecione outra."
+
+#~ msgid "No root partition found"
+#~ msgstr "Nenhuma parti��o root encontrada"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "N�o pode usar broadcast sem o dom�nio NIS"
+
+#~ 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.
+#
+# '\241' is '�' (iacute) in cp437 encoding
+# '\207' is '�' (ccedilla) in cp437 encoding
+#
+#~ 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 ""
+#~ "Bem-vindo ao LILO, o selecionador de sistema operacional!\n"
+#~ "\n"
+#~ "Para listar as op�oes poss�ves, tecle <TAB>.\n"
+#~ "\n"
+#~ "Para carregar um deles, escreva o nome e pressione <ENTER>\n"
+#~ "ou aguarde %d segundos para o boot padrao.\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
+#
+#~ 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 ""
+#~ "Bem-vindo ao SILO, o selecionador de sistema operacional!\n"
+#~ "\n"
+#~ "Para listar as opcoes possives, tecle <TAB>.\n"
+#~ "\n"
+#~ "Para carregar um deles, escreva o nome e pressione <ENTER>\n"
+#~ "ou aguarde %d segundos para o boot padrao.\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "Principais op��es do SILO"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "A seguir est�o as entradas do SILO.\n"
+#~ "Voc� pode adicionar mais ou modificar as existentes."
+
+#~ msgid "This label is already in use"
+#~ msgstr "Esse label j� est� sendo utilizado"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "A Instala��o do SILO falhou. Ocorreram os seguintes erros:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX ir� tentar detectar um ou mais adaptador(es) PCI\n"
+#~ "SCSI. Se encontrar algum e tiver o driver dele(s), ele(s) ser�(ser�o)\n"
+#~ "instalado(s) automaticamente.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se seu adaptador SCSI est� em uma placa ISA, ou � PCI mas DrakX\n"
+#~ "n�o saber qual driver utilizar, ou se voc� n�o possui nenhum adaptador\n"
+#~ "SCSI, voc� ser� perguntado se voc� possui algum ou n�o. Se voc� n�o\n"
+#~ "tiver, escolha \"N�o\". Se voc� tiver um ou mais, responda \"Sim\". Uma\n"
+#~ "lista de drivers vai aparecer, e dela voc� dever� escolher qual\n"
+#~ "voc� possui.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ap�s voc� ter selecionado o driver, DrakX ir� perguntar se\n"
+#~ "voc� quer especificar op��es para ele. Primeiro, tente e deixe\n"
+#~ "o driver procurar pelo hardware: normalmente funciona.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se n�o, n�o esque�a que voc� pode conseguir informa��o sobre seu\n"
+#~ "hardware pelo Windows (se voc� o possui no seu computador), como\n"
+#~ "sugerido pelo guia de instala��o. Essas s�o as op��es que voc�\n"
+#~ "precisar� para configurar o driver."
+
+#~ msgid "Shutting down"
+#~ msgstr "Desligando"
 
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of Linux\n"
@@ -5046,15 +7193,9 @@ msgstr ""
 #~ msgid "Bad kickstart file %s (failed %s)"
 #~ msgstr "Arquivo de inicializa��o r�pida defeituoso %s (falha %s)"
 
-#~ msgid "Which language do you want?"
-#~ msgstr "Qual l�ngua voc� quer?"
-
 #~ msgid "What usage do you want?"
 #~ msgstr "Qual utiliza��o voc� quer?"
 
-#~ msgid "Dialup with modem"
-#~ msgstr "Dialup com modem"
-
 #~ msgid "Local LAN"
 #~ msgstr "LAN Local"
 
@@ -5099,9 +7240,6 @@ msgstr ""
 #~ "Falha ao criar um disco de boot HTP.\n"
 #~ "Voc� pode ter que reiniciar a instala��o e dar um ``%s'' no prompt"
 
-#~ msgid "Local Printer Options"
-#~ msgstr "Op��es da Impressora Local"
-
 #~ msgid "Password:"
 #~ msgstr "Senha:"
 
@@ -5113,9 +7251,3 @@ msgstr ""
 
 #~ msgid "Going to install %d MB. You can choose to install more programs"
 #~ msgstr "Vou instalar %d MB. Voc� pode escolhar mais programas para instalar"
-
-#~ msgid "Windows(TM)"
-#~ msgstr "Windows(TM)"
-
-#~ msgid "Partitioning failed: no root filesystem"
-#~ msgstr "O particionamento falhou: sem sistema de arquivo root"
diff --git a/perl-install/share/po/ro.po b/perl-install/share/po/ro.po
index 40e15d3e8..189de5d05 100644
--- a/perl-install/share/po/ro.po
+++ b/perl-install/share/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 7.1\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 2000-04-30 2:55+0200\n"
 "Last-Translator: Florin Grad <florin@mandrakesoft.com>\n"
 "Language-Team: romanian\n"
@@ -14,43 +14,91 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "Generic"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Carte grafic�"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Alege�i o carte grafic�"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Alege�i un server X"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "Server X"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, fuzzy, c-format
+msgid "XFree %s"
+msgstr "Server XFree86: %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Ce tip de intr�ri dori�i s� ad�uga�i ?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+#, fuzzy
+msgid "XFree configuration"
+msgstr "Configura�ie post-install"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Alege�i memoria pentru cartea grafic�"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Alege�i op�iunile pentru server"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Alege�i un  monitor"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -72,39 +120,40 @@ msgstr ""
 "distruge monitorul �n acest fel.\n"
 "Dac� nu sunte�i sigur, alege�i parametri conservativi."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Rata de actualizare orizontal�"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Rata de actualizare vertical�"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Monitor nu a fost �nc� configurat"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Cartea grafic� nu a fost configurat� �nc�"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Rezolu�ia nu a fost �nc� aleas�"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Dori�i s� testa�i configura�ia ?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+#, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Aten�ie: testul e periculos pentru aceast� carte grafic�"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Test de configura�ie"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -112,183 +161,168 @@ msgstr ""
 "\n"
 "re�ncerca�i dup� ce a�i modificat ceva parametri"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "A ap�rut o eroare:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Testul se va termina �n %d secunde"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "Configura�ia e corect�"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Eroare, re�ncerca�i dup� ce a�i modificat ceva parametri"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Rezolu�ii alese �n mod automat"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Pentru a afla rezolu�iile disponibile voi �ncerca altele diferite.\n"
-"Ecranul dumneavoastr� se va stinge �i aprinde de c�teva ori..."
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Rezolu�ie"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Alege�i rezolu�ia �i culorile"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Carte grafic�: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Server XFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Afi�a�i tot"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Rezolu�ii"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"Pot s� �ncerc s� g�sesc rezolu�iile disponibile (eg:800x600).\n"
-"Uneori, totu�i, aceasta poate bloca calculatorul.\n"
-"Dori�i s� �ncerc ?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"N'am g�sit moduri valide\n"
-"�ncerca�i cu o alt� carte video sau alt monitor"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastatura : %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tip de mouse : %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Periferic pentru mouse: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Frecven�a orizontala pentru monitor : %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Frecven�a verticala pentru monitor : %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Carte grafic� : %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Memorie grafic� : %s KB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Op�iuni pentru culori:"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Rezolu�ii"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Server XFree86 : %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "Server XFree86 : %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Preg�tesc configura�ia X-Window"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Alege�i un alt tip de monitor"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Alege�i un alt tip de carte grafic�"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Schimba�i op�iunile server-ului"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Alege�i o alt� rezolu�ie"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "Configurarea automat� a rezolu�iilor"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Afi�eaz� informa�iile"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Testeaz� din nou"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Ie�ire"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "Ce dori�i s� face�i ?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Abandona�i schimb�rile?"
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Pastra�i configura�ia IP curent�"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "V� rog reconecta�i-v� ca %s pentru a activa schimb�rile"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "V� rog deloga�i-v� �i folosi�i Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "Sever X la demaraj"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -296,227 +330,227 @@ msgstr ""
 "Pot s� configurez calculatorul sa demareze automat X la demaraj.\n"
 "Dori�i sa demara�i X c�nd redemara�i ?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1152
+#, 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."
+msgstr ""
+"Pot s� configurez calculatorul sa demareze automat X la demaraj.\n"
+"Dori�i sa demara�i X c�nd redemara�i ?"
+
+#: ../../Xconfigurator.pm_.c:1154
+#, fuzzy
+msgid "Choose the default user:"
+msgstr "Alege�i noua m�rime"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Alege�i unealta pe care dori�i s� o folosi�i"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 de culori (8 bi�i)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mii de culori (15 bi�i)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mii de culori (16 bi�i)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 milioane de culori (24 bi�i)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 miliarde de culori (32 bi�i)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB sau mai mult"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standard VGA, 640x480 la 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 la 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 Compatibil, 1024x768 la 87 Hz �ntre�esut (nu 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 la 87 Hz �ntre�esut, 800x600 la 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Super VGA Extins, 800x600 la 60 Hz, 640x480 la 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "Ne-�ntre�esut SVGA, 1024x768 la 60 Hz, 800x600 la 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "�nalt� frecven�� SVGA, 1024x768 la 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frecven�� care e capabil de 1280x1024 la 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frecven�� care e capabil de 1280x1024 la 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frecven�� care e capabil de 1280x1024 la 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor care e capabil de 1600x1200 la 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor care e capabil de 1600x1200 la 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "c�rlion�at"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "standard"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "cravat�"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "brunet�"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "fat�"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "femeie blond�"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "automagic"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Primul sector al parti�iei de demaraj"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Primul sector al discului (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
+#: ../../any.pm_.c:95
+#, fuzzy
+msgid "SILO Installation"
 msgstr "Instalare LILO/grub"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Unde dori�i s� instala�i Gestionarul de demaraj ?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "Instalare LILO/grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Nici unul"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Ce gestionar de demaraj dori�i s� folosi�i ?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+#, fuzzy
+msgid "Bootloader installation"
+msgstr "Op�iunile principale ale gestionarului de demaraj"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Periferic de demaraj"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (nu func�ioneaz� cu BIOS-urile vechi)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Compact"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "compact"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Timp de a�teptare �naintea demar�rii imaginii standard"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Mod video"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Timp de a�teptare �naintea demar�rii imaginii standard"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Parola"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Parola (din nou)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Limiteaz� op�iunile liniei de comand�"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "limiteaz�"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Op�iunile principale ale gestionarului de demaraj"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Op�iunea ``Limiteaz� op�iunile liniei de comand�'' e inutil� f�r� parol�"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "�ncerca�i din nou"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Parolele nu corespund"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -524,167 +558,385 @@ msgstr ""
 "Acestea sunt diferitele intr�rile.\n"
 "Pute�i s� mai ad�uga�i �i altele sau s� schimba�i cele existente."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Adaug�"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Gata"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Ce tip de intr�ri dori�i s� ad�uga�i ?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Alt SO (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "Alt SO (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Ce tip de intr�ri dori�i s� ad�uga�i ?"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Imagine"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Append"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "Cite�te-Scrie"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Tabel"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Nesigur"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Etichet�"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Standard"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "�terge intrarea"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Eticheta goal� nu e permis�"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Aceast� etichet� nu e permis�"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Am g�sit interfa�ele %s %s"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Ave�i o alt� interfa�a?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Ave�i vreo interfa�� %s ?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Nu"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Da"
+
+#: ../../any.pm_.c:505
+msgid "See hardware info"
+msgstr "Vezi info hardware"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Instalarea pilotului pentru %s cartea %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(modul %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Care %s pilot s� �ncerc?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"�n anumite cazuri, pilotul %s necesit� informa�ii suplimentare pentru a\n"
+"func�iona corect, dar func�ioneaz� bine �i f�r�. Dori�i s� specifica�i\n"
+"op�iuni suplimentare sau �i permite�i s� interogheze calculatorul pentru\n"
+"informa�iile necesare? Ocazional, interogarea poate bloca calculatorul,\n"
+"dar n-ar trebui s� produce nici o deteriorare."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Autoprobeaz�"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Specifica�i op�iunile"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Pute�i furniza acum op�iunile modulului %s."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"Pute�i furniza acum op�iunile modulului %s.\n"
+"Op�iunile sunt �n formatul ``nume=valoare nume2=valoare2 ...''.\n"
+"de exemplu, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Op�iuni pentru module:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"�nc�carea modulului %s a e�uat.\n"
+"Dori�i s��ncerca�i cu al�i parametri ?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Bun venit la gestionarul de sisteme de operare %s!\n"
+"\n"
+"Pentru a afisa diferitele posibilitati, apasati <TAB>.\n"
+"\n"
+"Pentru a demara unul dintre ele, scrieti-i numele si apasati <ENTER> sau\n"
+"asteptati %d secunde pentru demararea din oficiu.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Bun venit la gestionarul de sisteme de operare GRUB!"
+
+# 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
+#
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "Folositi tastele %c si %c pentru selectarea intrarii puse in evidenta."
+
+# 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
+#
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Apasati enter pentru a demara OS-ul selectat, 'e' pentru a edita"
+
+# 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
+#
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "comandele inainte de a demara, sau 'c' pentru linia de comanda."
+
+# 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
+#
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "Intrarea selectata va demara dupa %d secunde"
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr "nu e destul spa�iu �n /boot"
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Desktop"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Meniu de Start"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "Testul se va termina �n %d secunde"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Creaz�"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Demonteaz�"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "�terge"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Formateaz�"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Redimensioneaz�"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Tip"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Punct de montaj"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Scrie /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Trece �n mod expert"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Trece �n mod normal"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Restaureaz� din fi�ierul"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "�nregistreaz� �n fi�ierul"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Restaureaz� din dischet�"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "�nregistreaza pe dischet�"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "�terge tot"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Formateaz� tot"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Auto aloca"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "Toate parti�iile principale sunt alocate"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Imposibil de ad�ugat o alta parti�ie"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -692,59 +944,63 @@ msgstr ""
 "Pentru a avea mai multe parti�ii, �terge�i una pentru a putea crea una de "
 "tip Extended "
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Salveaz� tabelul de parti�ii"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Anuleaz�"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Scrie tabloul de parti�ii"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Re�ncarc�"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Gol"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "Alt tip"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Gol"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Alt tip"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Tipul de fi�iere sistem: "
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Detalii"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -756,17 +1012,17 @@ msgstr ""
 "Va sugerez s� redimensiona�i mai �nt�i acea parti�ie\n"
 "face�i clic pe ea �i apoi pe \"Redimensioneaz�\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "V� rog face�i mai �nt�i o copie a datelor dumneavoastr�"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "Citi�i cu aten�ie!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -775,77 +1031,77 @@ msgstr ""
 "Dac� dori�i s� folosi�i aboot, asigura�i-v� s� l�sa�i un spa�iu liber\n"
 "(2048 de sectoare sunt de ajuns) la �nceputul discului"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Aten�ie: aceasta opera�ie e periculoas�."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Eroare"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Punct de montaj: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Periferic: "
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Litera perifericului DOS: %s (doar o presupunere)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Start: sector %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "M�rimea: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sectori"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "De la cilindrul %d la cilindrul %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Formatat\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Neformatat\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Montat\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Fi�ier(e) loopback: %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -853,79 +1109,79 @@ msgstr ""
 "Parti�ia demarat� din oficiu\n"
 "    (pentru demaraj MS-DOS, nu pentru lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Nivel %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "M�rimea por�iunii %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "Discuri-RAID %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Numele fi�ierului loopback: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "V� rog face�i clic pe o parti�ie"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "M�rime: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometrie: %s cylinders, %s heads, %s sectors\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Tipul tabloul de parti�ii : %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "pe bus-ul %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Montaj"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Activ"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Adaug� la RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "�terge din RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Modific� RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Folose�te pentru loopback"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Alege�i ac�iunea"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -937,7 +1193,7 @@ msgstr ""
 "Sau folosi�i LILO soi nu va func�iona, sau nu folosi�i LILO �i atunci nu\n"
 "ave�i nevoie de /boot"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -950,27 +1206,28 @@ msgstr ""
 "Dac� planifica�i s� folosi�i LILO ca gestionar de demaraj, asigura�i-v� "
 "c�a�i ad�ugat o parti�ie /boot."
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
+#, fuzzy
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "A�i selectat o parti�ie software root en tant que RAID.\n"
 "Nici un gestionar de boot nu e capabil s� gereze aceasta f�r�\n"
 "o partitie /boot. Folosi�i deci o parti�ie /boot dac� dori�i s� folosi�i\n"
 "lilo sau grub."
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Folose�te ``%s'' �n loc"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Folose�te ``Demontare' mai �nt�i"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -978,41 +1235,42 @@ msgstr ""
 "Dup� schimbarea tipului de parti�ie %s, toate datele de pe aceasta "
 "parti�ievor fi pierdute"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Continua�i totu�i?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Ie�ire f�r� a �nregistra"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Ie�ire din program f�r� a scrie �n tabloul de parti�ii ?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Schimb� tipul parti�iei"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "Ce tip de parti�ie dori�i?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "Ce limb� dori�i ?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Unde dori�i s� monta�i fi�ierul loopback %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Unde dori�i s� monta�i perifericul %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1021,143 +1279,148 @@ msgstr ""
 "folosit�pentru loopback.\n"
 "�terge�i loopback-ul mai �nt�i"
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "Dup� formatarea parti�iei %s toate datele de pe aceasta parti�ie vor fi "
 "pierdute"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Formatare"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formatarea fi�ierului loopback %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formatarea parti�iei %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Dup� formatarea tuturor parti�iilor,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "toate datele din aceste parti�ii vor fi pierdute"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Deplaseaz�"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Pe ce disc dori�i s� schimba�i ?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sector"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "La ce sector dori�i sa schimba�i ?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Schimb�"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Schimb� parti�ia..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Tabloul de parti�ii al perifericului %s va fi scris pe disc!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 "Va trebui s� redemara�i pentru ca schimb�rile sa fie luate �n considerare"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Calculeaz� salturile de fi�iere FAT"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Redimensioneaz�"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Ce tip de parti�ie dori�i?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "Toate datele de pe aceasta parti�ie ar trebui salvate mai �nt�i"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "Dup� redimensionarea parti�iei %s toate datele de pe aceasta parti�ie vor fi "
 "pierdute"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Alege�i noua m�rime"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Creeaz� o nou� parti�ie"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Sector de �nceput: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "M�rimea �n MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Tipul de fi�iere: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Preferin��: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Aceast� parti�ie nu poate fi folosit� pentru loopback"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Numele fi�ierului loopback"
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
 msgstr "Fi�ier deja folosit de un alt loopback, alege�i un altul"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "Fi�ierul exist� deja. S�-l folosesc ?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Selec�ioneaz� fi�ierul"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1165,11 +1428,11 @@ msgstr ""
 "Tabloul de parti�ie salvat nu are aceea�i m�rime\n"
 "S� continui totu�i ?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Avertisment"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1177,79 +1440,79 @@ msgstr ""
 "Introduce�i o dischet� �n periferic\n"
 "Toate datele de pe aceast� dischet� vor fi pierdute"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "�ncercare de salvare a tabloului de parti�ii"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "periferic: "
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "nivel"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "m�rimea por�iunii "
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Alege�i un RAID existent la care s� ad�uga�i"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "nou"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s Formatarea %s e�uat�"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Nu �tiu cum s� formatez %s �n tipul %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "montarea nfs a e�uat"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "montare e�uat�: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "eroare la demontarea %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Punctele de montaje trebuie sa �nceap� cu un /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "O parti�ie cu punctul de montaj %s exist� deja\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Montaje circulare %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Ave�i nevoie de un sistem de fi�iere serios (ext2, reiserfs) pentru\n"
 "acest punct de montaj.\n"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Eroare la citirea  %s pentru a scrie: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1258,75 +1521,81 @@ msgstr ""
 "fi�iere\n"
 "sistem. Verifica�i harware-ul pentru a detecta cauza acestei probleme."
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Nu ave�i nici o parti�ie!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "Alege�i limba pentru instalare �i folosirea sistemului."
 
-#: ../../help.pm_.c:10
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Alege�i dispozi�ia tastaturii din lista de mai sus"
-
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "Alege�i dispozi�ia tastaturii din lista de mai sus"
+
+#: ../../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
+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"
-"  - 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"
-msgstr ""
-"Alege�i \"Instalare\" dac� nu exista alte versiuni de Linux instalate,\n"
-"sau dac� dori�i s� folosi�i mai multe versiuni sau distribu�ii.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Alege�i \"Actualizare\" dac� dori�i s� actualiza�i o versiune precedent�\n"
-"Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000 or 7.0 (Air).\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"
-"Selectare:\n"
+"\t* Recommanded: 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"
-"  - Automatizat: Dac� n'a�i mai instalat Linux niciodat�, alege�i aceasta.\n"
-"NOT�:\n"
-"    re�eaua nu va fi configurat� �n timpul instal�rii, folosi�i\n"
-"    \"LinuxConf\" pentru a o configura dup� ce instalarea s'a terminat.\n"
 "\n"
-"  - Personalizat: Dac� sunte�i destul de familiar cu GNU/Linux, pute�i\n"
-"    atunci s� alege�i utilizarea principal� a calculatorului. Vezi mai jos\n"
-"    pentru detalii.\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - Expert: Aceasta presupune c� sunte�i foarte familiar cu  GNU/Linux �i\n"
-"    dori�i s� face�i o instalare foarte personalizat�. Ca �i pentru clasa\n"
-"    \"Personalizat\", ve�i putea s� selecta�i utilizarea sistemului\n"
-"    dumneavoastr�.\n"
-"    Dar v� rog, NU ALEGE�i ACEASTA DEC�T DAC� �TI�I CE FACE�I!.\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1334,12 +1603,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Selectare:\n"
 "\n"
@@ -1347,37 +1617,36 @@ msgstr ""
 "    atunci s� alege�i utilizarea principal� a calculatorului. Vezi mai jos\n"
 "    pentru detalii.\n"
 "\n"
+"\n"
 "  - Expert: Aceasta presupune c� sunte�i foarte familiar cu  GNU/Linux �i\n"
 "    dori�i s� face�i o instalare foarte personalizat�. Ca �i pentru clasa\n"
 "    \"Personalizat\", ve�i putea s� selecta�i utilizarea sistemului\n"
 "    dumneavoastr�.\n"
-"    Dar v� rog, NU ALEGE�i ACEASTA DEC�T DAC� �TI�I CE FACE�I!.\n"
+"    Dar v� rog, NU ALEGE�i ACEASTA DEC�T DAC� �TI�I CE FACE�I!."
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "Diferitele posibilit��i pentru utilizarea calculatorului (furnizate, deci, "
 "dac�\n"
@@ -1402,158 +1671,347 @@ msgstr ""
 "etc.\n"
 "Deci nu v� a�tepta�i la programe de genul KDE, GNOME...\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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 va �ncerca mai �nt�i s� caute unul sau mai mul�i adaptatori PCI\n"
-"sau SCSI. Dac� c�utarea e fructuoas� �i �tie ce pilot s� foloseasc�,\n"
-"atunci �l (le) va instala �n mod automat.\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"
+"\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"
-"Dac� adaptatorul este o carte ISA, sau est e o carte PCI �i DrakX\n"
-"nu �tie ce pilot s� foloseasc� sau dac� nu ave�i nici un adaptator SCSI\n"
-"ve�i fi mai apoi �ntrebat dac� ave�i unul sau nu. Dac� nu ave�i nici unul\n"
-"r�spunde�i \"Nu\". Dac� ave�i unul sau mai multe, r�spundeti \"Da\".\n"
-"O list� cu pilo�i va va permite atunci s� alege�i unul.\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"
-"Dup� ce a�i selec�ionat pilotul, DrakX v� va �ntreba dac� dori�i\n"
-"s� specifica�i op�iuni pentru el (ei). Mai �nt�i �ncerca�i �i l�sa�i\n"
-"pilotul s� testeze hardware-ul: �n mod normal aceasta func�ioneaz� bine.\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"
-"Dac� nu, nu uita�i informa�iile despre hardware pe care le-a�i putea g�si\n"
-"�n documenta�ia dumneavoastr� sau din Windows (dac� l-ave�i instalat), a�a\n"
-"cum e sugerat �n ghidul de instalare. Acestea sunt op�iuni pe care le ve�i\n"
-"furniza pilotului."
+"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."
+msgstr ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:160
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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"
 "\n"
+"   * Auto allocate:: this option allows you to automatically create Ext2 and "
+"swap partitions in free space of your\n"
+"     hard drive.\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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
+msgstr ""
+
+#: ../../help.pm_.c:218
+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 ""
+
+#: ../../help.pm_.c:252
+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:257
+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"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\n"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"�n acest punct, ve�i putea alege parti�iile pentru a instala sistemul\n"
-"Linux-Mandrake dac� acestea au fost deja definite (dintr-o alt� instalare\n"
-"prealabil� a unui sistem Linux sau cu ajutorul unui program departi�ionare). "
-"�n celelalte cazuri, parti�iile vor trebui s� fie create.\n"
-"Aceast� opera�ie consist� �n divizarea logic� a capacit��ii discului dur\n"
-"�n arii separate pentru utilizare.\n"
+
+#: ../../help.pm_.c:267
+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"
-"Dac� ave�i nevoie s� crea�i noi parti�ii, folosi�i \"Auto alocare\" \n"
-"pentru o creare automat� de parti�ii Linux. Pute�i selecta discul pentru\n"
-"parti�ionare f�c�nd clic pe \"hda\" pentru primul disc IDE, \"hdb\" \n"
-"pentru al doilea sau \"sda\" pentru primul disc SCSI �i a�a mai departe.\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"
-"Dou� parti�ii obi�nuite sunt: parti�ia root (/), punctul de plecare\n"
-"al ierarhiei sistemului de fi�iere �i /boot, care con�ine toate fi�ierele\n"
-"necesare pentru a demara sistemul de operare c�nd calculatorul e aprins.\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"
-"Pentru c� efectele acestui proces sunt �n mod uzual reversibile,\n"
-"parti�ionarea poate fi intimidant� pentru un utilizator ne-experimentat.\n"
-"De aceea DiskDrake simplific� pe c�t posibil acest proces. Consulta�i\n"
-"documenta�ia �i nu v� gr�bi�i �nainte de a �ncepe.\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"
-"Pute�i accede la toate op�iunile cu ajutorul tastaturii: naviga�i printre\n"
-"parti�ii folosind tasta Tab �i tastele s�ge�i Sus/Jos. C�nd o parti�ie\n"
-"e selectat�, pute�i folosi:\n"
+"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"- Ctrl-c  pentru a crea o nou� parti�ie (c�nd a parti�ie goal� e selectat�)\n"
+"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
+"\"secondary hard drive\", etc.\n"
 "\n"
-"- Ctrl-d  pentru a �terge o parti�ie\n"
 "\n"
-"- Ctrl-m pentru a crea un punct de montaj\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:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:303
 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."
+"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 ""
-"Toate parti�iile care tocmai au fost definite trebuie s� fie formatate\n"
-"�nainte de a fi utilizate. (formatare �nsemn�nd crearea fi�ierelor sistem).\n"
-"Poate dori�i s� reformata�i parti�ii pre-existente pentru a �terge \n"
-"informa�iile con�inute.\n"
-"Nota: nu este necesar s� formata�i parti�ii mai ales dac� dori�i s�\n"
-"conserva�i informa�iile ce le con�in. Parti�ii de acest gen sunt:\n"
-"/home �i /usr/local."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
+#, 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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 ""
 "Pute�i acum s� selecta�i grupul pachetelor pe care vre�i s� le instala�i\n"
 "sau actualiza�i.\n"
@@ -1564,136 +2022,153 @@ msgstr ""
 "selecta�i op�iunea \"Selectarea individual� a pachetelor\"; �n acest caz\n"
 "va trebui va trebui s� parcurge�i mai mult de 1000 de pachete..."
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:358
+#, 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 ""
 "Dac� ave�i toate CD-urile din lista de mai sus face�i clic pe Ok.\n"
 "Dac� nu ave�i nici unul din aceste Cd-uri, face�i clic pe Anuleaz�.\n"
 "Dac� numai c�teva din aceste Cd-uri lipsesc, de-selecta�i-le �i apoi Ok."
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:363
 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."
+"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 ""
-"Pachetele selectate sunt acum pe cale de fi instalate. Aceast� opera�ie\n"
-"ar trebui s� ia c�teva minute, excep�ie f�c�nd Actualizare unei distribu�ii\n"
-"precedente, caz �n care timpul va fi lung �nainte ca actualizarea s�\n"
-"�nceap�."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:371
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"Dac� DrakX nu a reu�it s� detecteze mouse-ul, sau dac� dori�i s� verifica�i\n"
-"ceea ce a f�cut, vi se va propune lista cu mouse-uri de mai sus.\n"
-"\n"
-"\n"
-"Dac� sunte�i de acord cu propunerea lui DrakX, s�ri�i la sec�iunea dorit�\n"
-"cu un simple �n meniu din st�nga. Dac� nu, alege�i tipul de mouse care\n"
-"crede�i c� se apropie mai mult de cel pe care-l ave�i.\n"
-"\n"
-"\n"
-"�n cazul unui mouse de tip serie, ve�i putea specifica portul serie la\n"
-"care e conectat."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
 "V� rog selecta�i portul corect. De exemplu, portul COM1 din Windows e\n"
 "numit ttyS0 �n Linux."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
-"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"
+"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 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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"Aceast� sec�iune este dedicat� configura�iei unei re�ele locale (LAN)\n"
-"sau a unui modem.\n"
-"\n"
-"Alege�i \"Re�ea LAN\" �i DrakX va �ncerca s� detecteze adaptatorul\n"
-"Ethernet pe care-l ave�i. Adaptatorii PCI sunt �n general detecta�i �i\n"
-"ini�ializa�i �n mod automat.\n"
-"�n cazul unui adaptator ISA, detec�ia automat� nu va func�iona �i ve�i\n"
-"avea atunci de ales pilotul din lista propus�.\n"
-"\n"
-"\n"
-"La fel �i pentru adaptatorii SCSI, pute�i l�sa testul mai �nt�i, dac� nu\n"
-"pute�i specifica op�iunile pentru pilot pe care le-a�i recuperat �n \n"
-"documenta�ia hardware-ului.\n"
-"\n"
-"\n"
-"Dac� instala�i sistemul Linux-Mandrake pe un calculator care face parte\n"
-"dintr-o re�ea deja existent�, administratorul de re�ea v� va da toate\n"
-"informa�iile necesare (adres� IP, sub-masc� de re�ea sau netmask mai pe\n"
-"scurt �i numele calculatorului). Dac� configura�i o re�ea privat� la\n"
-"dumneavoastr� acas�, de exemplu, va trebui s� alege�i adresele singur.\n"
-"\n"
-"\n"
-"Alege�i \"Telefona�i cu modem\" �i atunci conexiunea Internet va fi\n"
-"configurat�. DrakX va �ncerca s� detecteze modemul �i dac� nu reu�e�te\n"
-"v� va propune portul serie la care modemul e conectat."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"Pute�i intra op�iunile de telefonie. Dac� nu sunte�i sigur de ceea ce\n"
+"trebuie s� intra�i, �ntreba�i ISP-ul dumneavoastr�."
+
+#: ../../help.pm_.c:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
 "Intrare;\n"
 "\n"
@@ -1704,7 +2179,22 @@ msgstr ""
 " - Masc� de re�ea: \"255.255.255.0\" e �n general cea corect�. Dac� nu\n"
 "sunte�i sigur, �ntreba�i administratorul de re�ea sau ISP.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"Dac� re�eaua dumneavoastr� folose�te NIS, selecta�i \"Folose�te NIS\". Dac�\n"
+"nu �ti�i exact, �ntreba�i administratorul de re�ea."
+
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1712,7 +2202,7 @@ msgstr ""
 "Pute�i intra op�iunile de telefonie. Dac� nu sunte�i sigur de ceea ce\n"
 "trebuie s� intra�i, �ntreba�i ISP-ul dumneavoastr�."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1720,13 +2210,15 @@ msgstr ""
 "Dac� folosi�i servere proxy, configura�i-le acum. Dac� nu �ti�i dac� ar\n"
 "trebuie s� folosi�i un proxy, �ntreba�i administratorul de re�ea sau ISP-ul."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1737,13 +2229,19 @@ msgstr ""
 "Nota�i c� va trebui s� alege�i aceste pachete criptografice corespunz�toare\n"
 "legisla�ie dumneavoastr�."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "Pute�i selecta acum zona orar� �n func�ie de locul unde tr�i�i.\n"
 "\n"
@@ -1751,97 +2249,180 @@ msgstr ""
 "Linux trateaz� ora �n format GMT sau \"Greenwich Mean Time\" �i-l traduce\n"
 "�n or� local� �n func�ie de zona orar� aleas�."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 ""
 "Pute�i alege acum serviciile ce dori�i s� ini�ializa�i la demararea\n"
 "calculatorului. Dac� plasa�i mouse-ul deasupra rubricii, un mic balon de\n"
 "ajutor va apare pentru a descrie rolul serviciului respectiv."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
 msgid ""
-"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"
+"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:490
+msgid ""
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"Linux poate gera multe tipuri de imprimante. Fiecare din aceste tipuri\n"
-"necesit� o instalare diferit�. Nota�i c� \"spool\"-ul de imprimant�\n"
-"folose�te \"lp\" pentru numele din oficiu al imprimantei; deci va trebui\n"
-"s� ave�i o imprimant� cu un acest nume; dar �i ve�i putea da mai multe "
-"nume,\n"
-"separate de caractere '|'. Deci, dac� dori�i s� ave�i unele nume mai pline\n"
-"de sens, ve�i putea folosi, de exemplu: \"Imprimanta mea|lp\".\n"
-"Imprimanta care are are \"lp\" printre numele ei va fi considerat� ca\n"
-"imprimanta din oficiu.\n"
+
+#: ../../help.pm_.c:505
+msgid ""
+"GNU/Linux can deal with many types of printer. Each of these types requires\n"
+"a different setup.\n"
 "\n"
 "\n"
-"Dac� imprimanta e conectat� fizic la calculator, selecta�i atunci\n"
-"\"Imprimant� local�\". Ve�i avea apoi a intra numele portului de\n"
-"imprimant� la care aceasta e conectat� �i a selecta filtrul apropriat\n"
-"Portul LPT1 devine lp0 �n Linux\n"
+"If your printer is physically connected to your computer, select \"Local\n"
+"printer\".\n"
 "\n"
 "\n"
-"Dac� dori�i s� accede�i la un calculator Unix distant, ve�i avea a selecta\n"
-"\"lpd distant\". Pentru a o face s� func�ioneze, nu ave�i nevoie de parol�\n"
-"sau de nume de utilizator, dar va trebui s� �ti�i care e numele cozii de\n"
-"imprimare de pe acest server-ului.\n"
+"If you want to access a printer located on a remote Unix machine, select\n"
+"\"Remote printer\".\n"
 "\n"
 "\n"
-"Dac� dori�i s� acede�i la o imprimant� SMB (adic� la o imprimant� conectat�\n"
-"fizic la un calculator distant cu un sistem Windows), va trebui s� \n"
-"specifica�i numele ei SMB (care nu e numele ei TCP/IP) �i probabil adresa\n"
-"ei IP, plus numele utilizatorului, al grupului de lucru �i parola cerut�\n"
-"pentru a accede la imprimant� �i bine�n�eles numele imprimantei. Lucrurile\n"
-"sunt similare pentru o imprimant� Netware, excep�ie f�c�nd faptul c� nu\n"
-"ave�i nevoie de informa�ia de grup de lucru."
+"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:286
+#: ../../help.pm_.c:521
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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:542
+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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
+"\n"
+"Do not make the password too long or complicated, though: you must be able "
+"to\n"
+"remember it without too much effort."
 msgstr ""
 "Alege�i parola pentru utilizatorul administrator al sistemului Linux.\n"
 "Parola trebuie �nscris� de dou� ori pentru a se asigura c� sunt identice.\n"
@@ -1855,7 +2436,7 @@ msgstr ""
 "fie un amestec de caractere alfanumerice �i de cel pu�in 8 caractere. Nu-l\n"
 "scrie�i NICIODAT� pe ceva �i nu-l face�i prea lung sau prea greu de re�inut."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1863,7 +2444,7 @@ msgstr ""
 "Pentru a crea un sistem �nc� �i mai sigur, ar trebui s� alege�i \"Folose�te\n"
 "un fi�ier shadow\" �i \"Folose�te parole MD5\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1871,7 +2452,7 @@ msgstr ""
 "Dac� re�eaua dumneavoastr� folose�te NIS, selecta�i \"Folose�te NIS\". Dac�\n"
 "nu �ti�i exact, �ntreba�i administratorul de re�ea."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1913,21 +2494,18 @@ msgstr ""
 "utilizatorului pe care l-a�i creat aici �i s� folosi�i contul root\n"
 "numai pentru administra�ie �i scopuri de depanare."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"E foarte indicat s� r�spunde�i \"Da\" aici. Dac� instala�i Microsoft \n"
-"Windows mai t�rziu, acest a v� va �terge sectorul de demaraj al discului.\n"
-"Dac� nu ave�i un floppy de demaraj, nu ve�i mai putea demara Linux."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
+#, fuzzy
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
@@ -1940,7 +2518,7 @@ msgstr ""
 "�n general alege�i \"Primul sector al discului\". Alege�i altceva doar dac� "
 "�ti�i ce face�i."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1948,10 +2526,11 @@ msgstr ""
 "Alegerea obi�nuit� este \"/dev/hda\" pentru un disc maestru principal IDE\n"
 "sau \"/dev/sda\" pentru primul disc SCSI."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1973,7 +2552,8 @@ msgstr ""
 "�n acest ultim caz �ns�, ve�i avea nevoie de un floppy de demaraj pentru\n"
 "a putea le demara!"
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1990,7 +2570,9 @@ msgid ""
 "\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."
 msgstr ""
 "Principalele op�iuni ale lui LILO �i grub sunt:\n"
@@ -2011,10 +2593,70 @@ msgstr ""
 "    * normal: selecta�i normal pentru un mod text de 80x25.\n"
 "    * <num�r>:  folosi�i modul text corespunz�tor."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+#, 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 (de la LInux LOader) �i Grub sunt gestionare de demaraj. Am�ndoi sunt\n"
+"capabili s� demareze Linux sau un alt sistem prezent �n calculator.\n"
+"�n mod normal, aceste alte sisteme de operare sunt detectate �i instalate\n"
+"corect. Dac� cumva nu e cazul, pute�i ad�uga o intrare manual �n acest\n"
+"ecran. Ave�i grij� s� alege�i parametrii cei buni.\n"
+"\n"
+"\n"
+"Pute�i de asemenea s� interzice�i accesul acestor alte sisteme a altor \n"
+"utilizatori, caz �n care ar trebui s� �terge�i intr�rile acestor sisteme.\n"
+"�n acest ultim caz �ns�, ve�i avea nevoie de un floppy de demaraj pentru\n"
+"a putea le demara!"
+
+#: ../../help.pm_.c:692
+#, 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 ""
+"Principalele op�iuni ale lui LILO �i grub sunt:\n"
+" - Periferic de boot: parametreaz� numele perifericului (e.g. o parti�ie\n"
+"a unui disc dur) care con�ine sectorul de demaraj. �n mod normal e vorba\n"
+"de \"/dev/hda\".\n"
+"\n"
+"\n"
+" - Timp de a�teptare �nainte de a demara imaginea din oficiu: Specific�\n"
+"num�rul de zecimi de secund� pentru a a�tepta �naintea demar�rii primei\n"
+"imagini. Acesta e foarte practic pentru sistemele care demareaz� de pe\n"
+"disc dur  dup� activarea tastaturii. Gestionarul de demaraj nu a�teapt�\n"
+"deloc dac� sec�iunea \"delay\" e omis� sau dac� e fixat� la zero.\n"
+"\n"
+"\n"
+" - Mod Video: Aceasta specific� modul text VGA care ar trebui selectat la\n"
+"demaraj. Urm�toarele op�iuni sunt valabile:\n"
+"    * normal: selecta�i normal pentru un mod text de 80x25.\n"
+"    * <num�r>:  folosi�i modul text corespunz�tor."
+
+#: ../../help.pm_.c:705
+#, fuzzy
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -2036,7 +2678,7 @@ msgstr ""
 "convin. Dac� nu v� convin, va pute�i �ntoarce �i s�-i schimba�i de c�te ori\n"
 "e necesar."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2044,7 +2686,7 @@ msgstr ""
 "Dac� ceva nu e �n regul� cu configura�ia X, folosi�i aceste op�iuni pentru\n"
 "a configura �n mod corect Sistemul X Windows."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2052,42 +2694,47 @@ msgstr ""
 "Dac� prefera�i s� folosi�i un login �n mod grafic, selecta�i \"Da\" �i \n"
 "\"Nu\" �n cel�lalt caz."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\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"
+"\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"\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."
 msgstr ""
 "Pute�i alege acum diferite op�iuni pentru sistemul dumneavoastr�.\n"
 "\n"
@@ -2123,7 +2770,7 @@ msgstr ""
 "demaraj selecta�i aceast� op�iune (Nota�i c� Numlock poate sau s�\n"
 "func�ioneze �n) mod grafic, X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2138,192 +2785,131 @@ msgstr ""
 "s� demara�i un alt sistem de operare existent, v� rog citi�i instruc�iunile\n"
 "adi�ionale."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Alege�i limba"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Alege�i tipul de instalare"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Detec�ia discului dur"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Configura�ie mouse"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "Alege�i tastatura"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "Instalarea fi�ierelor sistem"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Formatarea parti�iilor"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "Alege pachetele de instalat"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "Instalarea sistemului"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Configura�ie re�ea"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Criptografie"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Configura�ia zonei orare"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Configura�ia serviciilor"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Configura�ia imprimantei"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Alege�i parola pentru root"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Ad�uga�i un utilizator"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Crea�i un floppy de demaraj"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "Instala�i un gestionar de demaraj"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Configura�i X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Floppy pentru instalare automat�"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Ie�ire din instalare"
 
-#: ../../install2.pm_.c:337
-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 ""
-"Trebuie s� ave�i o parti�ie root.\n"
-"Pentru aceasta, crea�i o parti�ie (sau face�i clic pe un existent�).\n"
-"Alege�i apoi ac�iunea ``Punct de montaj'' �i fixa�i-o la '/'"
-
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Nu pot citi tabloul de parti�ii, e prea deteriorat dup� mine :(\n"
-"Voi �ncerca s� continui �terg�nd parti�iile gre�ite"
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Eroare la citirea fi�ierului $f"
 
-#: ../../install_any.pm_.c:351
-msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
-msgstr ""
-"DiskDrake a e�uat la citirea corect� a tabloului de parti�ii.\n"
-"Continua�i pe riscul dumneavoastr�!"
+#: ../../install_gtk.pm_.c:426
+#, fuzzy
+msgid "Please test the mouse"
+msgstr "V� rog, alege�i tipul de mouse?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "�n c�utarea parti�iei root"
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "V� rog, alege�i tipul de mouse?"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Informa�ie"
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
+#: ../../install_interactive.pm_.c:23
 #, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: Aceasta nu e o parti�ie root, v� rog alege�i o alta"
-
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "N'am g�sit nici o parti�ie root"
-
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Nu pot s� folosesc difuzia f�r� nici un domeniu NIS"
-
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Eroare la citirea fi�ierului $f"
-
-#: ../../install_steps.pm_.c:75
 msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
+"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
+"You can find some information about them at: %s"
 msgstr ""
-"A ap�rut o eroare pe care nu �tiu s� o interpretez �n mod corect.\n"
-"Continua�i pe riscul dumneavoastr�."
-
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Duplica�i pounctul de montaj %s"
 
-#: ../../install_steps.pm_.c:323
+#: ../../install_interactive.pm_.c:41
 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"
+"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 ""
-"C�teva pachete importante nu s-au instalat corect.\n"
-"Sau ave�i o problem� cu perifericul de cdrom sau cu \n"
-"cdrom-ul propriu-zis. Folosi�i comanda \"rpm -qpl \n"
-"Mandrake/RPMS/*.rpm\" pentru a verifica cdrom-ul pe un\n"
-"sistem instalat.\n"
-
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Bine a�i venit la %s"
-
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Nici dischet� disponibil�"
-
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
-#, c-format
-msgid "Entering step `%s'\n"
-msgstr "�ncepe etapa `%s'\n"
+"Trebuie s� ave�i o parti�ie root.\n"
+"Pentru aceasta, crea�i o parti�ie (sau face�i clic pe un existent�).\n"
+"Alege�i apoi ac�iunea ``Punct de montaj'' �i fixa�i-o la '/'"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
+#: ../../install_interactive.pm_.c:46
 msgid "You must have a swap partition"
 msgstr "Trebuie s� ave�i o parti�ie swap"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:47
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -2333,98 +2919,78 @@ msgstr ""
 "\n"
 "S� continui totu�i?"
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Alege�i m�rimea pe care vre�i s� o instala�i"
+#: ../../install_interactive.pm_.c:68
+#, fuzzy
+msgid "Use free space"
+msgstr "Folose�te pentru loopback"
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "M�rime total�: "
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Versiune: %s\n"
+#: ../../install_interactive.pm_.c:78
+#, fuzzy
+msgid "Use existing partition"
+msgstr "Formatarea parti�iilor"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "M�rime: %d KB\n"
+#: ../../install_interactive.pm_.c:80
+#, fuzzy
+msgid "There is no existing partition to use"
+msgstr "�ncercare de salvare a tabloului de parti�ii"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Alege�i pachetele pe care dori�i s� le instala�i"
+#: ../../install_interactive.pm_.c:87
+#, fuzzy
+msgid "Use the Windows partition for loopback"
+msgstr "Folose�te pentru loopback"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Ce parti�e dori�i s� folosii� pentru a instala Linux4Win?"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Instalare"
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Alege�i m�rimile"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "�n curs de instalare"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "M�rimea parti�iei root �n MB:"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Astepta�i, v� rog"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "M�rimea parti�iei swap �n MB:: "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Timp r�mas "
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Timp total "
+#: ../../install_interactive.pm_.c:105
+#, fuzzy
+msgid "Which partition do you want to resize?"
+msgstr "Ce tip de parti�ie dori�i?"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Preg�tesc instalarea"
+#: ../../install_interactive.pm_.c:107
+#, fuzzy
+msgid "Computing Windows filesystem bounds"
+msgstr "Calculeaz� salturile de fi�iere FAT"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Installing package %s"
-msgstr "Instalarea pachetului  %s"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "S� continui totu�i?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "O eroare a ap�rut la ordonarea pachetelor:"
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "S� folosesc configura�ia existent� pentru X11?"
-
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "V� rog alege�i unul din urm�toarele tipuri de instalare"
-
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Nu ave�i nici o parti�ie Windows"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Nu ave�i destul spa�iu pentru Lnx4win"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_interactive.pm_.c:113
+#, fuzzy
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
 "dangerous. If you have not already done so, you should first exit the\n"
 "installation, run scandisk under Windows (and optionally run defrag), then\n"
 "restart the installation. You should also backup your data.\n"
@@ -2439,33 +3005,155 @@ msgstr ""
 "re�ncepe�i instalarea. Ar trebui de asemenea s� face�i o copie a datelor\n"
 "dumneavoastr�. Dac� sunte�i sigur, ap�sa�i Ok."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
+#: ../../install_interactive.pm_.c:122
+#, fuzzy
+msgid "Which size do you want to keep for windows on"
+msgstr "La ce sector dori�i sa schimba�i ?"
+
+#: ../../install_interactive.pm_.c:123
+#, fuzzy, c-format
+msgid "partition %s"
+msgstr "Parti�ie"
+
+#: ../../install_interactive.pm_.c:129
+#, fuzzy, c-format
+msgid "FAT resizing failed: %s"
 msgstr "Redimensionarea automat� a e�uat"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Ce parti�e dori�i s� folosii� pentru a instala Linux4Win?"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Alege�i m�rimile"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "M�rimea parti�iei root �n MB:"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "M�rimea parti�iei swap �n MB:: "
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:156
+#, fuzzy, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr ""
+"Dup� redimensionarea parti�iei %s toate datele de pe aceasta parti�ie vor fi "
+"pierdute"
+
+#: ../../install_interactive.pm_.c:164
+#, fuzzy
+msgid "Expert mode"
+msgstr "Expert"
+
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:171
+#, fuzzy, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Pute�i parti�iona acum discul %s dumneavoastr� dur\n"
+"C�nd a�i terminat, nu uita�i s� �nregistra�i folosind `w'"
+
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Nu ave�i nici o parti�ie Windows"
+
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Imposibil de ad�ugat o alta parti�ie"
+
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:218
+#, fuzzy, c-format
+msgid "Partitioning failed: %s"
+msgstr "Tipul tabloul de parti�ii : %s\n"
+
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Configura�ie re�ea"
+
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Oprire re�ea"
+
+#: ../../install_steps.pm_.c:74
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
+"A ap�rut o eroare pe care nu �tiu s� o interpretez �n mod corect.\n"
+"Continua�i pe riscul dumneavoastr�."
+
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Duplica�i pounctul de montaj %s"
+
+#: ../../install_steps.pm_.c:375
+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 ""
+"C�teva pachete importante nu s-au instalat corect.\n"
+"Sau ave�i o problem� cu perifericul de cdrom sau cu \n"
+"cdrom-ul propriu-zis. Folosi�i comanda \"rpm -qpl \n"
+"Mandrake/RPMS/*.rpm\" pentru a verifica cdrom-ul pe un\n"
+"sistem instalat.\n"
+
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Bine a�i venit la %s"
+
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Nici dischet� disponibil�"
+
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "�ncepe etapa `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "V� rog alege�i unul din urm�toarele tipuri de instalare"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "M�rimea total� a grupurilor selectate e �n jur de %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2479,7 +3167,7 @@ msgstr ""
 "Un procent slab va instala numai pachetele cele mai inmportante;\n"
 "un procent de 100% va instala toate pachetele selectate."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2496,58 +3184,100 @@ msgstr ""
 "Un procent slab nu va installa dec�t pachetele cele mai importante;\n"
 "un procent de %d%% va instala c�t de multe pachete va fi posibil."
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "Ve�i putea s� le alege�i mai �n detaliu la etapa urm�toare."
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Procentul pachetelor de instalat"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Alege�i pachetele pe care dori�i s� le instala�i"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Instalare"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Dependen�e automate"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Expanda�i Arborele"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "�nchide�i Arborele"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Bascula�i �ntre plat �i triere �n func�ie de grup"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Pachet defectuos"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nume: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versiune: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "M�rime: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Importan��: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "M�rime total�: %d / %d MB "
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr "Nu ave�i destul spa�iu pentru a instala acest pachet"
+
+#: ../../install_steps_gtk.pm_.c:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "Pachetele urm�toare urmeaz� s� fie dezinstalate"
+
+#: ../../install_steps_gtk.pm_.c:387
+#, fuzzy
+msgid "The following packages are going to be removed"
+msgstr "Urm�toare pachete vor fi instalate/�terse"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Nu pute�i selecta/deselecta acest pachet"
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Acesta este un pachet indispensabil �i nu poate fi deselectat"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "Nu pute�i deselecta aces pachet. E deja instalat"
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2555,44 +3285,89 @@ msgstr ""
 "Acest pachet trebuie actualizat\n"
 "Sunte�i sigur c� dori�i s�-l deselecta�i ?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Nu pute�i deselecta acest pachet. Trebuie acualizat."
 
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr "Nu ave�i destul spa�iu pentru a instala acest pachet"
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Urm�toare pachete vor fi instalate/�terse"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "Nu pute�i selecta/deselecta acest pachet"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "�n curs de instalare"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Estimare"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Astepta�i, v� rog"
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Timp r�mas "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Timp total "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Anuleaz�"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Preg�tesc instalarea"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pachete"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Instalarea pachetului  %s"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Accept"
+msgstr "Acceptare utilizator"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2607,184 +3382,388 @@ msgstr ""
 "Dac� nu-l ave�i, ap�sa�i Anuleaz� pentru a evita instalarea de pe acest "
 "Cd-Rom."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Redimensioneaz�"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "S� continui totu�i?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "O eroare a ap�rut la ordonarea pachetelor:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "A fost o eroare la instalarea pachetelor:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "A ap�rut o eroare"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "V� rog, alege�i o limb�."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Tastatur�"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Alege�i tastatura."
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr "Pute�i s� alege�i alte limbi care vor fi disponibile dup� instalare"
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "Parti�ia Root"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "Care e parti�ia root (/) a sistemului dumneavoastr�?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Tip de instalare"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Ce tip de instalare dori�i?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "Instalare/Actualizare"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "Este vorba de o instalare sau de o actualizare ?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Automatizat"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "Recomandat"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Personalizat"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Expert"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
+#, fuzzy
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "Sunte�i sigur ca sunte�i un expert?\n"
 "Ei, nu-i glum�, ve�i putea face lucruri serioase dar periculoase aici."
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Actualizare"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Normal"
+#: ../../install_steps_interactive.pm_.c:222
+#, fuzzy
+msgid "Workstation"
+msgstr "Informa�ie"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "Programator"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Server"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+#, fuzzy
+msgid "What is your system used for?"
 msgstr "Care e folosin�a sistemului dumneavoastr�?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "V� rog, alege�i tipul de mouse?"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Port Mouse"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Pe ce port serie este conectat mouse-ul?"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Configura�ie cartele PCMCIA..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "Configura�ia IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "nici o parti�ie disponibil�"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "V� rog alege�i o parti�ie pentru a o folosi ca parti�ie root?."
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Alege�i punctele de montaj"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, fuzzy, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Nu pot citi tabloul de parti�ii, e prea deteriorat dup� mine :(\n"
+"Voi �ncerca s� continui �terg�nd parti�iile gre�ite"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake a e�uat la citirea corect� a tabloului de parti�ii.\n"
+"Continua�i pe riscul dumneavoastr�!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Parti�ia Root"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "Care e parti�ia root (/) a sistemului dumneavoastr�?"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "Trebuie s� redemara�i pentru a �nregistra modific�rile tabloului de parti�ii"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "Alege�i parti�iile pe care dori�i sa le formata�i"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "S� verific blocurile defectuoase?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Formatarea parti�iilor"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Crearea �i formatarea fi�ierului %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Swap insuficient pentru a termina instalarea, mai ad�uga�i ceva"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "C�utarea pachetelor disponibile"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "Cautarea pachetelor de actualizat"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, fuzzy, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 "Sistemul dumneavoastr� nu ar destul spa�iu disponibil pentru instalare\n"
 "sau actualizare"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Complete (%dMB)"
+msgstr "Normal"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Minimum (%dMB)"
+msgstr "(%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Recommended (%dMB)"
+msgstr "Recomandat"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "Personalizat"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Alege�i m�rimea pe care vre�i s� o instala�i"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "Selectarea grupurilor de pachete"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Selectare individual� a pachetelor"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2795,12 +3774,12 @@ msgstr ""
 "Dac� nu v� lispsesc dec�t c�teva CD-uri, deselecta�i-le �i face�i click pe "
 "Ok."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom etichetat \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2808,173 +3787,11 @@ msgstr ""
 "instalarea pachetului %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Configura�ie post-install"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Pastra�i configura�ia IP curent�"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Reconfigura�i re�eaua"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Nu configura�i re�eaua"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Configura�ia re�elei"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Re�eaua LAN a fost deja configurat�. Dori�i s� :"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "Dori�i sa configura�i re�eaua LAN pentru sistemul dumneavoastr�?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "n'am g�sit nici o carte de re�ea"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Configura�ie modem"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "Dori�i sa configura�i o conexiune telefonic� prin modem?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Configura�ia c�r�ii de re�ea %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"V� rog intra�i configura�ia IP pentru acest calculator.\n"
-"Fiecare rubrica va trebui sa fie completat� ca o adres� IP �n format\n"
-"zecimal-punctat (de exemplu 192.168.1.55)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "IP automat"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "Adres� IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Masc� de re�ea:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "Adresa IP ar trebui s� fie �n formatul 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Configura�ie re�ea"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"V� rog intra�i numele calculatorului.\n"
-"Numele calculatorului ar trebui s� fie un nume �ntreg-calificat,\n"
-"ca de exemplu ``calculatorulmeu.laboratorulmeu.�ntreprindereamea.com''.\n"
-"Pute�i de asemenea intra adresa IP a pasarelei dac� ave�i una"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "Server DNS:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Periferic pasarel�:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Pasarel�"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "Numele calculatorului:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "S� caut un modem?"
-
-#: ../../install_steps_interactive.pm_.c:521
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Pe ce port serial este conectat modemul dumneavoastr�?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Op�uni de telefonie"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Nume de conexiune"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Num�r de telefon"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "ID de login"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Autentificare"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Bazat-pe-un-script"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Bazat-pe-un-terminal"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "Nume de domeniu"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Primul server DNS"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Al doilea server DNS"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3041,89 +3858,95 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "Alege�i o oglind� de la care s� recupera�i pachetele"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Contactarea oglinzii pentru recuperarea pachetelor disponibile"
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "V� rog alege�i pachetele pe care dori�i s� le instala�i"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
+#, fuzzy
 msgid "Which is your timezone?"
-msgstr "Care e zona dumneavoastr� orar�?"
+msgstr "Care e folosin�a sistemului dumneavoastr�?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "Ceasul dumneavoastr� hardware e fixat la GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "Ce tip de parti�ie dori�i?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Nici o parol�"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Folose�te un fi�ier shadow"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Folose�te parole MD5"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Folose�te NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "Pagini galbene"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 "Aceast� parole e prea simpl� (ar trebui s� fie de cel pu�in %d caractere)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "Autentificare NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "Domeniu NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "Server NIS"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Acceptare utilizator"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Ad�uga�i un utilizator"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(deja ad�ugat %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3133,37 +3956,37 @@ msgstr ""
 "Intra�i un utilizator\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Nume real"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Numele utilizatorului"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Icoan�"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Aceasta parol� e prea simpl�"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Va rog �nscrie�i numele utilizatorului"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -3171,24 +3994,51 @@ msgstr ""
 "Numele utilizatorului trebuie sa con�in� numai caractere minuscule, numere, "
 "`-' �i `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Acest nume de utilizator e deja ad�ugat"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+#, fuzzy
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"O dischet� personalizat� de demaraj permite un mod de a accede la sistemul\n"
+"vostru Linux f�r� a depinde de gestionarul de demaraj normal. Acesta este \n"
+"util dac� nu dori�i s� instala�i LILO (sau grub) �n sistem sau dac� alte \n"
+"sisteme �terg LILO sau dac� LILO nu func�ioneaz� �n sistemul dumneavoastr�.\n"
+"O dischet� personalizat� poate fi de asemena folosit� ca o imagine de\n"
+"depanaj, ceea ce permite recuper�ri mult mai u�oare �n urm� unor pane "
+"severe.\n"
+"Dori�i s� crea�i o dischet� de demaraj pentru sistemul dumneavoastr� ?"
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "Primul periferic de dichet�"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Al doilea periferic de dischet�"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Sari peste"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3210,65 +4060,34 @@ msgstr ""
 "severe.\n"
 "Dori�i s� crea�i o dischet� de demaraj pentru sistemul dumneavoastr� ?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "�mi pare r�u dar nu g�sesc nici un periferic de dischet� disponibil."
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 "Alege�i perifericul pe care-l dori�i pentru a realiza un disc de demaraj."
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Introduce�i o dischet� �n perifericul %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Crearea dischetei de demaraj"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "Instalarea lui LILO a e�uat. Urm�toarea eroare a ap�rut:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Vre�i s� folosi�i SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "Op�inunile principale ale lui SILO"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"Iat� urm�toarele intr�ri din SILO.\n"
-"Pute�i ad�uga mai multe sau schimba cele existente."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Parti�ie"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Aceast� etichet� e deja utilizat�"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "Instalarea lui SILO a e�uat. Urm�toarea eroare a ap�rut:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Peg�tirea gestionalului de demaraj"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
+#, fuzzy
 msgid "Do you want to use aboot?"
-msgstr "Doriti s� folosi�i aboot?"
+msgstr "Vre�i s� folosi�i SILO?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3276,127 +4095,114 @@ msgstr ""
 "Eroare la instalrea lui aboot,\n"
 "s� �ncerc s� for�a�i instalarea chiar dac� aceasta distruge prima parti�ie ?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "Configura�ie proxy"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy-ul ar trebui s� fie http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy-ul ar trebui s� fie ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+#, fuzzy
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "Instalarea lui LILO a e�uat. Urm�toarea eroare a ap�rut:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Bun venit Pira�ilor"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Slab"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Sc�zut"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Mediu"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Ridicat"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoiac"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "�ntreb�ri diverse"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(poate cauza deteriorarea datelor)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Sa folosesc optimiz�rile penrtu disc dur?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Alege�i nivelul de securitate"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Precizeaz� cantintatea de  RAM dac� e necesar (am g�sit %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Automontare automat� a perifericelor extractibile"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Cur��� /tmp la fiecare demaraj"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Activeaz� profilurile multiple"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Activeaz� num lock la demaraj"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Introduce�i cantintatea de RAM �n MB"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "Nu pot s� folosesc supermount �n nivelul de securitate ridicat"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX va genera fi�ierele de configura�ie pentru XFree 3.3 �i pentru \n"
-"XFree 4.0.\n"
-"Din oficiu, folosim versiunea 3.3 a server-ului pentru c� func�ioneaz�\n"
-"cu mai multe c�r�i grafice.\n"
-"\n"
-"Dori�i s� folosi�i XFree 4.0 ?"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "S� �ncerc s� g�sesc periferice PCI?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "S� folosesc configura�ia existent� pentru X11?"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr "Dori�i s� crea�i un floppy pentru o instalare automat� de replicare?"
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Introduce�i uo dischet� goal� �n perifericul %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Creati discheta de autoinstalare"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3406,7 +4212,7 @@ msgstr ""
 "\n"
 "Chiar vre�i s� termina�i acum?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3429,153 +4235,18 @@ msgstr ""
 "capitolul referitor la post instalare din \n"
 "Oficial Linux Mandrake User's Guide."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Oprire"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Instalarea pilotului pentru %s cartea %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(modul %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Care %s pilot s� �ncerc?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"�n anumite cazuri, pilotul %s necesit� informa�ii suplimentare pentru a\n"
-"func�iona corect, dar func�ioneaz� bine �i f�r�. Dori�i s� specifica�i\n"
-"op�iuni suplimentare sau �i permite�i s� interogheze calculatorul pentru\n"
-"informa�iile necesare? Ocazional, interogarea poate bloca calculatorul,\n"
-"dar n-ar trebui s� produce nici o deteriorare."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Autoprobeaz�"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Specifica�i op�iunile"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Pute�i furniza acum op�iunile modulului %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Pute�i furniza acum op�iunile modulului %s.\n"
-"Op�iunile sunt �n formatul ``nume=valoare nume2=valoare2 ...''.\n"
-"de exemplu, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Op�iuni pentru module:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"�nc�carea modulului %s a e�uat.\n"
-"Dori�i s��ncerca�i cu al�i parametri ?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "S� �ncerc s� g�sesc cartelele PCMCIA?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Configura�ie cartele PCMCIA..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "S� �ncerc s� g�sesc periferice %s?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Am g�sit interfa�ele %s %s"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "Ave�i o alt� interfa�a?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Ave�i vreo interfa�� %s ?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Nu"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Da"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Vezi info hardware"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Configura�ie re�ea"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Oprire re�ea"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Instalare Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 " <Tab>/<Alt-Tab> �ntre elemente | <Space> selecteaz� | <F12> urm�torul ecran"
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"Pute�i parti�iona acum discul %s dumneavoastr� dur\n"
-"C�nd a�i terminat, nu uita�i s� �nregistra�i folosind `w'"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Pu�intic� r�bdare"
 
@@ -3585,7 +4256,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Ambiguitate (%s), fi�i mai precis\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Alegere gre�it�, �ncerca�i din nou\n"
 
@@ -3599,447 +4270,969 @@ msgstr " ? (din oficiu %s) "
 msgid "Your choice? (default %s) "
 msgstr "Ce alege�i? (din oficiu %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Ce alege�i ? (din oficiu %s  enter `niciuna' pentru niciuna) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "Ceh"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "German"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "Spaniol"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "Finlandez"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Francez"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "Norvegian"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Polonez"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Rus"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "Tastatura UK"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "Tastatura US"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Armenian (vechi)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Armenian (ma�in� de scris)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Armenian (fonetic)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belgian"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulgar"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazilian (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "Bielorus"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "Elve�ian (dispozi�ie german�)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "Elve�ian (dispozi�ie francez�)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "German (f�ra taste moarte)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "Danez"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+#, fuzzy
+msgid "Dvorak (US)"
+msgstr "Dvorak"
+
+#: ../../keyboard.pm_.c:139
+#, fuzzy
+msgid "Dvorak (Norwegian)"
+msgstr "Norvegian"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Estonian"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgian (dispozi�ie \"Rus�\")"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgian (dispozi�ie \"Latin�\")"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Grec"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Ungar"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Croat"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Izraelian"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Izraelian (fonetic)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+#, fuzzy
+msgid "Iranian"
+msgstr "Ukrainian"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islandez"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Italian"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Latin American"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Olandez"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lituanian AZERTY (vechi)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lituanian AZERTY (nou)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lituanian QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lithuanian \"fonetic\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Polonez (dispozi�ie qwerty)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Polonez (dispozi�ie qwertz)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portughez"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Canadian (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "us (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "Suedez"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Sloven"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slovac"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Tastatur� Thai"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turc (tradi�ional model \"F\")"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turc (model \"Q\" modern)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukrainian"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "Tastatur� US (interna�ional)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+#, fuzzy
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Lituanian QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Iugoslav (dispozi�ie latin�)"
 
-# 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.
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Mouse - Sun"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Generic"
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "nivel"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "serie"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr "Mouse generic cu 2 butoane"
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "Mouse generic cu 3 butoane"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (serie, tip vechi C7)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "F�r� mouse"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "nici unul"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "F�r� mouse"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "E corect ?"
+
+#: ../../netconnect.pm_.c:93
+#, fuzzy
+msgid "Internet configuration"
+msgstr "Configura�ie proxy"
+
+#: ../../netconnect.pm_.c:94
+#, fuzzy
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Dori�i s� testa�i configura�ia ?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Configura�ie re�ea"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Pe ce disc dori�i s� schimba�i ?"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Nume de conexiune"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+#, fuzzy
+msgid "ISDN Configuration"
+msgstr "Configura�ie"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "Configura�ie proxy"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr ""
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr ""
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr ""
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:169
+#, fuzzy
+msgid "Provider phone number"
+msgstr "Num�r de telefon"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr ""
+
+#: ../../netconnect.pm_.c:172
+#, fuzzy
+msgid "Dialing mode"
+msgstr "Nume de domeniu"
+
+#: ../../netconnect.pm_.c:174
+#, fuzzy
+msgid "Account Login (user name)"
+msgstr "Punct de montaj"
+
+#: ../../netconnect.pm_.c:175
+#, fuzzy
+msgid "Account Password"
+msgstr "Parola"
+
+#: ../../netconnect.pm_.c:176
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Parola"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "Test de configura�ie"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:214
+#, fuzzy
+msgid "Which protocol do you want to use ?"
+msgstr "Ce tip de parti�ie dori�i?"
+
+#: ../../netconnect.pm_.c:224
+#, fuzzy
+msgid "ISA / PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+#, fuzzy
+msgid "PCI"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr ""
+
+#: ../../netconnect.pm_.c:233
+#, fuzzy
+msgid "What kind of card do you have?"
+msgstr "Ce tip de imprimanta ave�i?"
+
+#: ../../netconnect.pm_.c:239
+#, fuzzy
+msgid "Continue"
+msgstr "Continua�i totu�i?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr ""
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:257
+#, fuzzy
+msgid "Which is your ISDN card ?"
+msgstr "Care e zona dumneavoastr� orar�?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:287
+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 ""
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr ""
+
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "Alege�i noua m�rime"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Pe ce port serie este conectat mouse-ul?"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
+"Do you agree?"
 msgstr ""
-"Bun venit la gestionarul de sisteme de operare LILO!\n"
-"Pentru a lista posibilit��ile, ap�sa�i <TAB>.\n"
+
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Dori�i s� testa�i configura�ia ?"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "Configura�ie"
+
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "Doriti s� folosi�i aboot?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "S� caut un modem?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Pe ce port serial este conectat modemul dumneavoastr�?"
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "Op�uni de telefonie"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Nume de conexiune"
+
+#: ../../netconnect.pm_.c:546
+#, fuzzy
+msgid "Phone number"
+msgstr "Num�r de telefon"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "ID de login"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Autentificare"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Bazat-pe-un-script"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Bazat-pe-un-terminal"
+
+#: ../../netconnect.pm_.c:550
+#, fuzzy
+msgid "Domain name"
+msgstr "Nume de conexiune"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Primul server DNS"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Al doilea server DNS"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
 "\n"
-"Pentru a lansa unul dintre ele, scrie�ii numele �i ap�sa�i <ENTER> sau\n"
-"a�tepta�i %d secunde pentru demararea din oficiu.\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Nume de conexiune"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
 "\n"
+"You can reconfigure your connection."
+msgstr "Configura�ie re�ea"
 
-# 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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Bun venit la gestionarul de sisteme de operare GRUB!"
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Pe ce disc dori�i s� schimba�i ?"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "Folosi�i tastele %c �i %c pentru selectarea intr�rii puse �n eviden��."
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Ap�sa�i enter pentru a demara OS-ul selectat, 'e' pentru a edita"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Pe ce disc dori�i s� schimba�i ?"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "comandele �nainte de a demara, sau 'c' pentru linia de comand�."
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Nume de conexiune"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Intrarea selectat� va demara dup� %d secunde"
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Nume de conexiune"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "nu e destul spa�iu �n /boot"
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Configura�ie re�ea"
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Desktop"
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "Selecta�i Conexiunea de imprimant�"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "Meniu de Start"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr ""
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Mouse - Sun"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Configura�ie re�ea"
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Mouse Apple ADB"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Configura�ie re�ea"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Mouse Apple ADB (2 Butoane)"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr ""
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Mouse Apple ADB (3+ Butoane)"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Expert"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Mouse Apple USB"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+#, fuzzy
+msgid "Connect to the Internet"
+msgstr "Nume de conexiune"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Mouse Apple USB (2 Butoane)"
+#: ../../netconnect.pm_.c:672
+#, fuzzy
+msgid "What kind is your ISDN connection?"
+msgstr "La ce port serial este conectat mouse-ul?"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Mouse Apple USB (3+ Butoane)"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Configura�ie re�ea"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Mouse PS/2 generic"
+#: ../../netconnect.pm_.c:700
+#, fuzzy
+msgid "France"
+msgstr "Anuleaz�"
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Mouse generic PS/2 cu 3 butoane"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr ""
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr ""
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "Expert"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Configura�ie re�ea"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Ce tip de parti�ie dori�i?"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "Mouse ATI Bus"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Configura�ie re�ea"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Mouse Microsoft Bus"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "Configura�ie re�ea"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Mouse Logitech Bus"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Configura�ia re�elei"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "Mouse USB"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Dori�i s� testa�i configura�ia ?"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "Mouse USB (3 butoane sau mai multe)"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "Configura�ie re�ea"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "F�r� mouse"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Nume de conexiune"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A sau mai mult (serie)"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "Re�eaua LAN a fost deja configurat�. Dori�i s� :"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (serie)"
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "Pe ce disc dori�i s� schimba�i ?"
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (serie)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Configura�ia re�elei"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (serie)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (serie)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "n'am g�sit nici o carte de re�ea"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (serie)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Configura�ie re�ea"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (serie)"
+#: ../../network.pm_.c:274
+#, fuzzy
+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 ""
+"V� rog intra�i numele calculatorului.\n"
+"Numele calculatorului ar trebui s� fie un nume �ntreg-calificat,\n"
+"ca de exemplu ``calculatorulmeu.laboratorulmeu.�ntreprindereamea.com''.\n"
+"Pute�i de asemenea intra adresa IP a pasarelei dac� ave�i una"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (serie)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+#, fuzzy
+msgid "Host name"
+msgstr "Numele calculatorului:"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (serie, tip vechi C7)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (serie)"
+#: ../../network.pm_.c:302
+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 ""
+"V� rog intra�i configura�ia IP pentru acest calculator.\n"
+"Fiecare rubrica va trebui sa fie completat� ca o adres� IP �n format\n"
+"zecimal-punctat (de exemplu 192.168.1.55)."
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Mouse serie generic"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Configura�ia c�r�ii de re�ea %s"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Mouse Microsoft compatibil (serie)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "IP automat"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Mouse serie generic cu 3 butoane"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "IP address"
+msgstr "Adres� IP"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (serie)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Netmask"
+msgstr "Masc� de re�ea:"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "E corect ?"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "Adresa IP ar trebui s� fie �n formatul 1.2.3.4"
+
+#: ../../network.pm_.c:341
+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 ""
+"V� rog intra�i numele calculatorului.\n"
+"Numele calculatorului ar trebui s� fie un nume �ntreg-calificat,\n"
+"ca de exemplu ``calculatorulmeu.laboratorulmeu.�ntreprindereamea.com''.\n"
+"Pute�i de asemenea intra adresa IP a pasarelei dac� ave�i una"
+
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "Server DNS:"
+
+#: ../../network.pm_.c:347
+#, fuzzy
+msgid "Gateway"
+msgstr "Pasarel�"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "Periferic pasarel�:"
+
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Configura�ie post-install"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy-ul ar trebui s� fie http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy-ul ar trebui s� fie ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr "Parti�iile extended nu sunt suportatet pe aceast� platform� "
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -4049,21 +5242,21 @@ msgstr ""
 "Singura solu�ie e s� deplasa�i parti�ia principal� pentru a avea gaura "
 "l�ng�parti�ia extins�"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "Eroare la citirea fi�ierului %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Restaurarea din fi�ierul %s a e�uat: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Backup defectuos"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Eroare la scrierea �n fi�ierul %s"
@@ -4097,42 +5290,56 @@ msgstr "Interesant"
 msgid "maybe"
 msgstr "poate"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (important)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (foarte simpatic)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (simpatic)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Afi�a�i mai pu�in"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Afi�a�i mai mult"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Imprimant� local�"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+#, fuzzy
+msgid "Remote printer"
+msgstr "Op�iuni pentru imprimanta lpd distant�"
+
+#: ../../printer.pm_.c:21
+#, fuzzy
+msgid "Remote CUPS server"
+msgstr "Coad� distant�:"
+
+#: ../../printer.pm_.c:22
+#, fuzzy
+msgid "Remote lpd server"
 msgstr "lpd distant:"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "Op�iunea imprimantei NetWare"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Periferic imprimant�:"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Detec�ia perifericelor..."
@@ -4146,11 +5353,11 @@ msgstr "Test porturi"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "O imprimant�, modelul \"%s\", a fost detact� �n"
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Periferic local de imprimant�"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4158,15 +5365,15 @@ msgstr ""
 "La ce periferic a�i conectat imprimanta  \n"
 "(nota�i c� /dev/lp0 e echivalent cu LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Periferic imprimant�:"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Op�iuni pentru imprimanta lpd distant�"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4175,19 +5382,19 @@ msgstr ""
 "pentru a folosi a coad� de impresie lpd distant�, ave�i nevoie s� furniza�i\n"
 "numele calculatorului serverului de imprimant� �i lista de a�teptare"
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "Numele calculator distant"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Coad� distant�:"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Op�iuni pentru imprimanta SMB/Windows 95/NT"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4201,27 +5408,27 @@ msgstr ""
 "numele de access �i numele de utilizator, parola �i informa�ia grupului de "
 "lucru."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "Numele serverului SMB"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "Adresa IP a serverului SMB"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "Numele de access"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Numele de grup"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "Op�iunea imprimantei NetWare"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4233,130 +5440,155 @@ msgstr ""
 "c�t �i numele listei de a�teptare �i eventual utilizatorii care vor avea\n"
 "access �i parolele."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Server de imprimant�"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "Lista de a�teptare a imprimantei"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "Op�iunea imprimantei NetWare"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "Op�iuni imprimant�"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "Slab"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Ce tip de imprimanta ave�i?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "Dori�i s� testa�i imprimarea ?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Imprimarea pagin(ei/lor) de test"
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"Pagin(a/ile) de test a/au fost trimis� la procesul de impresie.\n"
+"Aceasta va dura pu�in timp �naintea pornirii imprim�rii\n"
+"Starea Imprim�rii:\n"
+"%s\n"
+"\n"
+"Func�ioneaz� cum trebuie?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"Pagin(a/ile) de test a/au fost trimis� la procesul de impresie.\n"
+"Aceasta va dura pu�in timp �naintea pornirii imprim�rii\n"
+"Func�ioneaz� cum trebuie?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "Da, imprim� o pagin� de test ASCII"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "Da, imprim� o pagina de test Postscript"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "Da, imprim� am�ndou� paginile de test"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Configura�ia imprimantei"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Ce tip de imprimanta ave�i?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Op�iuni imprimant�"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "M�rimea h�rtiei"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Ejectarea paginei dup� lucru?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Op�iuni pilot Uniprint"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Op�iuni pentru culori:"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Imprim� text ca Postscript"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "incerseaz� ordinea paginilor"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Repar� efectul de scar� al textului"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Num�r de pagini"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Marginile Dreapta/St�nga �n puncte (1/72 inci)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Marginile Sus/Jos �n puncte (1/72 inci)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "Op�iuni Gostscript suplimentare"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "Op�inuni Text suplimentare"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Dori�i s� testa�i imprimarea ?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Imprimarea pagin(ei/lor) de test"
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"Pagin(a/ile) de test a/au fost trimis� la procesul de impresie.\n"
-"Aceasta va dura pu�in timp �naintea pornirii imprim�rii\n"
-"Starea Imprim�rii:\n"
-"%s\n"
-"\n"
-"Func�ioneaz� cum trebuie?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"Pagin(a/ile) de test a/au fost trimis� la procesul de impresie.\n"
-"Aceasta va dura pu�in timp �naintea pornirii imprim�rii\n"
-"Func�ioneaz� cum trebuie?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Imprimant�"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "Dori�i s� configura�i o imprimant�?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4364,19 +5596,69 @@ msgstr ""
 "Iat� urm�toarele cozi de imprimare\n"
 "Pute�i s� ad�uga�i altele sau s� modifica�i cele existente."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "Estimare"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Selecta�i Conexiunea de imprimant�"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Cum e conectat� imprimanta ?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+#, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "Selecta�i Conexiunea de imprimant�"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "�terge coada"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+#, fuzzy
+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 ""
+"Fiecare coad� (la care activit��ile de imprimare sunt trimise) are nevoie\n"
+"de un nume (adesea lp) �i de un directoriu de spool asociat. Ce nume\n"
+"�i directoriu dori�i s� utiliza�i pentru aceast� coad� �i cum e "
+"conectat�imprimanta?"
+
+#: ../../printerdrake.pm_.c:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "Imprimant� local�"
+
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "Specifica�i op�iunile"
+
+#: ../../printerdrake.pm_.c:406
+#, fuzzy
+msgid "Location"
+msgstr "Informa�ie"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4388,45 +5670,45 @@ msgstr ""
 "�i directoriu dori�i s� utiliza�i pentru aceast� coad� �i cum e "
 "conectat�imprimanta?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Numele cozii:"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Dosar de Spool:"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Selecta�i Conexiunea de imprimant�"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Nu pot ad�uga parti�ia la md%d _formatat_RAID"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Nu pot scrie fi�ierul $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid a e�uat"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid a e�uat (poate v� lipsesc raidtools?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Nu ave�i destule parti�ii pentru nivelul RAID %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron un orar de comand� periodic�"
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4435,7 +5717,7 @@ msgstr ""
 "Poate de asemenea fi folosit pentru oprirea calculatorului dac� bateria e\n"
 "slab�."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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."
@@ -4444,7 +5726,7 @@ msgstr ""
 "demararea lui at �i lanseaz� comenzi batch atunci c�nd media de �nc�rcare\n"
 "e suficient de sc�zut�."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 "
@@ -4457,7 +5739,7 @@ msgstr ""
 "�i\n"
 "op�iuni de configura�ie mai avansate."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4468,7 +5750,7 @@ msgstr ""
 "El permite de asemenea opera�ii cu mouse-ul de copiere/lipire �i include\n"
 "suportul meniurilor contextuale �n consol�."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4476,7 +5758,7 @@ msgstr ""
 "Apache e un server World Wide Web. E folosit pentru a servi fi�iere HTML\n"
 "�i CGI."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4489,7 +5771,7 @@ msgstr ""
 "de servicii, incluz�nd telnet, ftp, rsh �i rlogin. Dezactivarea lui telnet\n"
 "dezactiveaz� toate serviciile de care e responsabil."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4499,7 +5781,7 @@ msgstr ""
 "/etc/sysconfig/keyboard. Aceasta poate fi selectat� folosind kbdconfig.\n"
 "Ar trebuie s�-l l�sa�i activat pentru majoritatea calculatoarelor."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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)."
@@ -4507,7 +5789,7 @@ msgstr ""
 "lpd este procesul de imprimare necesar pentru ca lpr s� func�ioneze corect.\n"
 "E un server care arbitreaz� activitatea imprimantei(lor)."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4515,7 +5797,7 @@ msgstr ""
 "named (BIND) e un Server de Nume de Domeniu (DNS) care e folosit la\n"
 "rezolvarea adreselor IP."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4524,7 +5806,7 @@ msgstr ""
 "Re�ea\n"
 "(NFS), SMB (LanManager/Windows �i NCP (NetWare)."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4532,7 +5814,7 @@ msgstr ""
 "Activeaz�/Dezactiveaz� toate interfe�ele de re�ea configurate pentru fi\n"
 "ini�ializate la demaraj."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4542,7 +5824,7 @@ msgstr ""
 "TCP/IP. Acest serviciu furnizeaz� func�ionalitatea server-ului NFS, care e\n"
 "configurat� via fi�ierului /etc/exports."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4550,7 +5832,7 @@ msgstr ""
 "NFS e un protocol popular pentru a �mp�r�i fi�iere de-a lungul re�elelor\n"
 "TCP/IP. Acest serviciu furnizeaz� func�ionalitatea bloc�rii fi�ierelor NFS."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4561,7 +5843,7 @@ msgstr ""
 "laptop-uri. Nu va demara dec�t dac� e configurat deci nu e nici o problem�\n"
 "dac� e instalat pe calculatoare care nu au nevoie de acesta."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4573,7 +5855,7 @@ msgstr ""
 "ca NFS �i NIS. Server-ul portmap trebuie demarat pe calculatoare care \n"
 "func�ioneaz� ca servere pentru protocoluri care folosesc mecanismul RPC."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4581,7 +5863,7 @@ msgstr ""
 "Postfix est un Agent de Transport de Mail (MTA), care e programul care\n"
 "permite deplasarea mail-ului de la un calculator la altul."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4589,7 +5871,7 @@ msgstr ""
 "Salveaz� �i restaureaz� entropia sistemului pentru o mai mare calitate\n"
 "a gener�rii de numere aleatoare."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4600,7 +5882,7 @@ msgstr ""
 " protocolului RIP. �n timp de RIP este folosit pentru re�ele mici,\n"
 "alte protocoluri mai complexe sunt folosite pentru re�ele mai complexe."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4608,7 +5890,7 @@ msgstr ""
 "Protocolul rstat permite utilizatorilor unei re�ele s� recupereze\n"
 "performan�ele metrice de la orice calculator de pe re�ea."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4616,7 +5898,7 @@ msgstr ""
 "'Protocolul rusers permite utilizatorilor unei re�ele s� identifice\n"
 "cine e conectat la calculatoarele care au r�spuns."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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)."
@@ -4625,7 +5907,7 @@ msgstr ""
 "utilizatorului conecta�i la un calculator care folose�te procesul rwho\n"
 "(similar cu finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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."
@@ -4634,57 +5916,204 @@ msgstr ""
 "mesaje de log �n numeroaselor fi�iere de log ale sistemului. E o idee\n"
 "bun� s� demara�i �ntotdeauna syslog."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr ""
 "Acest script de demaraj �ncearc� s� �ncarce modulele pentru mouse-ul\n"
 "dumneavoastr� usb."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
 "Demareaz� �i opre�te Server-ul de caractere X la demararea �i\n"
 "oprirea calculatorului."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Alege�i ce servici dori�i s� fie lansate automat la demaraj"
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Bun venit la gestionarul de sisteme de operare SILO!\n"
-"\n"
-"Pentru a afi�a diferitele posibilit��i, ap�sa�i <TAB>.\n"
-"\n"
-"Pentru a demara unul dintre ele, scrie�i-i numele �i ap�sa�i <ENTER> sau\n"
-"a�tepta�i %d secunde pentru demararea din oficiu.\n"
-"\n"
+"Nu pot citi tabloul de parti�ii, e prea deteriorat dup� mine :(\n"
+"Voi �ncerca s� continui �terg�nd parti�iile gre�ite"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Configura�ie LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Crea�i o dischet� de demaraj"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Formateaz� dischet�"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Alegere "
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "Instalarea lui LILO a e�uat. Urm�toarea eroare a ap�rut:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Tabel"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Configura�i X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Tabel"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+#, fuzzy
+msgid "Internet Connection Sharing"
+msgstr "Selecta�i Conexiunea de imprimant�"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "Nume de domeniu"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "Citirea configura�iei"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Configura�ia IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Felicit�ri!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4748,23 +6177,36 @@ msgstr "Alegerea nivelului de securitate"
 msgid "Choose the tool you want to use"
 msgstr "Alege�i unealta pe care dori�i s� o folosi�i"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Care e dispozi�ia tastaturii?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Alege�i o alt� rezolu�ie"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Ce tip de mouse ave�i?"
+#: ../../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 ""
+"Schimba�i Cd-Rom-ul!\n"
+"\n"
+"V� rog introduce�i Cd-Rom etichetat \"%s\" �i apoi ap�sa�i Ok.\n"
+"Dac� nu-l ave�i, ap�sa�i Anuleaz� pentru a evita instalarea de pe acest "
+"Cd-Rom."
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
+
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "n'am g�sit nici un serie_usb\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Emulare 3 Butoane?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "La ce port serial este conectat mouse-ul?"
 
@@ -4977,6 +6419,818 @@ msgstr "C�utare de foi"
 msgid "Finding leaves takes some time"
 msgstr "G�sirea foilor ia ceva timp"
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Configura�ie proxy"
+
+#, fuzzy
+msgid "Internet"
+msgstr "Interesant"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Birou"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multimedia"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multimedia"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Documenta�ie"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Alege�i m�rimea pe care vre�i s� o instala�i"
+
+#~ msgid "Total size: "
+#~ msgstr "M�rime total�: "
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "Reconfigura�i re�eaua"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Nume de conexiune"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Nume de conexiune"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Nume de conexiune"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Nume de conexiune"
+
+#, fuzzy
+#~ msgid "Germany"
+#~ msgstr "German"
+
+#, fuzzy
+#~ msgid "Germany (1TR6)"
+#~ msgstr "German"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "Ce dori�i s� face�i ?"
+
+#, fuzzy
+#~ msgid "Install/Rescue"
+#~ msgstr "Instalare"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "Redimensioneaz�"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Ce tip de parti�ie dori�i?"
+
+#, 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Alege�i \"Instalare\" dac� nu exista alte versiuni de Linux instalate,\n"
+#~ "sau dac� dori�i s� folosi�i mai multe versiuni sau distribu�ii.\n"
+#~ "\n"
+#~ "Alege�i \"Actualizare\" dac� dori�i s� actualiza�i o versiune\n"
+#~ "precedent� Mandrake Linux:\n"
+#~ "%s or %s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Selectare:\n"
+#~ "\n"
+#~ "  - Automatizat: Dac� n'a�i mai instalat Linux niciodat�, alege�i aceasta.\n"
+#~ "NOT�:\n"
+#~ "    re�eaua nu va fi configurat� �n timpul instal�rii, folosi�i\n"
+#~ "    \"LinuxConf\" pentru a o configura dup� ce instalarea s'a terminat.\n"
+#~ "\n"
+#~ "  - Personalizat: Dac� sunte�i destul de familiar cu GNU/Linux, pute�i\n"
+#~ "    atunci s� alege�i utilizarea principal� a calculatorului. Vezi mai jos\n"
+#~ "    pentru detalii.\n"
+#~ "\n"
+#~ "  - Expert: Aceasta presupune c� sunte�i foarte familiar cu  GNU/Linux �i\n"
+#~ "    dori�i s� face�i o instalare foarte personalizat�. Ca �i pentru clasa\n"
+#~ "    \"Personalizat\", ve�i putea s� selecta�i utilizarea sistemului\n"
+#~ "    dumneavoastr�.\n"
+#~ "    Dar v� rog, NU ALEGE�i ACEASTA DEC�T DAC� �TI�I CE FACE�I!.\n"
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "�n acest punct, ve�i putea alege parti�iile pentru a instala sistemul\n"
+#~ "Linux-Mandrake dac� acestea au fost deja definite (dintr-o alt� instalare\n"
+#~ "prealabil� a unui sistem Linux sau cu ajutorul unui program departi�ionare). "
+#~ "�n celelalte cazuri, parti�iile vor trebui s� fie create.\n"
+#~ "Aceast� opera�ie consist� �n divizarea logic� a capacit��ii discului dur\n"
+#~ "�n arii separate pentru utilizare.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dac� ave�i nevoie s� crea�i noi parti�ii, folosi�i \"Auto alocare\" \n"
+#~ "pentru o creare automat� de parti�ii Linux. Pute�i selecta discul pentru\n"
+#~ "parti�ionare f�c�nd clic pe \"hda\" pentru primul disc IDE, \"hdb\" \n"
+#~ "pentru al doilea sau \"sda\" pentru primul disc SCSI �i a�a mai departe.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dou� parti�ii obi�nuite sunt: parti�ia root (/), punctul de plecare\n"
+#~ "al ierarhiei sistemului de fi�iere �i /boot, care con�ine toate fi�ierele\n"
+#~ "necesare pentru a demara sistemul de operare c�nd calculatorul e aprins.\n"
+#~ "\n"
+#~ "\n"
+#~ "Pentru c� efectele acestui proces sunt �n mod uzual reversibile,\n"
+#~ "parti�ionarea poate fi intimidant� pentru un utilizator ne-experimentat.\n"
+#~ "De aceea DiskDrake simplific� pe c�t posibil acest proces. Consulta�i\n"
+#~ "documenta�ia �i nu v� gr�bi�i �nainte de a �ncepe.\n"
+#~ "\n"
+#~ "\n"
+#~ "Pute�i accede la toate op�iunile cu ajutorul tastaturii: naviga�i printre\n"
+#~ "parti�ii folosind tasta Tab �i tastele s�ge�i Sus/Jos. C�nd o parti�ie\n"
+#~ "e selectat�, pute�i folosi:\n"
+#~ "\n"
+#~ "- Ctrl-c  pentru a crea o nou� parti�ie (c�nd a parti�ie goal� e selectat�)\n"
+#~ "\n"
+#~ "- Ctrl-d  pentru a �terge o parti�ie\n"
+#~ "\n"
+#~ "- Ctrl-m pentru a crea un punct de montaj\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."
+#~ msgstr ""
+#~ "Toate parti�iile care tocmai au fost definite trebuie s� fie formatate\n"
+#~ "�nainte de a fi utilizate. (formatare �nsemn�nd crearea fi�ierelor sistem).\n"
+#~ "Poate dori�i s� reformata�i parti�ii pre-existente pentru a �terge \n"
+#~ "informa�iile con�inute.\n"
+#~ "Nota: nu este necesar s� formata�i parti�ii mai ales dac� dori�i s�\n"
+#~ "conserva�i informa�iile ce le con�in. Parti�ii de acest gen sunt:\n"
+#~ "/home �i /usr/local."
+
+#~ 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."
+#~ msgstr ""
+#~ "Pachetele selectate sunt acum pe cale de fi instalate. Aceast� opera�ie\n"
+#~ "ar trebui s� ia c�teva minute, excep�ie f�c�nd Actualizare unei distribu�ii\n"
+#~ "precedente, caz �n care timpul va fi lung �nainte ca actualizarea s�\n"
+#~ "�nceap�."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Dac� DrakX nu a reu�it s� detecteze mouse-ul, sau dac� dori�i s� verifica�i\n"
+#~ "ceea ce a f�cut, vi se va propune lista cu mouse-uri de mai sus.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dac� sunte�i de acord cu propunerea lui DrakX, s�ri�i la sec�iunea dorit�\n"
+#~ "cu un simple �n meniu din st�nga. Dac� nu, alege�i tipul de mouse care\n"
+#~ "crede�i c� se apropie mai mult de cel pe care-l ave�i.\n"
+#~ "\n"
+#~ "\n"
+#~ "�n cazul unui mouse de tip serie, ve�i putea specifica portul serie la\n"
+#~ "care e conectat."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "Aceast� sec�iune este dedicat� configura�iei unei re�ele locale (LAN)\n"
+#~ "sau a unui modem.\n"
+#~ "\n"
+#~ "Alege�i \"Re�ea LAN\" �i DrakX va �ncerca s� detecteze adaptatorul\n"
+#~ "Ethernet pe care-l ave�i. Adaptatorii PCI sunt �n general detecta�i �i\n"
+#~ "ini�ializa�i �n mod automat.\n"
+#~ "�n cazul unui adaptator ISA, detec�ia automat� nu va func�iona �i ve�i\n"
+#~ "avea atunci de ales pilotul din lista propus�.\n"
+#~ "\n"
+#~ "\n"
+#~ "La fel �i pentru adaptatorii SCSI, pute�i l�sa testul mai �nt�i, dac� nu\n"
+#~ "pute�i specifica op�iunile pentru pilot pe care le-a�i recuperat �n \n"
+#~ "documenta�ia hardware-ului.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dac� instala�i sistemul Linux-Mandrake pe un calculator care face parte\n"
+#~ "dintr-o re�ea deja existent�, administratorul de re�ea v� va da toate\n"
+#~ "informa�iile necesare (adres� IP, sub-masc� de re�ea sau netmask mai pe\n"
+#~ "scurt �i numele calculatorului). Dac� configura�i o re�ea privat� la\n"
+#~ "dumneavoastr� acas�, de exemplu, va trebui s� alege�i adresele singur.\n"
+#~ "\n"
+#~ "\n"
+#~ "Alege�i \"Telefona�i cu modem\" �i atunci conexiunea Internet va fi\n"
+#~ "configurat�. DrakX va �ncerca s� detecteze modemul �i dac� nu reu�e�te\n"
+#~ "v� va propune portul serie la care modemul e conectat."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "Linux poate gera multe tipuri de imprimante. Fiecare din aceste tipuri\n"
+#~ "necesit� o instalare diferit�. Nota�i c� \"spool\"-ul de imprimant�\n"
+#~ "folose�te \"lp\" pentru numele din oficiu al imprimantei; deci va trebui\n"
+#~ "s� ave�i o imprimant� cu un acest nume; dar �i ve�i putea da mai multe "
+#~ "nume,\n"
+#~ "separate de caractere '|'. Deci, dac� dori�i s� ave�i unele nume mai pline\n"
+#~ "de sens, ve�i putea folosi, de exemplu: \"Imprimanta mea|lp\".\n"
+#~ "Imprimanta care are are \"lp\" printre numele ei va fi considerat� ca\n"
+#~ "imprimanta din oficiu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dac� imprimanta e conectat� fizic la calculator, selecta�i atunci\n"
+#~ "\"Imprimant� local�\". Ve�i avea apoi a intra numele portului de\n"
+#~ "imprimant� la care aceasta e conectat� �i a selecta filtrul apropriat\n"
+#~ "Portul LPT1 devine lp0 �n Linux\n"
+#~ "\n"
+#~ "\n"
+#~ "Dac� dori�i s� accede�i la un calculator Unix distant, ve�i avea a selecta\n"
+#~ "\"lpd distant\". Pentru a o face s� func�ioneze, nu ave�i nevoie de parol�\n"
+#~ "sau de nume de utilizator, dar va trebui s� �ti�i care e numele cozii de\n"
+#~ "imprimare de pe acest server-ului.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dac� dori�i s� acede�i la o imprimant� SMB (adic� la o imprimant� conectat�\n"
+#~ "fizic la un calculator distant cu un sistem Windows), va trebui s� \n"
+#~ "specifica�i numele ei SMB (care nu e numele ei TCP/IP) �i probabil adresa\n"
+#~ "ei IP, plus numele utilizatorului, al grupului de lucru �i parola cerut�\n"
+#~ "pentru a accede la imprimant� �i bine�n�eles numele imprimantei. Lucrurile\n"
+#~ "sunt similare pentru o imprimant� Netware, excep�ie f�c�nd faptul c� nu\n"
+#~ "ave�i nevoie de informa�ia de grup de lucru."
+
+#, fuzzy
+#~ 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."
+#~ msgstr ""
+#~ "E foarte indicat s� r�spunde�i \"Da\" aici. Dac� instala�i Microsoft \n"
+#~ "Windows mai t�rziu, acest a v� va �terge sectorul de demaraj al discului.\n"
+#~ "Dac� nu ave�i un floppy de demaraj, nu ve�i mai putea demara Linux."
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Abandona�i schimb�rile?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "Selecta�i Conexiunea de imprimant�"
+
+#~ msgid "Host name:"
+#~ msgstr "Numele calculatorului:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Ce tip de mouse ave�i?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Rezolu�ii alese �n mod automat"
+
+#~ 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"
+#~ msgstr ""
+#~ "Pentru a afla rezolu�iile disponibile voi �ncerca altele diferite.\n"
+#~ "Ecranul dumneavoastr� se va stinge �i aprinde de c�teva ori..."
+
+#~ 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?"
+#~ msgstr ""
+#~ "Pot s� �ncerc s� g�sesc rezolu�iile disponibile (eg:800x600).\n"
+#~ "Uneori, totu�i, aceasta poate bloca calculatorul.\n"
+#~ "Dori�i s� �ncerc ?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "N'am g�sit moduri valide\n"
+#~ "�ncerca�i cu o alt� carte video sau alt monitor"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Configurarea automat� a rezolu�iilor"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Mouse Apple ADB"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Mouse Apple ADB (2 Butoane)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Mouse Apple ADB (3+ Butoane)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Mouse Apple USB"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Mouse Apple USB (2 Butoane)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Mouse Apple USB (3+ Butoane)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Mouse PS/2 generic"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "Mouse ATI Bus"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Mouse Microsoft Bus"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Mouse Logitech Bus"
+
+#~ msgid "USB Mouse"
+#~ msgstr "Mouse USB"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "Mouse USB (3 butoane sau mai multe)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A sau mai mult (serie)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (serie)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (serie)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (serie)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Mouse serie generic"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Mouse Microsoft compatibil (serie)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Mouse serie generic cu 3 butoane"
+
+#, fuzzy
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "montarea nfs a e�uat"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Criptografie"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "Dori�i sa configura�i re�eaua LAN pentru sistemul dumneavoastr�?"
+
+#~ msgid "Show less"
+#~ msgstr "Afi�a�i mai pu�in"
+
+#~ msgid "Show more"
+#~ msgstr "Afi�a�i mai mult"
+
+#~ msgid "curly"
+#~ msgstr "c�rlion�at"
+
+#~ msgid "default"
+#~ msgstr "standard"
+
+#~ msgid "tie"
+#~ msgstr "cravat�"
+
+#~ msgid "brunette"
+#~ msgstr "brunet�"
+
+#~ msgid "girl"
+#~ msgstr "fat�"
+
+#~ msgid "woman-blond"
+#~ msgstr "femeie blond�"
+
+#~ msgid "automagic"
+#~ msgstr "automagic"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Care e dispozi�ia tastaturii?"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "S� �ncerc s� g�sesc cartelele PCMCIA?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "S� �ncerc s� g�sesc periferice %s?"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "Configura�ie modem"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr "Dori�i sa configura�i o conexiune telefonic� prin modem?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "S� �ncerc s� g�sesc periferice PCI?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "�n c�utarea parti�iei root"
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: Aceasta nu e o parti�ie root, v� rog alege�i o alta"
+
+#~ msgid "No root partition found"
+#~ msgstr "N'am g�sit nici o parti�ie root"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "Nu pot s� folosesc difuzia f�r� nici un domeniu NIS"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "V� rog alege�i o parti�ie pentru a o folosi ca parti�ie root?."
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "Nu ave�i destul spa�iu pentru Lnx4win"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "Automatizat"
+
+# 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.
+#
+#~ 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 ""
+#~ "Bun venit la gestionarul de sisteme de operare LILO!\n"
+#~ "Pentru a lista posibilitatile, apasati <TAB>.\n"
+#~ "\n"
+#~ "Pentru a lansa unul dintre ele, scrietii numele si apasati <ENTER> sau\n"
+#~ "asteptati %d secunde pentru demararea din oficiu.\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
+#
+#~ 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 ""
+#~ "Bun venit la gestionarul de sisteme de operare SILO!\n"
+#~ "\n"
+#~ "Pentru a afisa diferitele posibilitati, apasati <TAB>.\n"
+#~ "\n"
+#~ "Pentru a demara unul dintre ele, scrieti-i numele si apasati <ENTER> sau\n"
+#~ "asteptati %d secunde pentru demararea din oficiu.\n"
+#~ "\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "Op�inunile principale ale lui SILO"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "Iat� urm�toarele intr�ri din SILO.\n"
+#~ "Pute�i ad�uga mai multe sau schimba cele existente."
+
+#~ msgid "This label is already in use"
+#~ msgstr "Aceast� etichet� e deja utilizat�"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "Instalarea lui SILO a e�uat. Urm�toarea eroare a ap�rut:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX va �ncerca mai �nt�i s� caute unul sau mai mul�i adaptatori PCI\n"
+#~ "sau SCSI. Dac� c�utarea e fructuoas� �i �tie ce pilot s� foloseasc�,\n"
+#~ "atunci �l (le) va instala �n mod automat.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dac� adaptatorul este o carte ISA, sau est e o carte PCI �i DrakX\n"
+#~ "nu �tie ce pilot s� foloseasc� sau dac� nu ave�i nici un adaptator SCSI\n"
+#~ "ve�i fi mai apoi �ntrebat dac� ave�i unul sau nu. Dac� nu ave�i nici unul\n"
+#~ "r�spunde�i \"Nu\". Dac� ave�i unul sau mai multe, r�spundeti \"Da\".\n"
+#~ "O list� cu pilo�i va va permite atunci s� alege�i unul.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dup� ce a�i selec�ionat pilotul, DrakX v� va �ntreba dac� dori�i\n"
+#~ "s� specifica�i op�iuni pentru el (ei). Mai �nt�i �ncerca�i �i l�sa�i\n"
+#~ "pilotul s� testeze hardware-ul: �n mod normal aceasta func�ioneaz� bine.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dac� nu, nu uita�i informa�iile despre hardware pe care le-a�i putea g�si\n"
+#~ "�n documenta�ia dumneavoastr� sau din Windows (dac� l-ave�i instalat), a�a\n"
+#~ "cum e sugerat �n ghidul de instalare. Acestea sunt op�iuni pe care le ve�i\n"
+#~ "furniza pilotului."
+
+#~ msgid "Shutting down"
+#~ msgstr "Oprire"
+
 #~ msgid "useless"
 #~ msgstr "nefolositor"
 
@@ -4991,9 +7245,6 @@ msgstr "G�sirea foilor ia ceva timp"
 #~ "Dori�i s� le folosi�i ? Asigura�i-v� ca ave�i dreptul s� le folosi�i\n"
 #~ "�n Linux."
 
-#~ msgid "Recommended"
-#~ msgstr "Recomandat"
-
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
@@ -5061,9 +7312,6 @@ msgstr "G�sirea foilor ia ceva timp"
 #~ msgid "Setup SCSI"
 #~ msgstr "Instalare SCSI"
 
-#~ msgid "Which language do you want?"
-#~ msgstr "Ce limb� dori�i ?"
-
 #~ msgid "server"
 #~ msgstr "server"
 
diff --git a/perl-install/share/po/ru.po b/perl-install/share/po/ru.po
index a38cf5b38..e7e1c02a7 100644
--- a/perl-install/share/po/ru.po
+++ b/perl-install/share/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 1999-09-24 10:07 +0200\n"
 "Last-Translator: Aleksey Smirnov <smi@logic.ru>\n"
 "Language-Team: \n"
@@ -12,43 +12,95 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "����������"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "�������� ����������"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "�������� X ������"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X ������"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, fuzzy, c-format
+msgid "XFree %s"
+msgstr "������ XFree86: %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "����� ��� ������ ������ ��������?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, fuzzy, 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 ""
+"��� ����� ����� ���� ��������� 3D ����������� ������ ��� XFree 3.3.\n"
+"�������� �� �� ������������ XFree 3.3 ������ XFree 4.0?"
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, fuzzy, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "����� ��������� ��� ������������ � 3D ������������?"
+
+#: ../../Xconfigurator.pm_.c:245
+#, fuzzy, 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 ""
+"��� ����� ����� ���� ��������� 3D ����������� ������ ��� XFree 3.3.\n"
+"�������� �� �� ������������ XFree 3.3 ������ XFree 4.0?"
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+#, fuzzy
+msgid "XFree configuration"
+msgstr "��������� proxy"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "������� ������ �����������"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "�������� ����� ��� �������"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "�������� �������"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "�������"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -71,39 +123,40 @@ msgstr ""
 "��� ����������� ������������ ������ ��������: �� ������ ����������������.\n"
 " � ������ �������� ����� ������� �������������� ���������."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "������� �������������� ���������"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "������� ������������ ���������"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "������� ��� �� ��������"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "���������� ��� �� ���������"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "���������� �� �������"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "������ �������������� ���������?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+#, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "��������������: ������������ �� ���� ���������� ������"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "�������� ��������"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -111,185 +164,168 @@ msgstr ""
 "\n"
 "���������� ��������� ��������� ���������"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "������:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "�������� %d ������"
 
-#: ../../Xconfigurator.pm_.c:378
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
-msgstr "��� �����?"
+msgstr "��� ���������� ���������?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "��������� ������, ���������� �������� ���������"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "�������������� ����������� ����������"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"��� ������ ���������� ���������� ��������� ���������. \n"
-"��� ����� ����� ������...\n"
-"���� ������, ������ ��� ���������, �� ��������� �������� �����"
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "����������"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "����� ���������� � ������� �����"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "����������: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "������ XFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "�������� ���"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "����������"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"����� ����������� ����� ��������� ���������� (����.: 800x600).\n"
-"�������, ������� ��� ����� ��������� ������ .\n"
-"������ �����������?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"�� ���������� ���������� �������\n"
-"���������� ������� ������ ���������� ��� �������"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "��� ����������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "��� ����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "�������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "������� ���.����. ��������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "������� ����.����. ��������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "����������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "�����������: %s KB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "��������� ������� �����"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "����������"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "������ XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "������ XFree86: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "���������� ��������� X-Window"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "�������� �������"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "�������� ����������"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "�������� ����� �������"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "�������� ����������"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "�������������� ����� ����������"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "����������"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "����� ���������"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "�����"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "��� �� ������ ������?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "������ ���������?"
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "���������� ������� ������������ IP"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "������� �������� � %s ��� ��������� ���������"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "�������, � ����� ����������� Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "������ X ��� ��������"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -297,461 +333,640 @@ msgstr ""
 "����� ��������� ������� ��� ��������������� ������� X ����� ��������.\n"
 "������, ����� X ��������� ��� ������������?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "��������"
+
+#: ../../Xconfigurator.pm_.c:1152
+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."
+msgstr ""
+"����� ��������� ������� ��� ��������������� ����� ������ ������������.\n"
+"���� �� �� ������ ��������������� ���� ������������, ������� �� ������ "
+"������."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "�������� ������������ �� ���������"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "�������� ����������"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 ������ (8 ���)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 ������ ������ (15 ���)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 ����� ������ (16 ���)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 ��������� ������ (24 ����)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 ��������� ������ (32 ����)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 Mb"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 Mb"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB ��� ������"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "����������� VGA, 640x480 ��� 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 ��� 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "���������� � 8514, 1024x768 ��� 87 Hz ������������ (��� 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "SVGA ������� �������, 1024x768 ��� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frequency ��������� ������������ 1280x1024 ��� 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frequency ��������� ������������ 1280x1024 ��� 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frequency ��������� ������������ 1280x1024 ��� 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor ��������� ������������ 1600x1200 ��� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor ��������� ������������ 1600x1200 ��� 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr ""
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "���������"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-#, fuzzy
-msgid "tie"
-msgstr "��������"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr ""
-
-#: ../../any.pm_.c:19
-#, fuzzy
-msgid "automagic"
-msgstr "�������������� IP"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "������ ������ ������������ �������"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "������ ������ ���������� (MBR)"
 
-#: ../../any.pm_.c:65
-#, fuzzy
-msgid "LILO/grub Installation"
-msgstr "��������� LILO"
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "��������� SILO"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "���� �� ������ ���������� ��������� ���������?"
 
-#: ../../any.pm_.c:73
-#, fuzzy
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "��������� LILO/grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
-msgstr "������"
+msgstr "�����"
 
-#: ../../any.pm_.c:73
-#, fuzzy
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
-msgstr "����� ��� ������ ������ ��������?"
+msgstr "����� ��������� �������� ������ ������������?"
+
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "��������� ����������"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "����������� ����������"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
-msgstr ""
+msgstr "LBA (�� �������� �� ������ BIOS)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "���������"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "���������"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "�������� ����� ��������� ������ �� ���������"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "�����-�����"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "�������� ����� ��������� ������ �� ���������"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "������:"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "��������� ������:"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "����������� ����� ��������� ������"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "�����������"
 
-#: ../../any.pm_.c:98
-#, fuzzy
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
-msgstr "������� ����� LILO"
+msgstr "������� ����� ����������"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "����� ``����������� ����� ��������� ������'' �� ������������ ��� ������"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "���������� ��� ���"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "������ �� ���������"
 
-#: ../../any.pm_.c:112
-#, fuzzy
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
 msgstr ""
-"� LILO ���� ��������� ������.\n"
+"������� ���������� �������.\n"
 "�� ������ �������� ���, ��� �������� ������������."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "��������"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "������"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "����� ��� ������ ������ ��������?"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "������ OS (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "������ OS (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "����� ��� ������ ������ ��������?"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "�����"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "������������"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "������-������"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "�������"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Unsafe"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "�����"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "���������"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "��"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "������� �����"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "������ ����� �� �����������"
 
-#: ../../any.pm_.c:167
-#, fuzzy
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "��� ����� ��� ������������"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "������� %s %s ����������"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "���� �� � ��� ������?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "���� �� � ��� %s ���������?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "���"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "��"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "��������� �������� ��� %s ����� %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(������ %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "����� %s ������� ��� �����������?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"� ��������� ������� %s �������� ����� ��������� �������������� ����������,\n"
+"���� ������ ��� �� ���������. �� ������ �� �� ������ ��� ����\n"
+" �������������� �����, ��� ��������� �������� �������������� ������\n"
+"� ������� ����������� ����������? ��������, ������������ �������� ���������, "
+"�� ��� \n"
+"������ �� �������."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "���������"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "������� ���������"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "�� �� ������ ������ ����� ������ %s."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"�� �� ������ ������ ����� ������ %s.\n"
+"����� - � ������� ``���=�������� ���2=��������2 ...''.\n"
+"��������, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "����� ������:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"�������� ������ %s �� ������.\n"
+"������ ����������� ��� � ������� �����������?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Dobro pozhalovat' v dispetcher vybora operacionnoj sistemy %s!\n"
+"Chtoby vyvesti spisok vozmozhnyh variantov, nazhmite <TAB>\n"
+"\n"
+"Chtoby odnu iz nih, napishite ee nazvanie i nazhmite <ENTER>\n"
+"ili zhdite %d sekund zagruzki po umolchaniyu.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "����� ���������� � GRUB, ��������� ��"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "����������� ������� %c � %c ��� ��������� ������."
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "������� enter ��� �������� ��������� ��, 'e' ��� ��������������"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "������ ����� ���������, ��� 'c' ��� ��������� ������."
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "��������� ����� ����� ����������� ������������� ����� %d ������."
+
+#: ../../bootloader.pm_.c:604
+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:696
+msgid "Desktop"
+msgstr "������� ����"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "��������� ����"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "�������� %d ������"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "�������"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "��������������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "�������"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "��������������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "��������� �������"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "���"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "����� ������������"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "������ /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "��������� > �������"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "������� > ���������"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "�������������� �� �����"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "���������� � �����"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "�������������� � �������"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "���������� �� �������"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "�������� ���"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "������������� ���"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "���������� �������������"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "��� ��������� ������� ������������"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "���������� �������� ����������"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr "����� ������� ������ ��������, ������� ���� � �������� extended"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "�������� ������� ��������"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "�����"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "������ ������� ��������"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "�������������"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "�����"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
-msgstr ""
+msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "������"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "�����"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "������"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "���� �������� �������:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "�����������"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -763,94 +978,97 @@ msgstr ""
 "��������� ������ ����� �������� ������ �������\n"
 "(�������� �� ����, � ����� �� \"��������� �������\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "������ ����� �������� ��������� ����� ������"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "������� �����������!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 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:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
-msgstr ""
+msgstr "���������: ��� �������� ������."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "����� ������������:"
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "����������:"
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "����� ��� DOS-����� %s (������)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "���"
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "������: ������ %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, fuzzy, c-format
 msgid "Size: %d MB"
 msgstr "������ : %d MB\n"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s ��������"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "�������� � %d �� %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "��������������\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "�� ���������������\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "������������\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
-msgstr ""
+msgstr "Loopback file(s): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -858,79 +1076,79 @@ msgstr ""
 "����������� ������ �� ���������\n"
 "    (��� �������� MS-DOS, �� ��� lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "������� %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Chunk ������ %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-����� %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
-msgstr ""
+msgstr "��� Loopback �����: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "������� �� ������"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "������ : %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "���������: %s ���������, %s �������, %s ��������\n"
 
-#: ../../diskdrake.pm_.c:267
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:273
+#, c-format
 msgid "Partition table type: %s\n"
-msgstr "�������� ������"
+msgstr "��� ������� ��������: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "�� ���� %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "������������"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "��������"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "�������� � RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "������� �� RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "�������� RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "�������� ��������"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -941,7 +1159,7 @@ msgstr ""
 "���� �� ����������� LILO - ����� ��� �� ����� ��������, ���� LILO �� "
 "������������, � ����� /boot �� �����."
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -954,202 +1172,213 @@ msgstr ""
 "���� ����� �������������� ��������� �������� LILO, �� �������� �������� "
 "������ /boot"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
+"�� ������� ������ ������������ RAID � �������� ��������� (/).\n"
+"������� ��������� �� ������ ��� ���������� ��� ������� /boot.\n"
+"��� ��� �� �������� �������� ������ /boot"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "������ ����������� ``%s'' "
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "������� �������� ``Unmount''"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
+#, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
-msgstr "��� ������ � ���� ������� ��������"
+msgstr ""
+"����� ��������� ���� ������� %s, ��� ������ � ���� ������� ����� ��������"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "���-���� ����������?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "����� ��� ����������"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "����� ��� ������ ������� ��������"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "�������� ��� �������"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
-msgstr "����� ��� ������� ��� �����"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "�������� ����"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr "���������� ������������ ReiserFS �� �������� ������ 32MB"
 
-#: ../../diskdrake.pm_.c:484
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:490
+#, c-format
 msgid "Where do you want to mount loopback file %s?"
-msgstr "���� �� ������ ������������ ���������� %s?"
+msgstr "���� �� ������ ������������ loopback ���� %s?"
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "���� �� ������ ������������ ���������� %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
+"�� ���� �������� ����� ������������, ��������� ���� ������ ������������ ��� "
+"loop back.\n"
+"������� ������� loopback"
 
-#: ../../diskdrake.pm_.c:509
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:515
+#, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "��� ������ � ���� ������� ��������"
+msgstr "����� �������������� ������� %s, ��� ������ � ���� ������� ��������"
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "��������������"
 
-#: ../../diskdrake.pm_.c:512
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:518
+#, c-format
 msgid "Formatting loopback file %s"
-msgstr "�������������� �������� %s"
+msgstr "�������������� ����� loopback %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "�������������� �������� %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "����� �������������� ���� ��������"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "��� ������ � ���� �������� ����� ��������"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "�����������"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "�� ����� ���� �����������?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "�� ����� ������ �����������?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "����������"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "������������ ������..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "������� ���������� ��������� %s ����� �������� �� ����!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
 msgstr "����� ��������� �������������, ���������� ���������������"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "���������� ������ �������� ������� FAT"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "��������� �������"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
 #, fuzzy
+msgid "This partition is not resizeable"
+msgstr "������ ������ ������� ��������?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
-msgstr "��� ������ � ���� ������� ��������"
+msgstr "��� ��� ������ � ���� ������� ��������� ��������� �����"
 
-#: ../../diskdrake.pm_.c:588
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:599
+#, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "��� ������ � ���� ������� ��������"
+msgstr "����� ��������� ������� ������� %s ��� ������ � ���� ������� ��������"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "����� ������ �������"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "�������� ������ �������"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "��������� ������:"
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "������ � MB:"
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "��� �������� �������:"
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "������������: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
-msgstr ""
+msgstr "���� ������ ������ ������������ ��� loopback"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
-msgstr ""
+msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
-msgstr ""
+msgstr "��� loopback �����: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
-msgstr ""
+msgstr "���� ��� ������������ ������ loopback, �������� ������ ����."
 
-#: ../../diskdrake.pm_.c:778
-#, fuzzy
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
-msgstr "����� %s ��� ����������"
+msgstr "���� ��� ����������. ������������ ���?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "�������� ����"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1157,11 +1386,11 @@ msgstr ""
 "��������� ������� ���������� ����� ����� ������ ������\n"
 "���-���� ����������?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "��������!"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1169,77 +1398,79 @@ msgstr ""
 "�������� ������� � ����������\n"
 "��� ������ �� ���� ������� ��������"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "������� ������ ������� ��������"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "����������:"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "�������"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "������ chunk"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "�������� ������������ RAID ��� ����������"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "�����"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s ������ �������������� %s"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "�� ���� ��� ������������� %s � ����� %s"
 
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr "������ ������������ nfs"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "������ ������������: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "������ ��������������� %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "����� ������������ ������ ���������� � /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "��� ���� ������ � ������ ������������ %s\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
+msgstr "����������� ������������ %s\n"
+
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
 msgstr ""
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
+"��� ���� ����� ������������ ����� �������� �������� ������� (ext2, "
+"reiserfs)\n"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "������ �������� %s ��� ������: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1247,75 +1478,81 @@ msgstr ""
 "��������� ������: ���������� ��� �������� ����� �������� ������ �� �������. "
 "��������� ������������ ��� ����������� ��������� �������."
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "� ��� �� ������� ������� ��������!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr "�������� ���� ��������� � ������ �������"
 
-#: ../../help.pm_.c:10
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "�������� ��������� ����� ���������� � ����������� ������"
-
-#: ../../help.pm_.c:13
-#, fuzzy
+#: ../../help.pm_.c:12
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"You need to accept the terms of the above license to continue installation.\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).\n"
 "\n"
+"Please click on \"Accept\" if you agree with its terms.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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 "�������� ��������� ����� ���������� � ����������� ������"
+
+#: ../../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
+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"
-"  - 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"
-msgstr ""
-"�������� \"���������\", ���� ��� ������������� �������������� ������ Linux,\n"
-"��� ���� ������ ������������ ��������� ������������� ��� ������.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"�������� \"��������\" ���� �� ��������� �������� ���������� ������\n"
-"Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000 ��� 7.0 (Air).\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"
-"��������:\n"
+"\t* Recommanded: 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"
-"  - �������������: ���� �� ������ ������� �� ������������� Linux.\n"
 "\n"
-"  - � ����������: ���� �� ������� � Linux, �� ������� ������� �� ��������� \n"
-"����� ������������� �������: ����������, ��� ������������, ���\n"
-"������. �������� \"����������\" ��� ��������� ������� ������ ����������.\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 sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - �������: ���� �� �������� �������� GNU/Linux � ������ ���������\n"
-"��������� � �������� ����������, �� ���� ����� ��������� - ��� ���. �� \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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1323,12 +1560,13 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "��������:\n"
 "\n"
@@ -1343,302 +1581,583 @@ msgstr ""
 "\n"
 "  - �������: ���� �� �������� �������� GNU/Linux � ������ ���������\n"
 "��������� � �������� ����������, �� ���� ����� ��������� - ��� ���. �� \n"
-"������� ������� ���������� �������, ��� � ��� \"� ����������\".\n"
+"������� ������� ���������� �������, ��� � ��� \"� ����������\"."
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
-
-#: ../../help.pm_.c:70
+"��������� �������� ������������� ����� ������ (� ������, ���� �� ������� \n"
+"\"� ����������\" ��� \"�������\" � �������� ������ ���������) \n"
+"���������:\n"
+"\n"
+"  - �������: ��������� ���, ���� ����������� ������ ������ ����� ��� \n"
+"    ������������ ���� (������� ������, �������� � �������� � �.�.). �� "
+"�����\n"
+"    ����������� ������� ������������, ������� ����������.\n"
+"\n"
+"  - ����������: �������� ������� �� ����. ��������� ���, ���� ����������� \n"
+"    ������ ������ ����� ��� ���������� ��. � ��� ����� ������ ����� \n"
+"    �������� ��� ����������, ������� � �������������� ��������� ������,\n"
+"    ��� �������� ����������� �������.\n"
+"\n"
+"  - ������: ��������� ���, ���� ������, �� ������� �� ������� "
+"Linux-Mandrake\n"
+"    ������������� ��� ������ � �������� �������. ��� � �������� ������ (NFS "
+"��� SMB),\n"
+"    � ������ ������ (�������� Unix' lp (Line Printer) ��� "
+"Windows-����������� SMB\n"
+"    printing), � ������ �������������� (NIS), � ������ ��� ������, � �.�..\n"
+"    �� � ����� ������� �� ������������� �� ��������� ����������� (KDE, "
+"GNOME...).\n"
+
+#: ../../help.pm_.c:84
+#, fuzzy
 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"
+"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 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"
+"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"
-"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"
+"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, 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."
+"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\n"
-"SCSI. ���� �� (��� ���) ������, � ��������, ����� �������\n"
-"������������, �� ��������� �� �������������.\n"
+"DrakX ��������� ����� PCI SCSI �������(�). \n"
+"���� DrakX ������ SCSI ������� � ���������, ����� ������� ������� "
+"������������,\n"
+"�� ��� ������������� ���������.\n"
 "\n"
-"���� ��� SCSI ������� �� ISA, ��� �� PCI, �� DrakX �� �����\n"
-"����� ������� ������������ � ���� ������, ��� � ��� ��� SCSI ���������,\n"
-"�� ��� �������, ���� �� �� � ���, ��� ���.\n"
-"���� � ��� ��� ���, ��������� \"���\". ���� ���� ���� ��� ���������,\n"
-"��������� \"��\". ����� ����� �������� ������ ���������, �� ������� ��\n"
-"�������� ����������.\n"
+"���� � ��� ��� ��������� SCSI, ISA SCSI, ��� PCI SCSI, ������� DrakX \n"
+"�� ����� ����������, �� ��� �������, ������� �� � ����� �������\n"
+"SCSI �������. ���� � ������� ������ �������� ���, ������ �������\n"
+"������ '���'. ���� �� ������� '��', �� ��� ����������� ������ ���������,\n"
+"�� �������� �� ������ ������� ��������������� ������ ��������.\n"
 "\n"
-"����� ������ ��������, DrakX �������, �� ������ �� �� ������\n"
-"��� ���� �����. ������� ����������, ����� ������� �������� ������������:\n"
-"������ ��� �������� ������.\n"
 "\n"
-"���� ���, �� ��������� ��� ���������� � ����� ������������, �������\n"
-"����� �������� �� Windows (��� ������� �� ����� �������), ��� ���\n"
-"������������� ������������ �� ���������. ��� �� �����, �������\n"
-"���� ������ ��������."
+"���� ������� �������� ��������� �������, DrakX �������, �� ������ �� �� \n"
+"������ ��� ���� ���������. ����� ��������� DrakX �������������� "
+"������������\n"
+"��� ������� ����������. ������ ��� �������� ������.\n"
+"\n"
+"���� ���, �������� ������� ������� ��������� ��� ��������.\n"
+"���������� � ����������� �� ��������� �� �������� ��������� ���� ������ �� \n"
+"Windows (���� ��� ����������� �� ������), �� ������������ �� ������������, \n"
+"��� � ���-����� ������������� (���� ������� ������ � ��������)."
 
-#: ../../help.pm_.c:94
-#, fuzzy
+#: ../../help.pm_.c:108
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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 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"
-"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"
+"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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\n"
-msgstr ""
-"����� ����� ����������, ����� ������� ������������ ��� ���������\n"
-"����� ������� Linux-Mandrake, ���� ��� ��� ���� ������ (��� ���������� \n"
-"��������� Linux ��� ������ ���������� ���������). � ������ �������\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"
 "\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"
-"������ �������� ��������� �������� �������, � /boot, ����������\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"
-"�� ������� ����� ���� �������� � ������� ��� �������. DiskDrake\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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:160
 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."
+"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"
+"\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"
 msgstr ""
-"��� ����� ������������ ������� ������ ���� ��������������� ��� \n"
-"������������� (�������������� �������� �������� �������� �������). � ����\n"
-"�������� ����� ����������������� ��� ������������ ������� ��� �������� "
-"������\n"
-"� ���. ���������: ������������� ��� ������������ ������� �� �����������,\n"
-"�������� ���� ��� �������� ����� � ������, ������� �� ������ ���������.\n"
-"������ ��������� /home � /usr/local."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:218
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"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"
-"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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"\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 ""
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:252
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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:155
+#: ../../help.pm_.c:257
 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."
+"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"
-"����������."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:267
 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"
+"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"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\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"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
-msgstr ""
-"���� DrakX �� ���� ����� ���� ����, ��� ���� �� ������\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"
 "\n"
-"���� �� �������� � ����������� DrakX, ������ ��������� � ������\n"
-"��� ������ �������� �� ���� � ���� �����. � ��������� ������\n"
-"�������� � ���� ����, ��� ������� �������� ������������� ����\n"
-"����� ����.\n"
 "\n"
+"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
+"IDE hard drives:\n"
 "\n"
-"� ������ ���������������� ����, ��� ����� �������� �������� DrakX\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 ""
+
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:303
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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 ""
-"��������� �������� ����. ��������, ���� COM1 � MS Windows\n"
-"���������� ttyS0 � Linux."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:329
+#, fuzzy
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"You may now select the group of packages you wish to\n"
+"install or upgrade.\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"
+"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 �������..."
+
+#: ../../help.pm_.c:341
+msgid ""
+"You can now choose individually all the packages you\n"
+"wish to install.\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"
+"You can expand or collapse the tree by clicking on options in the left "
+"corner of\n"
+"the packages window.\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"
 "\n"
+"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
+"\"Toggle flat and group sorted\".\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."
+"\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"
-"(LAN), ��� ������. \n"
+
+#: ../../help.pm_.c:358
+#, 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 ""
+"���� � ��� ���� ��� CD �� ������������ ���� ������, ������� Ok.\n"
+"���� � ��� ��� �� ������ �� ���, ������� �������.\n"
+"���� ����������� ������ ��������� CD, �������� �� ����� � ������� Ok."
+
+#: ../../help.pm_.c:363
+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"
-"�������� \"��������� ����\" � DrakX ����������� �����\n"
-"�� ����� ������ ������� Ethernet. �������� PCI ������ ���� �������\n"
-"� ��������� �������������. ������, ��� ������������� ISA,\n"
-"��������������� �� ���������, � ��� �������� �������� �������\n"
-"�� ������, ������� � ���� ������ ��������.\n"
 "\n"
+"Please be patient."
+msgstr ""
+
+#: ../../help.pm_.c:371
+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:376
+#, fuzzy
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
+msgstr ""
+"��������� �������� ����. ��������, ���� COM1 � MS Windows\n"
+"���������� ttyS0 � GNU/Linux."
+
+#: ../../help.pm_.c:380
+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"
-"��� � ��� ��������� SCSI, �� ������ ������������ �������� ���������\n"
-"����������, ����� �������� �������� �������� �����,\n"
-"������� �� ������ � ������������ �� ������  \n"
-"������������.\n"
+"\n"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\n"
 "\n"
 "\n"
-"��� ��������� Linux-Mandrake �� ���������, ������� � ��� \n"
-"��������������� ����, �������������� ���� �������� ��������\n"
-"��� ���� �������� ����������� (IP �����, ����� �������\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:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"������ ����� ������ ��������� dialup. ���� �� �� ������, ��� �������, \n"
+"������ �������� ������ ���������� � ������ ���������� �������� (ISP)."
+
+#: ../../help.pm_.c:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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"
 "\n"
 "  - ����� ����: \"255.255.255.0\" ������ �������� ������� �������.\n"
@@ -1647,9 +2166,24 @@ msgstr ""
 "\n"
 "  - ���� IP: ���� � ����� ���� ������������ ��������� bootp ��� dhcp,\n"
 "�������� ���� �������. � ���� ������ �� ���� �������� \"IP �����\". \n"
-"���� �� �� �������, �������� ���������� ��������������.\n"
+"���� �� �� �������, �������� ���������� �������������� ��� ����������.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"���� � ����� ���� ������������ NIS, �������� \"������������ NIS\". ���� \n"
+"�� ������, �������� �������������� ����."
+
+#: ../../help.pm_.c:441
+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:445
 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."
@@ -1657,7 +2191,7 @@ msgstr ""
 "������ ����� ������ ��������� dialup. ���� �� �� ������, ��� �������, \n"
 "������ �������� ������ ���������� � ������ ���������� �������� (ISP)."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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."
@@ -1665,13 +2199,15 @@ msgstr ""
 "���� ������ ������������ proxy, ��������� ������. ���� �� ������,\n"
 "����� �� ���, ���������� � �������������� ���� ��� �������� ����������."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1683,100 +2219,207 @@ msgstr ""
 "������, ��� �������� ������� � ������ ���� � ������ ����������������\n"
 "����� ������."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "������ �������� ������� ���� � ������������ � ������ ������ ����������.\n"
 "\n"
 "\n"
-"Linux ��������� �������� �� �������� (GMT) � ��������� ��� � ������� �����\n"
+"GNU/Linux ��������� �������� �� �������� (GMT) � ��������� ��� � ������� "
+"�����\n"
 "� ������������ � ��������� ���� ������� ������."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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"
+"�������: ��������, �� �� �������� ���������� �������, ������� ��� �� �����."
 
-#: ../../help.pm_.c:257
-#, fuzzy
+#: ../../help.pm_.c:486
+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:490
+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:505
 msgid ""
-"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"
+"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\n"
-"\"Local printer\". You will then have to tell which port your\n"
-"printer is connected to, and select the appropriate filter.\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,\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"
+"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 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."
+"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 ""
-"Linux ����� �������� �� ������� ������ ���������. ������ �� ����\n"
-"����� ������� ��������� ���������.\n"
+
+#: ../../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"
-"\"Local printer\". ��� ����� ���� ����� ��������, � ������ �����\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"
-"������ Unix, ���� ������� \"��������� ������� lpd\". ����� ��������� ���\n"
-"��������, ��� � ������ �� ���������, �� ���� ����� ���\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"
-"��� ������� � �������� SMB (�� ���� � ��������, ������������\n"
-"�� ��������� ������ Windows 9x/NT), ���� ������ ��� ���\n"
-"SMB (������� �� ���� ��� TCP/IP ���), �, ��������, ��� IP �����\n"
-"� ��� ������������, ������� ������ � ������ ����������� ��� \n"
-"������� � ��������, �, �������, ��� ��������. �� �� ����� � ���\n"
-"�������� NetWare, ������ �� �������� ���������� � ������� ������."
+"\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:286
+#: ../../help.pm_.c:542
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"     If you want to acces a printer located on NetWare network, select "
+"\"NetWare\".\n"
+msgstr ""
+
+#: ../../help.pm_.c:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
+"\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"
@@ -1793,7 +2436,7 @@ msgstr ""
 "������� ��� �������: �� ������ ������������ ��� �������\n"
 "����������."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1802,7 +2445,7 @@ msgstr ""
 "����\" \n"
 "� \"������������ ������ MD5\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1810,7 +2453,7 @@ msgstr ""
 "���� � ����� ���� ������������ NIS, �������� \"������������ NIS\". ���� \n"
 "�� ������, �������� �������������� ����."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1852,47 +2495,41 @@ msgstr ""
 "�������� �� ������ � ���������, � ������� � ������� root ���� ������\n"
 "� ����� ����������������� � ������������ �������."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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"
-"������������������ Windows, ��� ����������� ����������� ������.\n"
-"� ���� �� �� ������� ����������� ����, �� �� ������� ������ ���������\n"
-"Linux!"
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
-"��������� ����������, ����������� ��� �������� Linux.\n"
+"��������� ����������, ����������� ��� �������� GNU/Linux.\n"
 "\n"
 "\n"
-"���� �� �� ������������� ��������� ����, ��� �� �������, \n"
+"���� �� �� ������������� ��������� ����, ��� �� �������, ���������\n"
 "\"����� ������ �� ����� (MBR)\"."
 
-#: ../../help.pm_.c:343
-#, fuzzy
+#: ../../help.pm_.c:643
 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:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1902,8 +2539,23 @@ msgid ""
 "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"
+"\n"
+"\n"
+"�������� �����, ��� �� �� ������ ������ ������ ������ � ���� ��, � ����� "
+"������\n"
+"����� ������� ��������������� ������. �� � ���� ������ ��� �� �������� "
+"�����������\n"
+"����������� �������!"
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
 #, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
@@ -1921,34 +2573,19 @@ msgid ""
 "\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."
 msgstr ""
-"�������� ��������� LILO:\n"
+"�������� ��������� LILO � grub:\n"
 "  - ���������� ��������: ��������������� ��� ���������� (����. ������\n"
 "�������� �����) ����������� ����������� ������. ���� �� ������ ���������,\n"
 "��������� \"/dev/hda\".\n"
 "\n"
 "\n"
-"  - Linear: ��������� �������� ������ �������� ������ ������� ����\n"
-"sector/head/cylinder. �������� ������ ����������� �� ����� ����������\n"
-"� �� ������� �� ��������� �����. ������ � ����, ��� ����������� ����� �� \n"
-"����� ���� ������������� ��� ������������� \"linear\", ��������� BIOS ��� \n"
-"����������� ��������� ����� ����������� �������� � ���������. ��� "
-"�������������\n"
-"\"linear\" � �������� �������, /sbin/lilo ����� ������� ������ ��\n"
-"����������� ������� �����, ��������� 3D ������ ������� ����������\n"
-"�� ������� ��������.\n"
-"\n"
-"\n"
-"  - Compact: ��������� ���������������� ������� �� ������ ������� ��������\n"
-"� ������ ������. ��� ����������� ��������� ����� �������� � �����.\n"
-"������������� \"compact\" �������� ������������� ��� �������� � \n"
-"�������.\n"
-"\n"
-"\n"
-"  - �������� �� ��������� ����� ��������� ������: ������ ����� � ��������\n"
-"������ � ������� ������� ��������� ���� ����� ��������� ������������� "
+"  - �������� �� ��������� ����� ��������� ������: ������ ����� � �������\n"
+"����� ������� � ������� ������� ��������� ���� ����� ��������� ������������� "
 "������.\n"
 "��� ������� ��� ������ ����� ����������� � �������� ����� ����� �����\n"
 "��������� ����������. ��������� �� ����, ���� \"delay\" \n"
@@ -1960,10 +2597,66 @@ msgstr ""
 "    * normal: ������� ��������� ����� 80x25.\n"
 "    * <number>: ������� ��������������� ��������� �����."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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: �� ����� ���������it is able to "
+"boot\n"
+"�� �������� ��������� GNU/Linux ��� ����� ������ ��, ������������� �� "
+"������.\n"
+"������ ��� ������ ������������ ������� ��������� ������������ � "
+"���������������.\n"
+"���� ����� �� ���������, �� ������ �������� ����� ������� �� ���� ������.\n"
+"������ ����������� ��� ������� ����������.\n"
+"\n"
+"\n"
+"�������� �����, ��� �� �� ������ ������ ������ ������ � ���� ��, � ����� "
+"������\n"
+"����� ������� ��������������� ������. �� � ���� ������ ��� �� �������� "
+"�����������\n"
+"����������� �������!"
+
+#: ../../help.pm_.c:692
+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 ""
+"�������� ��������� SLILO:\n"
+"  - ��������� ����������: �����������, ���� �� ������ �������� ����������,\n"
+"����������� ��� �������� GNU/Linux. ���� �� ������ �����, ��� �������,\n"
+"��������� \"������ ������ ���������� (MBR)\".\n"
+"\n"
+"\n"
+"  - �������� �� ��������� ����� ��������� ������: ������ ����� � �������\n"
+"����� ������� � ������� ������� ��������� ���� ����� ��������� ������� "
+"������.\n"
+"��� ������� ��� ������, ����� ����������� � �������� ����� ����� �����\n"
+"��������� ����������. ��������� �� ����, ���� \"delay\" \n"
+"�� ����������, ��� ���������� �� ����."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -1975,7 +2668,7 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 "������ ����� ��������� X Window System, ������� ��������\n"
-"������� Linux GUI (����������� ���������������� ���������). ��� ����\n"
+"������� GNU/Linux GUI (����������� ���������������� ���������). ��� ����\n"
 "���� ���� ��������� ���������� � �������. ������� ����� ���� �����\n"
 "����������������, ��� ��� ���� ������ ����� �������� � ��������\n"
 "���������� ��������� � ������������� ��������� ��������� :)\n"
@@ -1985,7 +2678,7 @@ msgstr ""
 "�� ��� ���������. ���� ���, �� ������ ��������� � �������� ��\n"
 "������� ��� ������."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -1993,7 +2686,7 @@ msgstr ""
 "���� ��� �� �� � ������� � ��������� X , ����������� ��� ��������� ��� \n"
 "���������� ��������� X Window System."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2001,73 +2694,83 @@ msgstr ""
 "���� �� ������������� ����������� ���� (login), �������� \"��\". ����� - \n"
 "\"���\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
 #, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \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"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
-msgstr ""
-"������ �� ������ ������� ��������� �������������� ��������� �������.\n"
 "\n"
-"  - ������������ ����������� �������� �����: ���� �������� �������� ������\n"
-"� �������� �����, �� ��� ������ ��� ������� �������������, ��� ������������\n"
-"��� ������������ ������������� ����� ��������� ������.  - ������� ������� "
-"������: �� ������ ������� ������� ������ ��� ����� \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"
+"\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"
+"\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"
 "\n"
-"  - ������ ������ RAM : � ��������� ������� Linux �� ����� ���������\n"
-"���������� ��� ��������� � ������� ����������� ������. � ����� ������\n"
-"���������� ������ �����. ��������: ����������� � 2-4�� � �������\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."
+msgstr ""
+"������ �� ������ ������� ��������� �������������� ��������� �������.\n"
+"\n"
+"  - ������������ ����������� �������� �����: ���� �������� �������� ������\n"
+"    � �������� �����, �� ��� ������ ��� ������� �������������, ��������� "
+"������\n"
+"    ��������� �������� ������ � ����� ��������� ������. � ���� ���� ������ "
+"������\n"
+"    ���� � ������� ���������, ��, �� ��������� ���������� ���������, �� "
+"���������\n"
+"    ���� ��������\n"
+"\n"
+"-   ������� ������� ������: �� ������ ������� ������� ������ ��� ����� \n"
+"    �������.�� �������������� ����������� ���������� � �����������.\n"
+"    � ������ �������� ��������� \"�������\" \n"
+"\n"
+"  - ������ ������ RAM : � ���������, � ����������� ������������ ���� ��� \n"
+"    ������������ ������� ��������� BIOS �� ������ RAM, ��������� � "
+"����������\n"
+"    � ���������� GNU/Linux ����� �� ���������� ������ ����� RAM. � ����� "
+"������\n"
+"    �� ������ ����� ������ ������ ����� ������. ��������: ����������� � \n"
+"    2 ��� 4�� � ������� �����.\n"
 "\n"
 "  - �������������� ������������ ������� �����������: ���� ������������� �� \n"
-"����������� ������� ������� ����������, (CD-ROM, Floppy, Zip) ��������� "
-"\"mount\n"
-"� \"umount\", �������� ���� ��������. \n"
+"    ����������� ������� ������� ����������, (CD-ROM, Floppy, Zip) ��������� "
 "\n"
+"    \"mount\" � \"umount\", �������� ���� ��������. \n"
 "\n"
 "  - �������� Num Lock ��� �������: ���� ������, ����� Number Lock ��� "
 "�������\n"
-"����� ��������, �������� ���� �������� (��������: Num Lock ��� �� �� ����� "
-"������� ���\n"
-"X)."
+"    ����� ��������, �������� ���� �������� (��������: Num Lock ��� �� �� "
+"����� \n"
+"    ������� ��� X)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2082,98 +2785,119 @@ msgstr ""
 "���� ������ ��������������� ������ ������������ ��������, ������� \n"
 "�������������� ����������."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "�������� ����"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "����� ���������"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 #, fuzzy
 msgid "Hard drive detection"
-msgstr "������������ ����������� �������� �����?"
+msgstr "����������� �������� �����?"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "��������� ����"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "����� ����������"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "������"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "�����. �������� ������"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "�������������� ��������"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "����� �������"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "��������� �������"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "��������� ����"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "������������"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "��������� �������� �����"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 #, fuzzy
 msgid "Configure services"
-msgstr "��������� ��������"
+msgstr "��������� ��������"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "��������� ��������"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "������ ��� root"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "�������� ������������"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "������� ������. ����"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "��������� LILO"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "��������� X Window"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
-msgstr ""
+msgstr "��������������� ���������"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "����� �� �����������"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "������ ������ ����� $f"
+
+#: ../../install_gtk.pm_.c:426
+#, fuzzy
+msgid "Please test the mouse"
+msgstr "������� ��� ����� ����"
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "������� ��� ����� ����"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2183,235 +2907,253 @@ msgstr ""
 "��� ����� �������� ������ (��� ������� ��� ������������).\n"
 "����� �������� ``����� ������������'' � ���������� �� � `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "� ��� ������ ���� ������ swap"
+
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"I can't read your partition table, it's too corrupted for me :(\n"
-"I'll try to go on blanking bad partitions"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"������� �������� �� ��������, ��� ������� ��������� :(\n"
-"���������� ���� ������, ��������� ������ �������"
+"��� ������� swap\n"
+"\n"
+"���-���� ����������?"
 
-#: ../../install_any.pm_.c:351
-msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
-msgstr "���������� �� ���� ����� � ����"
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "������������ ��������� �����:"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "����� ��������� �������"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "������������ ���������� ����� ��� ����� ��������"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "����������"
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "������������ ������� ������"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: ��� �� �������� ������, ���������� �������� ������"
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "������� �������� ���"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "�������� ������ �� ������"
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "������������ ������ Windows ��� loopback"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "���������� ������������ broadcast ��� ������ NIS"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "����� ������ ����� ������ ������������ ��� Linux4Win?"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "������ ������ ����� $f"
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "�������� �������"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"��������� ������, �� � �� ����, ��� �� ��������� ����������,\n"
-"������� ����������� �� ���� ����� � ���� :("
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "������ ��������� ������� � MB: "
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "������������ ����� ������������ %s"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "������ ������� Swap � MB: "
 
-#: ../../install_steps.pm_.c:323
-msgid ""
-"Some important packages didn't get installed properly.\n"
-"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
-msgstr ""
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "������������ ��������� ����� ������� Windows"
 
-#: ../../install_steps.pm_.c:390
-#, fuzzy, c-format
-msgid "Welcome to %s"
-msgstr "����� ���������� � Crackers"
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "������ ������ ������� ��������?"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "�������� ����������"
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "���������� ������ �������� ������� Windows"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "������� �� ���� `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+"��������� ��������� ������� FAT ������� �� ����� ���������� ������, \n"
+"��������� ��������� ������: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "� ��� ������ ���� ������ swap"
+#: ../../install_interactive.pm_.c:112
+#, fuzzy
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr "������ windows ������� ��������������, ��������� ������� ``defrag''"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"��� ������� swap\n"
+"��������!\n"
 "\n"
-"���-���� ����������?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "�������� ����������� ������ ���������"
+"DrakX ������ ������ �������� ������ ������ ������� Windows. ������ "
+"���������: ��� �������� ������. ������� �� ��������� ��������� � \n"
+"��������� scandisk ��� Windows, ���� �� �� ������� ��� �� ��� ��� (� \n"
+"���������� defrag), � ����� ��������� � ���������. �������� ����� \n"
+"��������� ����� ������.\n"
+"���� ������, ������� Ok."
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "����� ������:"
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
+msgstr "����� ������ �� ������ ��������� ��� windows"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr "������: %s\n"
+msgid "partition %s"
+msgstr "������ %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "������ : %d KB\n"
+msgid "FAT resizing failed: %s"
+msgstr "��������� ������� FAT �����������: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "����� ������� ��� ���������"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
+"��� ������� FAT ��� ��������� ������� ��� ���������� loopback (��� "
+"������������ �����)"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "����������"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "���������"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "������� Windows(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "���������"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr "� ��� ��������� ������� ������. �� ����� �� ��� �� ������� Linux?"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "��������� ����������, "
+#: ../../install_interactive.pm_.c:156
+#, fuzzy, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "��� ��������� ������� ����� %s � ������ � ��� ��������"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "���������� ����� "
+#: ../../install_interactive.pm_.c:164
+#, fuzzy
+msgid "Expert mode"
+msgstr "������� �����"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "����� �����"
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "����������� diskdrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "���������� ���������"
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "����������� fdisk"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
-msgstr "��������� ������ %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"������ ����� ������� ��������� %s.\n"
+"�� ���������� �� �������� ��������� ��� ������ `w'"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "��� ����� ����������?"
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "������������ ��������� ����� ������� Windows"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "��������� ������ ������������ �������:"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "���������� �������� ����������"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "������������ ������������ ��������� ��� X11?"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "������ ��������� ����� �� DrakX ����� ��������� �������:"
 
-#: ../../install_steps_gtk.pm_.c:158
-#, fuzzy
-msgid "Please, choose one of the following classes of installation:"
-msgstr "������������ ��������� ����������"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "��������� �� ������� �� ������: %s"
 
-#: ../../install_steps_gtk.pm_.c:199
-#, fuzzy
-msgid "You don't have any windows partitions!"
-msgstr "� ��� �� ������� ������� ��������!"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "����������� � ����"
 
-#: ../../install_steps_gtk.pm_.c:201
-#, fuzzy
-msgid "You don't have any enough room for Lnx4win"
-msgstr "� ��� �� ������� ������� ��������!"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "���������� ����"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"��������!\n"
-"\n"
-"DrakX ������ ������ �������� ������ ������ ������� Windows. ������ "
-"���������: ��� �������� ������. \n"
-"��������� scandisk, ���� �� �� ������� ��� �� ��� ���.(� \n"
-"���������� defrag) �� ���� �������, � ����� �������� ��������� ����� "
-"������.\n"
-"���� ������, ������� Ok."
+"��������� ������, �� � �� ����, ��� �� ��������� ����������,\n"
+"������� ����������� �� ���� ����� � ���� :("
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "���� ��������� ������� �����������"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "������������ ����� ������������ %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-#, fuzzy
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "����� ������ ����� ������ ������������ � �������� ���������?"
+#: ../../install_steps.pm_.c:375
+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 ""
+"��������� ������ ������ �� ������������ ���������.\n"
+"���� ��� �������� CD, ���� CDROM �� � �������.\n"
+"��������� cdrom �� ������������� ���������� �������� \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_gtk.pm_.c:284
-#, fuzzy
-msgid "Choose the sizes"
-msgstr "����� ������ �������"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "����� ���������� � %s"
 
-#: ../../install_steps_gtk.pm_.c:286
-#, fuzzy
-msgid "Root partition size in MB: "
-msgstr "�������� ������"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "�������� ����������"
 
-#: ../../install_steps_gtk.pm_.c:288
-#, fuzzy
-msgid "Swap partition size in MB: "
-msgstr "������ � MB:"
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "������� �� ���� `%s'\n"
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+"�� ����� ������� ���� ��������. ����� ���������� ��������� ��� ���������\n"
+"Linux-Mandrake. ���� ��� ��������, �������������� ��������� ����������. ��� "
+"�����\n"
+"������� `F1' ��� �������� � CDROM, � ����� �������� `text'."
+
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
+msgstr "�������� ���� �� ��������� ������� ���������:"
+
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
-msgstr ""
+msgstr "����� ����� ��� ��������� ���� ����� ���������� �������� %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2419,8 +3161,13 @@ msgid ""
 "A low percentage will install only the most important packages;\n"
 "a percentage of 100%% will install all selected packages."
 msgstr ""
+"���� �� ������ ���������� ������� �����, ������� ������� \n"
+"�������, ������� �� ������ ����������.\n"
+"\n"
+"��� ������ ��������� ����������� ������ �������� ������ ������;\n"
+"�������� 100%% �������� � ��������� ���� ��������� �������."
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2429,106 +3176,198 @@ msgid ""
 "A low percentage will install only the most important packages;\n"
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
+"� ��� ���� ����� �� ����� ������ ��� %d%% �� ���� �������.\n"
+"\n"
+"���� �� ������ ���������� ������, ������� � ��������� ����,\n"
+"�������, ������� �� ������ ����������.\n"
+"��� ������ ��������� ����������� ������ �������� ������ ������;\n"
+"�������� %d%% �������� � ��������� ����������� ���������� ������ �������."
 
-#: ../../install_steps_gtk.pm_.c:333
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "����� ������ ����� ����� ����� ������� �� ��������� ����"
 
-#: ../../install_steps_gtk.pm_.c:335
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
-msgstr "����� �������"
+msgstr "������� ������� ��� ���������"
 
-#: ../../install_steps_gtk.pm_.c:376
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "����� ������� ��� ���������"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "����������"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "���������"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
-msgstr "�������� �������������"
+msgstr "�������������� �������� �������������"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "���������� ������"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "�������� ������"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
-msgstr ""
+msgstr "������������ ����� ����������� �� ������� � ������� ��������������"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "������ ������"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
-msgstr ""
+msgstr "���: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "������: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "������ : %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
-msgstr ""
+msgstr "��������: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
-#, fuzzy, c-format
+#: ../../install_steps_gtk.pm_.c:363
+#, c-format
 msgid "Total size: %d / %d MB"
-msgstr "����� ������:"
+msgstr "����� �����: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
-msgid "This is a mandatory package, it can't be unselected"
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
 msgstr ""
+"������ �������� ���� �����, ��������� ��� ��� ��������� �� �������� �����"
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "�������� � �������� �� ������� ��������� ������"
+
+#: ../../install_steps_gtk.pm_.c:387
+#, fuzzy
+msgid "The following packages are going to be removed"
+msgstr "�������� � ���������/�������� �� ������� ��������� ������"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "�� �� ������ �������/�������� ����� ����� ������"
+
+#: ../../install_steps_gtk.pm_.c:416
+msgid "This is a mandatory package, it can't be unselected"
+msgstr "��� ������������ �����, �� ���� ������ ����������"
+
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
-msgstr ""
+msgstr "������ �������� ����� ����� ������, �� ��� ����������."
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
+"���� ����� ������� ��������\n"
+"�� �������, ��� ������ �������� ��� �����?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:496
-#, fuzzy
-msgid "The following packages are going to be installed/removed"
-msgstr "�������� � �������� �� ������� ��������� ������"
+msgstr "������ �������� ����� ����� ������. �� ������ ���� ��������"
 
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr ""
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "���������"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "�����"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "��������� ����������, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "���������� ����� "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "����� �����"
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "������"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "���������� ���������"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "�������: %d "
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "��������� ������ %s"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Accept"
+msgstr "������� ������������"
+
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2537,201 +3376,411 @@ msgid ""
 "done.\n"
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
+"������� Cd-Rom!\n"
+"\n"
+"�������� Cd-Rom ��� ��������� \"%s\" � �������� � ������� Ok.\n"
+"���� � ��� ��� ���, ������� �������� (Cancel), ����� �������� ��������� � "
+"����� �����."
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
 #, fuzzy
-msgid "There was an error installing packages:"
+msgid "Refuse"
+msgstr "��������� �������"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "��� ����� ����������?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
 msgstr "��������� ������ ������������ �������:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_gtk.pm_.c:573
+msgid "There was an error installing packages:"
+msgstr "��� ��������� ������� ��������� ������:"
+
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "��������� ������"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+msgstr "�������, ����� ���� ������������"
+
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "����������"
 
-#: ../../install_steps_interactive.pm_.c:73
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
-msgstr "������� ��� ����������"
+msgstr "������� ��������� ����������"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
-msgstr ""
+msgstr "�� ������ ������� ������ �����, ������� ����� �������� ����� ���������"
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr "�������� ������"
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
-msgstr "����� �������� ��� ��������������"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "����� ���������"
 
-#: ../../install_steps_interactive.pm_.c:100
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "�������� ����� ���������"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "���������/����������"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "��� ��������� ��� ����������?"
 
-#: ../../install_steps_interactive.pm_.c:110
-#, fuzzy
-msgid "Automated"
-msgstr "�������������� IP"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr "�������������"
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "���������"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "�������"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
+"�� �������, ��� ��������� ���������? \n"
+"��� ����� ����� �������� ������, �� ����� ������� ��������.\n"
+"\n"
+"��� ����� �������� ������� �����: ``������������ ������� ���� ��� "
+"�������?'',\n"
+"�� ������ �������� �� ����� �������?"
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "����������"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "���������"
+#: ../../install_steps_interactive.pm_.c:222
+#, fuzzy
+msgid "Workstation"
+msgstr "����������"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "�����������"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:141
+#: ../../install_steps_interactive.pm_.c:228
 #, fuzzy
-msgid "Which usage is your system used for ?"
-msgstr "����� ��� ��������� ����?"
+msgid "What is your system used for?"
+msgstr "������ ���������� ����� �������?"
 
-#: ../../install_steps_interactive.pm_.c:152
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "������� ��� ����� ����"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "���� ����"
 
-#: ../../install_steps_interactive.pm_.c:161
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:252
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "� ������ ����������������� ����� ���������� ���� ����?"
 
-#: ../../install_steps_interactive.pm_.c:172
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "��������� ���� PCMCIA ..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
-msgstr "���������"
+msgstr "��������� IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
-msgstr ""
+msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "��� ��������� ��������"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "����� ������ ����� ������ ������������ � �������� ���������?"
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "�������� ����� ������������"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, fuzzy, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"������� �������� �� ��������, ��� ������� ��������� :(\n"
+"���������� ����������, ������� ������ ������� � ��� ������ ��������\n"
+"(%s)"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"���������� �� ���� ����� � ����DiskDrake �� ���� ��������� ��������� ������� "
+"��������.\n"
+"����������� �� ���� ����� � ����!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "�������� ������"
+
+#: ../../install_steps_interactive.pm_.c:338
+msgid "What is the root partition (/) of your system?"
+msgstr "����� �������� ��� ��������������"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "����� ����������� ������� �������� �������������, ���������������"
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "����� �������� ��� ��������������"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
-msgstr ""
+msgstr "��������� ������ �����?"
 
-#: ../../install_steps_interactive.pm_.c:248
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
-msgstr "�������������� �������� %s"
+msgstr "�������������� ��������"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
-msgstr ""
+msgstr "�������� � �������������� ����� %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "������������� ������ ������ (swap) ��� ���������, ������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "�������� ��������� �������"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "����� ������� ��� ����������"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr ""
+#: ../../install_steps_interactive.pm_.c:433
+#, fuzzy, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
+msgstr "� ����� ������� �� �������� ����� ��� ��������� ��� ����������"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Complete (%dMB)"
+msgstr "��������� (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
+msgstr "������� (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Recommended (%dMB)"
+msgstr "������������� (%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "���������"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "�������� ����������� ������ ���������"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "����� ������ �������"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 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 ""
+"���� � ��� ���� ��� CD �� ������������ ���� ������, ������� Ok.\n"
+"���� � ��� ��� �� ������ �� ���, ������� ��������.\n"
+"���� ����������� ������ ��������� CD, �������� �� ����� � ������� Ok."
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr ""
+msgstr "Cd-Rom ��� ������ \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2739,178 +3788,11 @@ msgstr ""
 "��������� ������ %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "��������� ����� ���������"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "���������� ������� ������������ IP"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "������������������� ����"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "�� ������������� ������� ������"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "������������ ����"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "��������� LAN ��� ������. ������ �� ��:"
-
-#: ../../install_steps_interactive.pm_.c:421
-#, fuzzy
-msgid "Do you want to configure a local network for your system?"
-msgstr "������ �� �� ��������� ������� ������������?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "������� ����� �� �������"
-
-#: ../../install_steps_interactive.pm_.c:449
-#, fuzzy
-msgid "Modem Configuration"
-msgstr "���������"
-
-#: ../../install_steps_interactive.pm_.c:450
-#, fuzzy
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "������ �� �� ��������� ������� ������������?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "��������� �������� ���������� %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"���������� ������� IP ������������ ��� ����� ������.\n"
-"������ ����� ������ ���� �������� ��� IP ����� � ���������-�������� \n"
-"������� (��������, 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "�������������� IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP �����:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "����� ����"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "bootp/dhcp"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP ����� ������ ���� � ������� 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "��������� ����"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"������� ��� ����� ������ (host).\n"
-"��� ����� ������ ������ ���� ������ ���������,\n"
-"�������� ``mybox.mylab.myco.com''.\n"
-"�� ������ ����� ������ IP ����� �����, ���� �� � ��� ����."
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS ������:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "����������-����:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "����:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "��� ������:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "����������� ����� �����?"
-
-#: ../../install_steps_interactive.pm_.c:521
-#, fuzzy
-msgid "Please choose which serial port your modem is connected to."
-msgstr "� ������ ����������������� ����� ��������� �����?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "��������� Dialup"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "��� ����������"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "����� ��������"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "���"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "��������������"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "�� ���� �������"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "�� ���� ���������"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "��� ������"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "������ ������ DNS"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "������ ������ DNS:"
-
-#: ../../install_steps_interactive.pm_.c:549
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2967,7 +3849,7 @@ msgstr ""
 "\n"
 "�� � ���� ������ �� Mandrakesoft, �� �� ����������� � ���������� �� "
 "��������\n"
-"�� ����������������, ������� ��� ��������� ���� (�������, �� �� \n"
+"�� ����������������, �������� ��� ��������� ���� (�������, �� �� \n"
 "������������� ��������� ��������, ����������� �������, ������� ������������ "
 "������ �\n"
 "������� ��������, � ����� ���������� ��������� � �������� ����������� "
@@ -2982,89 +3864,93 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "����� ������� ��� ��������� �������"
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "����� � �������� ��� ��������� ������ ��������� �������"
 
-#: ../../install_steps_interactive.pm_.c:592
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "����� ������� ��� ���������"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
 msgstr "����� ��� ��������� ����?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "���� ��������� ���� ����������� �� GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "������ ������ ������� ��������?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "��� ������"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "������������ ������� ����"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "����"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "������������ ������ MD5"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "������������ NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "������ ��������"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "���� ������ ������� ����� (��� ����� ������ ���� �� ����� %d ��������)"
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "�������������� NIS"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS Domain"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS ������:"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "������� ������������"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "�������� ������������"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "��� ��������� %s"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3074,37 +3960,37 @@ msgstr ""
 "������ ������������\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "����������� ���"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "��� ������������:"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "��������:"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "���� ������ ������� �����"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "������� ��� ������������"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -3112,27 +3998,52 @@ msgstr ""
 "��� ������������ ������ ��������� ����� ������ �� ������ ��������, \n"
 "����� , `-' � `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "��� ��� ������������ ��� ���������"
 
-#: ../../install_steps_interactive.pm_.c:747
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"� ������� �������� ����������� ������� �� ������� ��������� Linux ��� "
+"����������� �� ���������� ����������. ��� ����� ���� �������, ���� �� �� "
+"������ ������������� SLILO, ���� ������ ������������ ������� ������ SLILO, "
+"��� SLILO �� ������ �������� � ����� ������������. �������� ����������� "
+"������� ����� ����� ���� ������������ � ��������� ������� Mandrake, ��� "
+"������� �������� �������������� ������� ����� �������� ����.\n"
+"\n"
+"���� ������ ������� ����������� ���� ��� ����� �������, �������� ������� � "
+"������ \n"
+"�������� � ������� \"Ok\"."
+
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
-msgstr "������ ����"
+msgstr "������ ��������"
 
-#: ../../install_steps_interactive.pm_.c:748
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
-msgstr "������ ����"
+msgstr "������ ��������"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "����������"
 
-#: ../../install_steps_interactive.pm_.c:755
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3145,196 +4056,163 @@ msgid ""
 "system\n"
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
-"� ������� ������������ ����� �� ������� ��������� Linux ����� ��� ��, ��� � "
-"����������� �����������. ��� ����� ���� �������, ���� �� �� ������ "
-"������������� lilo, ���� ������ ������������ ������� ������� lilo, ��� lilo "
-"�� ����� �������� � ����� ������������. ����������� ���� ����� ����� ���� "
-"����������� � ��������� �������� Linux Mandrake, ������� ������� �������� "
-"�������������� ������� ����� ����.\n"
-"\n"
+"�������� ����������� ������� ������������ ����������� �������� Linux ��� "
+"����������� �� ���������� ����������. ��� ����� ���� �������, ���� �� �� "
+"������ ������������� LILO (��� grub), ��� ���� ������ ������������ ������� "
+"������ LILO, ��� LILO �� ������ �������� � ����� ������������. �������� "
+"����������� ������� ����� ����� ���� ������������ � ��������� ������� "
+"Mandrake, ��� ������� �������� �������������� ������� ����� �������� ����.\n"
 "������ ������� ����������� ���� ������?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "��������, �� �������� ����������"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "�������� ��������, � ������� ����� ����������� ����������� �������"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "�������� ������� � �������� %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "�������� ����������� �������"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "��������� LILO �� ������. ��������� ��������� ������:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "�� ������ ������������ SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "������� ����� SILO"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"� SILO ���� ��������� ������.\n"
-"�� ������ �������� ���, ��� �������� ������������."
-
-#: ../../install_steps_interactive.pm_.c:858
-#, fuzzy
-msgid "Partition"
-msgstr "�������� ������"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "��� ����� ��� ������������"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "��������� SILO �� ������. ��������� ��������� ������:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "��������������� ���������..."
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "�� ������ ������������ aboot?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
+"������ ��������� aboot, \n"
+"����������� ������� ��������� ��������, ���� ���� ��� �������� ������ ������?"
 
-#: ../../install_steps_interactive.pm_.c:930
-msgid "Proxies configuration"
-msgstr "��������� proxy"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy ������ ���� http://..."
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "��������� bootloader �� ������. ��������� ��������� ������:"
 
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy ������ ���� ftp://..."
-
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "����� ���������� � Crackers"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "��������"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "�������"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "�������"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "��������������"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "�������������� �������"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(����� ������� ������ ������)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "������������ ����������� �������� �����?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "������� ������������"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "������� ������ ������ RAM (������� %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "���������������� ������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "��������� num lock ��� �������"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "������� ������ RAM � Mb"
 
-#: ../../install_steps_interactive.pm_.c:984
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
-msgstr "������� ������������"
+msgstr "������ ������������ supermount ��� ������� ������ ������������"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
+"���������: ��� ���� ������ ������������ ������ ����� � ������� ��� ROOT!\n"
+"���� ������ �������� ��� root, ������� ������� ������������� � ����������� "
+"\"su\".\n"
+"� �����, �� ������������� ������������ ������ �����, ��� � �������� "
+"�������.\n"
+"��� ������������."
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "����������� ����� PCI ����������"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
+"������ ���������, ��� ��������� numlock ������, ��� ������� ������ ����� \n"
+"������ ������� ���� (��������: ������� `p' ����� ���� `6')"
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "������������ ������������ ��������� ��� X11?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
+"������ ������������� ����-����������������� ������� ��� ������������ linux?"
 
-#: ../../install_steps_interactive.pm_.c:1038
-#, fuzzy, c-format
+#: ../../install_steps_interactive.pm_.c:1030
+#, c-format
 msgid "Insert a blank floppy in drive %s"
-msgstr "�������� ������� � �������� %s"
+msgstr "�������� ������ ������� � �������� %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
-msgstr "���������� ���������"
+msgstr "�������� ����-����������������� �������"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3343,7 +4221,7 @@ msgstr ""
 "��������� ���� �� ���������.\n"
 "�� ������������� ������ ����� ������?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3362,153 +4240,18 @@ msgstr ""
 "���������� � ��������� ����� ������� ���� � �����-������������\n"
 "����� ������ ����������� ������������ �� ������������ Linux-Mandrake."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Shutting down"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "��������� �������� ��� %s ����� %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(������ %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "����� %s ������� ��� �����������?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"� ��������� ������� %s �������� ����� ��������� �������������� ����������,\n"
-"���� ������ ��� �� ���������. �� ������ �� �� ������ ��� ����\n"
-" �������������� �����, ��� ��������� �������� �������������� ������\n"
-"� ������� ����������� ����������? ��������, ������������ �������� ���������, "
-"�� ��� \n"
-"������ �� �������."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "���������"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "������� ���������"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "�� �� ������ ������ ����� ������ %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"�� �� ������ ������ ����� ������ %s.\n"
-"����� - � ������� ``���=�������� ���2=��������2 ...''.\n"
-"��������, ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "����� ������:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"�������� ������ %s �� ������.\n"
-"������ ����������� ��� � ������� �����������?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "����������� ����� ����� PCMCIA?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "��������� ���� PCMCIA ..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "����������� ����� %s ����������"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "������� %s %s ����������"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "���� �� � ��� ������?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "���� �� � ��� %s ���������?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "���"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "��"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "��. �������� ������������"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "����������� � ����"
-
-#: ../../install_steps_interactive.pm_.c:1207
-#, fuzzy
-msgid "Bringing down the network"
-msgstr "����������� � ����"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr " ��������� Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 " <Tab>/<Alt-Tab> ����� ����������  |  <Space> �����  |  <F12> ��������� �����"
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "��������� ����������"
 
@@ -3518,7 +4261,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "���������������� (%s), ������ ��������\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "������ �����, ���������� ���\n"
 
@@ -3532,460 +4275,955 @@ msgstr " ? (��������� %s) "
 msgid "Your choice? (default %s) "
 msgstr "��� �����? (��������� %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "��� �����? (��������� %s ������� 'none' ��� ����������) "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "�����������"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "UK ����������"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "US ����������"
 
-#: ../../keyboard.pm_.c:107
-#, fuzzy
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
-msgstr "���������"
+msgstr "��������� (������)"
 
-#: ../../keyboard.pm_.c:108
-#, fuzzy
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
-msgstr "��������� (������������)"
+msgstr "��������� (�������)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "��������� (������������)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr "��������������� (��������)"
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr "��������������� (��������)"
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "�����������"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "����������� (ABNT-2)"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "�e���������"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "����������� (�������� ���������)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "����������� (����������� ���������)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
-msgstr ""
+msgstr "�������� (��� ead keys)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr "Dvorak (���)"
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (����������)"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "���������� (\"�������\" ���������)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "���������� (\"���������\" ���������)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
-msgstr ""
+msgstr "����������"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "�����"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "����� (������������)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr "��������"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "�����������"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr "�������� 106 ������"
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "������-������������"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "�����������"
 
-#: ../../keyboard.pm_.c:140
-#, fuzzy
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
-msgstr "��������� AZERTY"
+msgstr "��������� AZERTY (������)"
 
-#: ../../keyboard.pm_.c:142
-#, fuzzy
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
-msgstr "��������� AZERTY"
+msgstr "��������� AZERTY (�����)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "��������� \"����� ����\" QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "��������� \"������������\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
-#, fuzzy
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
-msgstr "����������� (�������� ���������)"
+msgstr "�������� (qwerty)"
 
-#: ../../keyboard.pm_.c:147
-#, fuzzy
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
-msgstr "����������� (�������� ���������)"
+msgstr "�������� (qwertz)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "�������������"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "��������� (������)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
-msgstr "������� (������)"
+msgstr "������� (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "������� ����������"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "�������� ������������ \"F\" ������)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "�������� (����������� \"Q\" ������)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "US ���������� (�����������������)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "����������� \"�������� ���\" QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "�����������"
 
-# 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.
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun - Mouse"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "�������������"
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "�������"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "����������������"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (����������������, ������ ��� C7)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "��� ����"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "�����"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "��� ����"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "��� �����?"
+
+#: ../../netconnect.pm_.c:93
+msgid "Internet configuration"
+msgstr "��������� ��������"
+
+#: ../../netconnect.pm_.c:94
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "������ ��������� ��������-���������� ������?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "��������� ��������-����������"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "�� �������������� � ��������"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "�������������� � ��������"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+msgid "ISDN Configuration"
+msgstr "��������� ISDN"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"�������� ����������.\n"
+" ���� ��� ��� � ������, �������� Unlisted"
+
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "��������� ��������"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr "��������� ���� �����"
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr "IRQ �����"
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr "����� (DMA) �����"
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr "IO �����"
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr "IO_0 �����"
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr "IO_1 �����"
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr "��� ������ ���������� �����"
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr "��� ���������� (����. ���������.net"
+
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
+msgstr "����� �������� ����������"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr "dns 1 ����������"
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr "dns 2 ����������"
+
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
+msgstr "����� �������"
+
+#: ../../netconnect.pm_.c:174
+#, fuzzy
+msgid "Account Login (user name)"
+msgstr "������� ��� (login)"
+
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
+msgstr "������"
+
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
+msgstr "����������� ������"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr "������"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr "������ (EDSS1)"
+
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "�������� ��������"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr "��������� ��� - ��� D-������ (���������� �����)"
+
+#: ../../netconnect.pm_.c:214
+msgid "Which protocol do you want to use ?"
+msgstr "����� �������� ����� ��������������"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr "� �� ����"
+
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
+msgstr "����� � ��� ��� �����?"
+
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
+msgstr "����������?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr "��������"
+
+#: ../../netconnect.pm_.c:245
 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"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
-"Dobro pozhalovat' v dispetcher vybora operacionnoj sistemy LILO!\n"
-"Chtoby vyvesti spisok vozmozhnyh variantov, nazhmite <TAB>\n"
 "\n"
-"Chtoby odnu iz nih, napishite ee nazvanie i nazhmite <ENTER>\n"
-"ili zhdite %d sekund zagruzki po umolchaniyu.\n"
+"���� � ��� ����� ISA, �� �������� �� ��������� ������ ������ ���� �������.\n"
 "\n"
+"���� � ��� ����� PCMCIA, �� ��� ���� ����� irq � io ����� �����.\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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr ""
+#: ../../netconnect.pm_.c:257
+msgid "Which is your ISDN card ?"
+msgstr "����� � ��� ����� ISDN?"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr ""
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr "������� ����� ISDN :\n"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../netconnect.pm_.c:287
+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."
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr ""
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr "����� ISDN PCI �� ����������. �������� �� �� ��������� ������."
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
+#: ../../netconnect.pm_.c:331
+#, fuzzy
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
+"�� ����� ������ �� �������� ������� ethernet �������. ��������� �������� "
+"��������� ������������."
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "����� �������� ����������"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "� ������ ����������������� ����� ���������� ���� ����?"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "������� ���������"
+
+#: ../../netconnect.pm_.c:352
+msgid ""
+"\n"
+"Do you agree?"
 msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "������ �������������� ���������?"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "��������� ISDN"
+
+#: ../../netconnect.pm_.c:469
+msgid "Do you want to start your connection at boot?"
+msgstr "��������� ���� ���������� ��� ��������?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "����������� ����� �����?"
+
+#: ../../netconnect.pm_.c:539
+msgid "Please choose which serial port your modem is connected to."
+msgstr "��������, � ������ ����������������� ����� ��������� �����."
+
+#: ../../netconnect.pm_.c:544
+msgid "Dialup options"
+msgstr "��������� Dialup"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "��� ����������"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
+msgstr "����� ��������"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "��� (Login ID)"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "��������������"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "�� ���� �������"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "�� ���� ���������"
+
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr "��� ������"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "������ ������ DNS"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "������ ������ DNS:"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "�������������� � ��������"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "��������� ��������-����������"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "�� �������������� � ��������"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
 msgstr ""
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "�� �������������� � ��������"
+
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "�������������� � ��������"
+
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "������������� �� ��������"
+
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "��������� ��������-����������"
+
+#: ../../netconnect.pm_.c:597
+msgid "Internet connection & configuration"
+msgstr "������������� � ��������� ��������"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
 
-#: ../../mouse.pm_.c:21
+#: ../../netconnect.pm_.c:641
 #, fuzzy
-msgid "Sun - Mouse"
-msgstr "USB ����"
+msgid "Configure a normal modem connection"
+msgstr "��������� ��������-����������"
 
-#: ../../mouse.pm_.c:23
+#: ../../netconnect.pm_.c:661
 #, fuzzy
-msgid "Apple ADB Mouse"
-msgstr "ATI Bus Mouse"
+msgid "Configure an ISDN connection"
+msgstr "��������� ��������-����������"
+
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr "���������� ����� ISDN"
 
-#: ../../mouse.pm_.c:24
+#: ../../netconnect.pm_.c:668
 #, fuzzy
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "USB ���� (3 ������ ��� �����)"
+msgid "External ISDN modem"
+msgstr "������� �����"
 
-#: ../../mouse.pm_.c:25
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+msgid "Connect to the Internet"
+msgstr "�������������� � ��������"
+
+#: ../../netconnect.pm_.c:672
+msgid "What kind is your ISDN connection?"
+msgstr "����� ��� ISDN ��������� ������������?"
+
+#: ../../netconnect.pm_.c:691
 #, fuzzy
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "USB ���� (3 ������ ��� �����)"
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "��������� ��������-����������"
 
-#: ../../mouse.pm_.c:26
+#: ../../netconnect.pm_.c:700
+msgid "France"
+msgstr "�������"
+
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr "������ ������"
+
+#: ../../netconnect.pm_.c:706
 #, fuzzy
-msgid "Apple USB Mouse"
-msgstr "USB ����"
+msgid "In which country are you located ?"
+msgstr "� ����� ������ �� ���������� ?"
 
-#: ../../mouse.pm_.c:27
+#: ../../netconnect.pm_.c:712
 #, fuzzy
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "USB ���� (3 ������ ��� �����)"
+msgid "Alcatel modem"
+msgstr "������� �����"
 
-#: ../../mouse.pm_.c:28
+#: ../../netconnect.pm_.c:714
 #, fuzzy
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "USB ���� (3 ������ ��� �����)"
+msgid "ECI modem"
+msgstr "������� �����"
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "Generic Mouse (PS/2)"
+#: ../../netconnect.pm_.c:718
+#, fuzzy
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "���� ��� adsl ����� �� alcatel, �������� pptp alcatel. ����� , pppoe."
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "Generic 3 Button Mouse (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "��������� ��������-����������"
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "����� �������� ����� ��������������"
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "��������� ��������-����������"
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "��������� ����"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "������������ ����"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "������ �������������� ���������?"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "��������� ����"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus Mouse"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "�������������� � ��������"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus Mouse"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "��������� LAN ��� ������. ������ �� ��:"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus Mouse"
+#: ../../netconnect.pm_.c:836
+msgid "How do you want to connect to the Internet?"
+msgstr "��� �� ������ �������������� � ��������?"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB ����"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "������������ ����"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB ���� (3 ������ ��� �����)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "��� ����"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "������� ����� �� �������"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A ��� ���� (����������������))"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "��������� ����"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (����������������)"
+#: ../../network.pm_.c:274
+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''."
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (����������������)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+#, fuzzy
+msgid "Host name"
+msgstr "��� ������:"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (����������������)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (����������������)"
+#: ../../network.pm_.c:302
+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 ""
+"���������� ������� IP ������������ ��� ����� ������.\n"
+"������ ����� ������ ���� �������� ��� IP ����� � ���������-�������� \n"
+"������� (��������, 1.2.3.4)."
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (����������������)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "��������� �������� ���������� %s"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (����������������)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "�������������� IP"
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (����������������)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "IP address"
+msgstr "IP �����:"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (����������������, ������ ��� C7)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Netmask"
+msgstr "����� ����"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (����������������)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "bootp/dhcp"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "Generic Mouse (����������������)"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP ����� ������ ���� � ������� 1.2.3.4"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft compatible (����������������)"
+#: ../../network.pm_.c:341
+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 ""
+"������� ��� ����� ������ (host).\n"
+"��� ����� ������ ������ ���� ������ ���������,\n"
+"�������� ``mybox.mylab.myco.com''.\n"
+"�� ������ ����� ������ IP ����� �����, ���� �� � ��� ����."
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Generic 3 Button Mouse (����������������)"
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "DNS ������:"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (����������������)"
+#: ../../network.pm_.c:347
+#, fuzzy
+msgid "Gateway"
+msgstr "����:"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "��� �����?"
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "����������-����:"
+
+#: ../../network.pm_.c:358
+msgid "Proxies configuration"
+msgstr "��������� proxy"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy ������ ���� http://..."
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy ������ ���� ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
-msgstr ""
+msgstr "����������� ������� �� �������������� �� ���� ���������"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -3995,93 +5233,104 @@ msgstr ""
 "������������ ����� ������� � ���, ����� ����������� ��������� ������� "
 "���,����� ���� ��� ����� �� ����������� (extended) ��������"
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "������ ������ ����� %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "�������������� �� ����� %s: ����������� %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "������ ���� � ��������� ������"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "������ ������ � ���� %s"
 
 #: ../../pkgs.pm_.c:20
 msgid "mandatory"
-msgstr ""
+msgstr "�����������"
 
 #: ../../pkgs.pm_.c:21
 msgid "must have"
-msgstr ""
+msgstr "���� �����"
 
 #: ../../pkgs.pm_.c:22
 msgid "important"
-msgstr ""
+msgstr "�����"
 
 #: ../../pkgs.pm_.c:24
 msgid "very nice"
-msgstr ""
+msgstr "������ ����������"
 
 #: ../../pkgs.pm_.c:25
-#, fuzzy
 msgid "nice"
-msgstr "����������:"
+msgstr "����������"
 
 #: ../../pkgs.pm_.c:26 ../../pkgs.pm_.c:27
-#, fuzzy
 msgid "interesting"
-msgstr "��������� �������"
+msgstr "���������"
 
 #: ../../pkgs.pm_.c:28 ../../pkgs.pm_.c:29 ../../pkgs.pm_.c:30
 #: ../../pkgs.pm_.c:31
-#, fuzzy
 msgid "maybe"
-msgstr "�����"
+msgstr "����� � ���"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
-msgstr ""
+msgstr "i18n (�����)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
-msgstr ""
+msgstr "i18n (������ ����������)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
-msgstr ""
-
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "�������� ������"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "�������� ������"
+msgstr "i18n (����������)"
 
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "��������� �������"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+#, fuzzy
+msgid "Remote printer"
+msgstr "����� ���������� �������� lpd"
+
+#: ../../printer.pm_.c:21
+#, fuzzy
+msgid "Remote CUPS server"
+msgstr "��������� �������"
+
+#: ../../printer.pm_.c:22
+#, fuzzy
+msgid "Remote lpd server"
 msgstr "��������� lpd"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "������� ���������"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "�������:"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "����������� ���������..."
@@ -4095,12 +5344,11 @@ msgstr "�������� ������"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "������� ������ \"%s\" ��������� �� "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "��������� �������"
 
-#: ../../printerdrake.pm_.c:45
-#, fuzzy
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4108,16 +5356,15 @@ msgstr ""
 "� ������ ���������� ��������� ��� ������� \n"
 "(/dev/lp0 ������������ LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:47
-#, fuzzy
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "�������:"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "����� ���������� �������� lpd"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4127,20 +5374,19 @@ msgstr ""
 "������� � ��� ������� ������, � ������� ��������� ������ ����� �������� "
 "�������."
 
-#: ../../printerdrake.pm_.c:66
-#, fuzzy
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "��������� ������:"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "��������� �������"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "����� �������� SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4153,27 +5399,27 @@ msgstr ""
 "�������, ��������� � ��������� ���������, ��� ������������, ������ � "
 "���������� � ������� ������."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "��� ������� SMB"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP ������� SMB"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "��� �������"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "������� ������"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "����� �������� NetWare"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4184,154 +5430,224 @@ msgstr ""
 "NetWare (�� ������ ��������� � ������ � ���� TCP/IP) � ��� �������, "
 "��������������� ���������� ��������, � ����� ��� ������������ � ������."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "������ ������"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "��� �������"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "����� ���������� ��������"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "����� ��������"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "��������"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "�������� ��� ��������:"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "������ �������������� ������?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "������ �������� �������"
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"�������� �������� ���������� ������ ������.\n"
+"������ ��� ������� ���������� ����� ������ ��������� �����.\n"
+"������ ������:\n"
+"%s\n"
+"\n"
+"�� �������� ���������?"
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"�������� �������� ���������� ������ ������.\n"
+"������ ��� ������� ���������� ����� ������ ��������� �����.\n"
+"�� �������� ���������?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "��, �������� �������� ������ ASCII"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "��, �������� �������� ������ PostScript"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "��, ���������� ��� �������� ������"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "��������� ��������"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "�������� ��� ��������:"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "����� ��������"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "������ ������"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "������� ������ ����� ������?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "��������� �������� Uniprint"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "��������� ������� �����"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
-msgstr ""
+msgstr "�������� ����� ��� PostScript"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
-msgstr ""
+msgstr "�������� ������� �������"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "���������� \"����������� ������\"?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
-msgstr ""
+msgstr "���������� ������� �� �����"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
-msgstr ""
+msgstr "������/����� ���� � ������� (1/72 �����)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr ""
+msgstr "�������/������ ���� � ������� (1/72 �����)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
-msgstr ""
+msgstr "�������������� ��������� ��� GhostScript"
 
-#: ../../printerdrake.pm_.c:187
-#, fuzzy
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
-msgstr "��������� ������� �����"
-
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "������ �������������� ������?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "������ �������� �������"
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"�������� �������� ���������� ������ ������.\n"
-"������ ��� ������� ���������� ����� ������ ��������� �����.\n"
-"������ ������:\n"
-"%s\n"
-"\n"
-"�� �������� ���������?"
-
-#: ../../printerdrake.pm_.c:222
-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?"
-msgstr ""
-"�������� �������� ���������� ������ ������.\n"
-"������ ��� ������� ���������� ����� ������ ��������� �����.\n"
-"�� �������� ���������?"
+msgstr "�������������� ��������� ��� ������"
 
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "�������"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "������ ��������� �������?"
 
-#: ../../printerdrake.pm_.c:243
-#, fuzzy
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
 msgstr ""
-"� LILO ���� ��������� ������.\n"
+"������� ��������� ������� ������.\n"
 "�� ������ �������� ���, ��� �������� ������������."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "�����"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "����� ���� ����������� ��������"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "�������� ��� ����������:"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
 #, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "����� ���� ����������� ��������"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
-msgstr "��������� �������"
+msgstr "������� �������"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+#, fuzzy
+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) � ���������� � ��� �������� ��������. ������� ��� "
+"� ������� ��� ������� � ������ ������������� ��������."
+
+#: ../../printerdrake.pm_.c:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "��������� �������"
+
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "������� ���������"
+
+#: ../../printerdrake.pm_.c:406
 #, fuzzy
+msgid "Location"
+msgstr "����������"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4340,84 +5656,100 @@ msgid ""
 msgstr ""
 "������ ������� ������, � ������� ���������� ������� ��� ������, ������� "
 "�������� ����� (������ lp) � ���������� � ��� �������� ��������. ������� ��� "
-"� ������� ��� �������."
+"� ������� ��� ������� � ������ ������������� ��������."
 
-#: ../../printerdrake.pm_.c:276
-#, fuzzy
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
-msgstr "��� �������:"
+msgstr "��� �������"
 
-#: ../../printerdrake.pm_.c:277
-#, fuzzy
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "���������� ��������:"
 
-#: ../../printerdrake.pm_.c:278
-#, fuzzy
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
-msgstr "����� ���� ����������� ��������"
+msgstr "����������� ��������"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "�� ���� �������� ������ �� _�����������������_ RAID md%d"
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "�� ���� ������ ���� $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
-msgstr ""
+msgstr "mkraid �� ��������"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr ""
+msgstr "mkraid �� �������� (��������, ��� raidtools?)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "������������ �������� ��� RAID ������ %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
-msgstr ""
+msgstr "Anacron, ���������� ��� ���������� ������."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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 ������������ ��� ����������� ��������� ������� � ��� ���������������� "
+"����� syslog.\n"
+"�������� ����� ������������ ��� ���������� ������ ��� ������ ������ �������."
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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 �� �����, ��������� "
+"���\n"
+"������� at, � ��������� ������ ������ ��� ���������� ������ ������� ��������."
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:20
 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 �������� ����������� ���������� UNIX, ������� ��������� ��������� "
+"�������������\n"
+"��������� �� ����������. vixie cron ��������� ����� �������� � ��������� "
+"cron �� \n"
+"UNIX, ������� ������ ������������ � ����� ������ ��������� ���������."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 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 ��������� ��������� ���� ��� ����������, ���������� � ��������� ������, "
+"��� \n"
+"Midnight Commander. �������������� ����� cut-and-paste � ����������� ���� � "
+"\n"
+"������� ��� ������ ����."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
 msgstr ""
+"Apache �������� �������� World Wide Web. �� ������������ ��� ������������ "
+"������ HTML\n"
+"� CGI."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4426,164 +5758,371 @@ msgid ""
 "disables\n"
 "all of the services it is responsible for."
 msgstr ""
+"����� ������������ �������� (���������� ������ inetd) ��������� �� ���� \n"
+"������������� ��������� ��������-�������. �� �������� �� ������ ������ \n"
+"��������, ������� telnet, ftp, rsh, � rlogin. ���������� inetd �������� \n"
+"����� ��� �������, �� ������� �� ��������."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 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 ""
+"���� ����� ��������� ��������� ��������� ���������� � ������������ � \n"
+"/etc/sysconfig/keyboard.  ����� �������������� ��� ������ ������� "
+"kbdconfig.\n"
+"��� ����������� ����� ����� �������� ����������."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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. ���\n"
+"� ������ ������� ������, �������������� ������� �� ������ �� ���������."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
+"named (BIND) �������� �������� �������� ���� (DNS), ������� ������������ ��� "
+"\n"
+"�������������� ���� ����� � IP ������."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
+"��������� � ������������ ��� ������� �������� ������� (NFS), SMB (Lan\n"
+"Manager/Windows), � NCP (NetWare)."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
+"������������/�������������� ��� ������� ����������, ����������� �� ������\n"
+"�� ����� ��������."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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.\n"
+"���� ������ ������������ ���������������� ������� NFS, �������������� �\n"
+"������������ � ������ /etc/exports."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 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.\n"
+"���� ������ ������������ ������������ ������ NFS."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 ������ ����� ��� ��������� ethernet � ������� �� "
+"�����������\n"
+"laptop.  ��� �� �������� �� ��� ���, ���� �� ����� ���������, ����� ������� "
+"\n"
+"�� ��������� �� �������, ��� ��� �� �����, ���������."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 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 ��������� ������������ RPC, ������� ������������ ������ "
+"�����������\n"
+"��� NFS � NIS. ������ portmap ������ �������� �� �������, machines\n"
+"������� ������������� ��� ������� � �����������, ������������� �������� RPC."
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr ""
+"Postfix �������� ������� �������� �����, �� ���� ����������, ������� \n"
+"���������� ����� � ����� ������ �� ������."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
+"��������� � ��������������� ��� ��������� �������� ��� ��������� ��������\n"
+"��������� ��������� �����."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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 ��������� �������������� ���������� ������ IP �������� ����� \n"
+"�������� RIP. � �� ����� ��� RIP ������ ������������ � ��������� �����, ��� "
+"\n"
+"������� ����� ����� ����� ������� ��������� ��������."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
+"�������� rstat ��������� ������������� ���� ��������� \n"
+"��������� ������������������ ��� ���� ����� ����."
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
+"�������� rusers ��������� ������������� ���� ����������, ��� ��������\n"
+"�� ������ ������."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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 ��������� ���������� ������������ �������� ������ ���� "
+"�������������,\n"
+"���������� �� ������ � ������������� ������� rwho (���������� finger)."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:67
 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 - ��� �����������, ������� ���������� ������ ������ ��� ���������\n"
+"��������� � ��������� ����� � ���������� �����������. ������ ������ ����� "
+"syslog."
 
-#: ../../services.pm_.c:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
-msgstr ""
+msgstr "���� ��������� ������ �������� ��������� ������ ��� ���� usb."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
+"��������� � ��������� X Font Server ��� �������� � ���������� (shutdown)"
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr "��������, ����� ������� ��������� ������������� ��� ��������"
 
-# 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.
-#
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
+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 ""
+"������� �������� �� ��������, ��� ������� ��������� :(\n"
+"���������� ���� ������, ��������� ������ �������"
+
+#: ../../standalone/drakboot_.c:25
+#, fuzzy
+msgid "Configure LILO/GRUB"
+msgstr "��������� LILO/GRUB"
+
+#: ../../standalone/drakboot_.c:26
+msgid "Create a boot floppy"
+msgstr "������� ������. ����"
+
+#: ../../standalone/drakboot_.c:28
+msgid "Format floppy"
+msgstr "������������� �������"
+
+#: ../../standalone/drakboot_.c:40
+msgid "Choice"
+msgstr "�����"
+
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "��������� LILO �� ������. ��������� ��������� ������:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr "���������� ��������-���������� �������� "
+
+#: ../../standalone/drakgw_.c:104
+#, fuzzy
 msgid ""
-"Welcome to SILO the operating system chooser!\n"
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently enabled.\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"What would you like to do?"
+msgstr "��������� ���������� ��������-���������� ��� �������.\n"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "�������"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "��������� X Window"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr "���������� ��������-���������� ���������"
+
+#: ../../standalone/drakgw_.c:123
+#, fuzzy
+msgid ""
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently disabled.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or\n"
-"wait %d seconds for default boot.\n"
+"What would you like to do?"
+msgstr "��������� ���������� ��������-���������� ��� �������.\n"
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "�������"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr "�� ������� ���������������� ���������� ����������������� �����."
+
+#: ../../standalone/drakgw_.c:151
+msgid "Internet Connection Sharing"
+msgstr "���������� ��������-����������"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
 msgstr ""
-"Dobro pozhalovat' v dispetcher vybora operacionnoj sistemy SILO!\n"
-"Chtoby vyvesti spisok vozmozhnyh variantov, nazhmite <TAB>\n"
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "����� �������"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr "�� ����� ������ ��� �������� ��������!"
+
+#: ../../standalone/drakgw_.c:211
+#, fuzzy
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"�� ����� ������ �� �������� ������� ethernet �������. ��������� �������� "
+"��������� ������������."
+
+#: ../../standalone/drakgw_.c:218
+#, fuzzy
+msgid ""
+"There is only one configured network adapter on your system:\n"
 "\n"
-"Chtoby odnu iz nih, napishite ee nazvanie i nazhmite <ENTER>\n"
-"ili zhdite %d sekund zagruzki po umolchaniyu.\n"
+"$interface\n"
 "\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+"� ������� ���� ������ ���� ����������� ������� �������:\n"
+"\n"
+"$interface\n"
+"\n"
+"������ ���������� ��������� ���� ����� ���� �������?"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakgw_.c:223
 #, fuzzy
-msgid "Configure LILO/GRUB"
-msgstr "��������� X Window"
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"��������, ����� ������� ������� ����� ��������� � ����� ��������� ����."
 
-#: ../../standalone/drakboot_.c:25
-msgid "Create a boot floppy"
-msgstr "������� ������. ����"
+#: ../../standalone/drakgw_.c:233
+#, fuzzy
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"�� ����� ������ �� �������� ������� ethernet �������. ��������� �������� "
+"��������� ������������."
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+"������������� �������� ������� LAN ��������� � ������� ������������ $_!\n"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakgw_.c:268
 #, fuzzy
-msgid "Format floppy"
-msgstr "������������� ���"
+msgid "Firewalling configuration detected!"
+msgstr "���������� ������������ Firewall.!"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakgw_.c:269
 #, fuzzy
-msgid "Choice"
-msgstr "����������:"
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr "��������! ���������� ������������ ������������ firewall.\n"
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "��������� ��������, ��������� ��������, ������ ��������..."
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "��������� IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr "�� ������� ���������� ipchains RPM ��� ������ urpmi."
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr "�� ������� ���������� dhcp RPM ��� ������ urpmi."
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr "�� ������� ���������� linuxconf RPM ��� ������ urpmi."
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr "�� ������� ���������� bind RPM ��� ������ urpmi."
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr "�� ������� ���������� caching-nameserver RPM ��� ������ urpmi"
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "�����������!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
@@ -4647,23 +6186,36 @@ msgstr "������� ������������"
 msgid "Choose the tool you want to use"
 msgstr "�������� ����������"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "������� ��� ����������"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "�������� ����������"
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "������� ��� ����� ����"
+#: ../../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 ""
+"������� Cd-Rom!\n"
+"\n"
+"�������� Cd-Rom ��� ��������� \"%s\" � �������� � ������� Ok.\n"
+"���� � ��� ��� ���, ������� �������� (Cancel), ����� �������� ��������� � "
+"����� �����."
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
+
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "serial_usb �� ������\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "����������� ������ ������?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "� ������ ����������������� ����� ���������� ���� ����?"
 
@@ -4876,8 +6428,846 @@ msgstr "����� �������"
 msgid "Finding leaves takes some time"
 msgstr "����� ������� ������� �������"
 
-#~ msgid "Recommended"
-#~ msgstr "�������������"
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "��������� ��������"
+
+#, fuzzy
+msgid "Internet"
+msgstr "���������"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "����"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "�����������"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "�����������"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "�����������"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "�����������"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Documentation"
+msgstr "��������������"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "�����������"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "�������� ����������� ������ ���������"
+
+#~ msgid "Total size: "
+#~ msgstr "����� ������:"
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "������������������� ����"
+
+#~ msgid ""
+#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "��� ��������� ����� ��������� �� ���������� ��� ��������-����������.\n"
+#~ "\n"
+
+#~ msgid "Everything has been configured.\n"
+#~ msgstr "������ ��� ���������.\n"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "�������������� � �������� �� ������"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "�������������� � �������� ����� ISDN"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "�������������� � �������� ����� DSL (��� ADSL)"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "�������������� � �������� �� ������"
+
+#, fuzzy
+#~ msgid "Germany"
+#~ msgstr "��������"
+
+#~ msgid "Germany (1TR6)"
+#~ msgstr "�������� (1TR6)"
+
+#~ msgid "What do you wish to do?"
+#~ msgstr "��� �� ������ ������?"
+
+#, fuzzy
+#~ msgid "Install/Rescue"
+#~ msgstr "���������"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "��������� �������"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "����� ��� ������� ��� �����"
+
+#, 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "�������� \"���������\", ���� ��� ������������� �������������� ������ "
+#~ "GNU/Linux,\n"
+#~ "��� ���� ������ ������������ ��������� ������������� ��� ������.\n"
+#~ "\n"
+#~ "�������� \"��������\" ���� �� ��������� �������� ���������� ������\n"
+#~ "Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
+#~ "6.1 (Helios), Gold 2000 ��� 7.0 (Air).\n"
+#~ "\n"
+#~ "\n"
+#~ "��������:\n"
+#~ "\n"
+#~ "  - �������������: ���� �� ������ ������� �� ������������� Linux.\n"
+#~ "\n"
+#~ "  - � ����������: ���� �� ���������� ������� � GNU/Linux, �� ������� "
+#~ "�������\n"
+#~ "�������� ��� ������������� �������. �������� ������ ����.\n"
+#~ "\n"
+#~ "  - �������: ��� ������������, ��� �� �������� �������� GNU/Linux � ������ "
+#~ "���������\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "����� ����� ����������, ����� ������� ������������ ��� ���������\n"
+#~ "����� ������� Linux-Mandrake, ���� ��� ��� ���� ������ (��� ���������� \n"
+#~ "��������� GNU/Linux ��� ������ ���������� ���������). � ������ �������\n"
+#~ "������� �������� ����� ������ ���� �������. ��� �������� ������� ��\n"
+#~ "����������� ��������� ��������� ������������ ���������� �� ���������\n"
+#~ "�������� �������������.\n"
+#~ "\n"
+#~ "\n"
+#~ "���� ����� ������� ����� �������, ����������� \"�������������� ����������\" "
+#~ "��� ���������������\n"
+#~ "�������� �������� ��� GNU/Linux. ����� ������� ���� ��� ��������� �� "
+#~ "�������\n"
+#~ "�������� �� \"hda\" ������� ���������� IDE,\n"
+#~ "\"hdb\" ��� �������, ��� \"sda\" ��� ������� SCSI-����������, � �.�..\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������� ������� ���������: �������� ������ (/), ���������� ���������\n"
+#~ "������ �������� ��������� �������� �������, � /boot, ����������\n"
+#~ "��� �����, ����������� ��� ������� ������������ ������� ��� \n"
+#~ "��������� ����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��������� ���������� ����� �������� ������ ����������, ���������\n"
+#~ "�� ������� ����� ���� �������� � ������� ��� �������. DiskDrake\n"
+#~ "�������� ���� �������, ��� ��� ���������� ������ ���������. �����������\n"
+#~ "������������ � ������������� �������.\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."
+#~ msgstr ""
+#~ "��� ����� ������������ ������� ������ ���� ��������������� ��� \n"
+#~ "������������� (�������������� �������� �������� �������� �������). � ����\n"
+#~ "�������� ����� ����������������� ��� ������������ ������� ��� �������� "
+#~ "������\n"
+#~ "� ���. ���������: ������������� ��� ������������ ������� �� �����������,\n"
+#~ "�������� ���� ��� �������� ����� � ������, ������� �� ������ ���������.\n"
+#~ "������ ��������� /home � /usr/local."
+
+#~ 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."
+#~ msgstr ""
+#~ "��������� ������ ������ ���������������. ��� �������� ������\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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "���� DrakX �� ���� ����� ���� ����, ��� ���� �� ������\n"
+#~ "���������, ��� �� ������, ��� ��������� ������ �����\n"
+#~ "����.\n"
+#~ "\n"
+#~ "\n"
+#~ "���� �� �������� � ����������� DrakX, ������ ������� 'Ok'\n"
+#~ "� ��������� ������ �������� � ���� ����, ��� ������� �������� \n"
+#~ "������������� ���� ����� ����.\n"
+#~ "\n"
+#~ "\n"
+#~ "� ������ ���������������� ����, ��� ����� �������� �������� DrakX\n"
+#~ "� ������ ����������������� ����� ��� ����������."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "������ ������ �������� ��������� ��������� ����,\n"
+#~ "(LAN), ��� ������. \n"
+#~ "\n"
+#~ "�������� \"��������� ����\" � DrakX ����������� �����\n"
+#~ "�� ����� ������ ������� Ethernet. �������� PCI ������ ���� �������\n"
+#~ "� ��������� �������������. ������, ��� ������������� ISA,\n"
+#~ "��������������� �� ���������, � ��� �������� �������� �������\n"
+#~ "�� ������, ������� � ���� ������ ��������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� � ��� ��������� SCSI, �� ������ ������������ �������� ���������\n"
+#~ "����������, ����� �������� �������� �������� �����,\n"
+#~ "������� �� ������ � ������������ �� ������  \n"
+#~ "������������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ��������� Linux-Mandrake �� ���������, ������� � ��� \n"
+#~ "��������������� ����, �������������� ���� �������� ��������\n"
+#~ "��� ���� �������� ����������� (IP �����, ����� �������\n"
+#~ "��� ������� ��������, � ��� �����). ���� �� �������\n"
+#~ "������� ����, �������� ����, �� ������ ������� \n"
+#~ "������ "
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "GNU/Linux ����� �������� �� ������� ������ ���������. ������ �� ����\n"
+#~ "����� ������� ��������� ���������. ������ ������ � ����, ��� \n"
+#~ "������ ������ ���������� 'lp' ��� ��� �������� �� ���������; ��� ���\n"
+#~ "� ��� ������ ���� ���� ������� � ����� ������; �� ����� ���� ��������� \n"
+#~ "���� ������ ��������, �������� �� ��������� '|' .\n"
+#~ "��� ��� ���� �� ������������� ����� �������������� ���, ���� ������\n"
+#~ "��������� ��� � ������, ��������: \"My Printer|lp\".\n"
+#~ "�������, ���������� � ����� ����� \"lp\" ����� ��������� �� ���������.\n"
+#~ "\n"
+#~ "\n"
+#~ "���� ��� ������� ��������������� ����������� � ����������, ��������\n"
+#~ "\"Local printer\". ��� ����� ���� ����� ��������, � ������ �����\n"
+#~ "����������� �������, � ������� ���������� ������.\n"
+#~ "\n"
+#~ "\n"
+#~ "���� �� ������ �������� ������ � ��������, �������������� �� ��������� \n"
+#~ "������ Unix, ���� ������� \"��������� ������� lpd\". ����� ��������� ���\n"
+#~ "��������, ��� � ������ �� ���������, �� ���� ����� ���\n"
+#~ "������� ������ �� ���� �������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������� � �������� SMB (�� ���� � ��������, ������������\n"
+#~ "�� ��������� ������ Windows 9x/NT), ���� ������ ��� ���\n"
+#~ "SMB (������� �� ���� ��� TCP/IP ���), �, ��������, ��� IP �����\n"
+#~ "� ��� ������������, ������� ������ � ������ ����������� ��� \n"
+#~ "������� � ��������, �, �������, ��� ��������. �� �� ����� � ���\n"
+#~ "�������� NetWare, ������ �� �������� ���������� � ������� ������."
+
+#~ 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."
+#~ msgstr ""
+#~ "������������ ����������� �������� ����� \"��\". ���� �� ������ ����� \n"
+#~ "������������� Microsoft Windows, ��� ����������� ����������� ������.\n"
+#~ "� ���� �� �� ������� ����������� ����, �� �� ������� ������ ���������\n"
+#~ "GNU/Linux!"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "������ ���������?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "����������� ��������"
+
+#~ msgid "Host name:"
+#~ msgstr "��� ������:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "������� ��� ����� ����"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "�������������� ����������� ����������"
+
+#~ 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"
+#~ msgstr ""
+#~ "��� ������ ���������� ���������� ��������� ���������. \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?"
+#~ msgstr ""
+#~ "����� ����������� ����� ��������� ���������� (����.: 800x600).\n"
+#~ "�������, ������� ��� ����� ��������� ������ .\n"
+#~ "������ �����������?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "�� ���������� ���������� �������\n"
+#~ "���������� ������� ������ ���������� ��� �������"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "�������������� ����� ����������"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB ����"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB ���� (2 ������)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB ���� (3+ ������)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB ����"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB ���� (2 ������)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB ���� (3+ ������)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "Generic Mouse"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus Mouse"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Bus Mouse"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech Bus Mouse"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB ����"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB ���� (3 ������ ��� �����)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A ��� ���� (����������������))"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (����������������)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (����������������)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (����������������)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "Generic Mouse (����������������)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsoft compatible (����������������)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "Generic 3 Button Mouse (����������������)"
+
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse (����������������)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please choose which network adapter do you want to use to connect to "
+#~ "internet.\n"
+#~ "If you don't know, choose eth0.\n"
+#~ msgstr ""
+#~ "��������, ����� ������� ������� ����� ��������� � ����� ��������� ����."
+
+#~ 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"
+#~ "\n"
+#~ "Do you want to keep XFree 3.3?"
+#~ msgstr ""
+#~ "DrakX ����������� ���������������� ����� � ��� XFree 3.3, � ��� XFree 4.0.\n"
+#~ "�� ��������� ������������ ������ 4.0, ���� ������ �� ������������ ���� "
+#~ "����������.\n"
+#~ "\n"
+#~ "������ ��������� XFree 3.3?"
+
+#~ msgid "default"
+#~ msgstr "���������"
+
+#~ msgid "tie"
+#~ msgstr "���������"
+
+#~ msgid "brunette"
+#~ msgstr "������"
+
+#~ msgid "girl"
+#~ msgstr "������"
+
+#~ msgid "woman-blond"
+#~ msgstr "���������"
+
+#~ msgid "automagic"
+#~ msgstr "�������������"
+
+#~ msgid "Cryptographic"
+#~ msgstr "������������"
+
+#~ msgid "Take over the hard drive"
+#~ msgstr "������ ������� ����"
+
+#~ msgid "Normal"
+#~ msgstr "���������"
+
+#~ msgid "Do not set up networking"
+#~ msgstr "�� ������������� ����"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "������ �� �� ��������� ������������ ��� ��������� ����?"
+
+#~ msgid "Have you been provided with a hostname?"
+#~ msgstr "��� ������ ��� �����?"
+
+#~ msgid "Show less"
+#~ msgstr "�������� ������"
+
+#~ msgid "Show more"
+#~ msgstr "�������� ������"
+
+#~ msgid "Local Area Network specification"
+#~ msgstr "������������ ��������� ����"
+
+#~ msgid "You may now decide which class C network to use.\n"
+#~ msgstr "������ ����� ������, ����� ���� ������ C ������������.\n"
+
+#~ msgid "Network:"
+#~ msgstr "����:"
+
+#~ msgid "Internet Connection Sharing - setup of $device"
+#~ msgstr "���������� ��������-���������� - ��������� $device"
+
+#~ msgid ""
+#~ "The following interface is about to be configured:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+#~ msgstr ""
+#~ "����� ������������� ��������� ���������:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+
+#~ msgid "Everything configured!"
+#~ msgstr "��� ���������!"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "������� ��� ����������"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "����������� ����� ����� PCMCIA?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "����������� ����� %s ����������"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "����������� ����� PCI ����������"
+
+#~ msgid "Searching root partition."
+#~ msgstr "����� ��������� �������"
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: ��� �� �������� ������, ���������� �������� ������"
+
+#~ msgid "No root partition found"
+#~ msgstr "�������� ������ �� ������"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "���������� ������������ broadcast ��� ������ NIS"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "����� ������ ����� ������ ������������ � �������� ���������?"
+
+#~ 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.
+#
+#~ 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 ""
+#~ "Dobro pozhalovat' v dispetcher vybora operacionnoj sistemy LILO!\n"
+#~ "Chtoby vyvesti spisok vozmozhnyh variantov, nazhmite <TAB>\n"
+#~ "\n"
+#~ "Chtoby odnu iz nih, napishite ee nazvanie i nazhmite <ENTER>\n"
+#~ "ili zhdite %d sekund zagruzki po umolchaniyu.\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
+#
+#~ 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 ""
+#~ "Dobro pozhalovat' v dispetcher vybora operacionnoj sistemy SILO!\n"
+#~ "Chtoby vyvesti spisok vozmozhnyh variantov, nazhmite <TAB>\n"
+#~ "\n"
+#~ "Chtoby odnu iz nih, napishite ee nazvanie i nazhmite <ENTER>\n"
+#~ "ili zhdite %d sekund zagruzki po umolchaniyu.\n"
+#~ "\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "������� ����� SILO"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "� SILO ���� ��������� ������.\n"
+#~ "�� ������ �������� ���, ��� �������� ������������."
+
+#~ msgid "This label is already in use"
+#~ msgstr "��� ����� ��� ������������"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "��������� SILO �� ������. ��������� ��������� ������:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX ������� ��������� ����� ���� ��� ��������� ������� PCI\n"
+#~ "SCSI. ���� �� (��� ���) ������, � ��������, ����� �������\n"
+#~ "������������, �� ��������� �� �������������.\n"
+#~ "\n"
+#~ "���� ��� SCSI ������� �� ISA, ��� �� PCI, �� DrakX �� �����\n"
+#~ "����� ������� ������������ � ���� ������, ��� � ��� ��� SCSI ���������,\n"
+#~ "�� ��� �������, ���� �� �� � ���, ��� ���.\n"
+#~ "���� � ��� ��� ���, ��������� \"���\". ���� ���� ���� ��� ���������,\n"
+#~ "��������� \"��\". ����� ����� �������� ������ ���������, �� ������� ��\n"
+#~ "�������� ����������.\n"
+#~ "\n"
+#~ "����� ������ ��������, DrakX �������, �� ������ �� �� ������\n"
+#~ "��� ���� �����. ������� ����������, ����� ������� �������� ������������:\n"
+#~ "������ ��� �������� ������.\n"
+#~ "\n"
+#~ "���� ���, �� ��������� ��� ���������� � ����� ������������, �������\n"
+#~ "����� �������� �� Windows (��� ������� �� ����� �������), ��� ���\n"
+#~ "������������� ������������ �� ���������. ��� �� �����, �������\n"
+#~ "���� ������ ��������."
+
+#~ msgid "Shutting down"
+#~ msgstr "Shutting down"
 
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of Linux\n"
@@ -4989,21 +7379,12 @@ msgstr "����� ������� ������� �������"
 #~ msgid "Setup SCSI"
 #~ msgstr "��������� SCSI"
 
-#~ msgid "Which language do you want?"
-#~ msgstr "�������� ����"
-
 #~ msgid "Which packages do you want to install"
 #~ msgstr "����� ������� ��� ���������"
 
 #~ msgid "Local LAN"
 #~ msgstr "��������� ����"
 
-#~ msgid "Dialup with modem"
-#~ msgstr "Dialup ����� �����"
-
-#~ msgid "Local Printer Options"
-#~ msgstr "����� ���������� ��������"
-
 #~ msgid "server"
 #~ msgstr "������"
 
diff --git a/perl-install/share/po/sk.po b/perl-install/share/po/sk.po
index 7851eaa1e..30d008a51 100644
--- a/perl-install/share/po/sk.po
+++ b/perl-install/share/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 2000-06-13 11:00+0100\n"
 "Last-Translator: Jan Matis <damned@hq.alert.sk>\n"
 "Language-Team: sk <i18n@hq.alert.sk>\n"
@@ -13,43 +13,91 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr "V�eobecn�"
-
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
 msgstr "Grafick� karta"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
 msgstr "Zvo�te grafick� kartu"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
 msgstr "Zvo�te X server"
 
-#: ../../Xconfigurator.pm_.c:174
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
 msgstr "X server"
 
-#: ../../Xconfigurator.pm_.c:199
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, fuzzy, c-format
+msgid "XFree %s"
+msgstr "XFree86 server: %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Ak� typ z�znamu chcete prida�"
+
+#: ../../Xconfigurator.pm_.c:232
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
+#, fuzzy
+msgid "XFree configuration"
+msgstr "Poin�tala�n� konfigur�cia"
+
+#: ../../Xconfigurator.pm_.c:301
 msgid "Select the memory size of your graphic card"
 msgstr "Zvo�te ve�kos� grafickej pam�ti"
 
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:345
 msgid "Choose options for server"
 msgstr "Zvo�te parametre servra"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
 msgstr "Zvo�te monitor"
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -69,39 +117,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:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
 msgstr "Horizont�lna frekvencia"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
 msgstr "Vertik�lna frekvencia"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
 msgstr "Nie je nastaven� monitor"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
 msgstr "Nie je nastaven� grafick� karta"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
 msgstr "Nie s� nastaven� grafick� rozl��enia"
 
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
 msgstr "Otestova� konfigur�ciu?"
 
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
+#: ../../Xconfigurator.pm_.c:431
+#, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Varovanie: Testovanie na tejto grafickej karte je nebezpe�n�"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
 msgstr "Test konfigur�cie"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
@@ -109,184 +158,168 @@ msgstr ""
 "\n"
 "sk�ste zmeni� niektor� parametre"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
 msgstr "Vyskytla sa chyba"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "N�vrat za %d sek�nd"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
 msgstr "Je toto spr�vne nastavenie?"
 
-#: ../../Xconfigurator.pm_.c:386
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
 msgstr "Vyskytla sa chyba, sk�ste zmeni� niektor� parametre"
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr "Automatick� rozl��enia"
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
-"Pok�sim sa n�js� pou�ite�n� frekvencie.\n"
-"Va�a obrazovka bude teraz chv��ku blika�\n"
-"Ak chcete, m��ete vypn�� monitor, na konci budete po�u� p�pnutie"
-
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
 msgstr "Rozl��enie"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
 msgstr "Zvo�te rozl��enie a farebn� h�bku"
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:587
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafick� karta: %s"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:588
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 server: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
 msgstr "Zobraz v�etko"
 
-#: ../../Xconfigurator.pm_.c:524
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
 msgstr "Rozl��enia"
 
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
-"M��em sa pok�si� n�js� pou�ite�n� rozl��enia (napr. 800x600).\n"
-"Niekedy m��e d�js� v zatuhnutiu po��ta�a.\n"
-"Chcete to sk�si�?"
-
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-"Nena�iel som �iadne grafick� m�dy\n"
-"Sk�ste zvoli� in� grafick� kartu, alebo monitor"
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Nastavenie kl�vesnice: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:1020
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Typ my�i: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Port my�i: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:1022
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:1023
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Horizont�lna frekvencia monitoru: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:1024
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Vertik�lna frekvencia monitoru: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafick� karta: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Grafick� pam�: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Parametre farebnej h�bky"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Rozl��enia"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 server: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 server: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1051
 msgid "Preparing X-Window configuration"
 msgstr "Pripravujem konfigur�ciu X-Windows"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
 msgstr "Zme� monitor"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
 msgstr "Zme� grafick� kartu"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
 msgstr "Zme� parametre servra"
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
 msgstr "Zme� rozl��enie"
 
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr "H�ad�m mo�n� grafick� m�dy"
-
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
 msgstr "Zobraz inform�cie"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
 msgstr "Sk�s znova"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Koniec"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
 msgstr "�o chcete robi�?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr "Strati� zmeny?"
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Zachova� aktu�lnu IP konfigur�ciu"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, 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:1013
+#: ../../Xconfigurator.pm_.c:1123
 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:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
 msgstr "X pri �tarte"
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -294,227 +327,227 @@ msgstr ""
 "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?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1152
+#, 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."
+msgstr ""
+"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?"
+
+#: ../../Xconfigurator.pm_.c:1154
+#, fuzzy
+msgid "Choose the default user:"
+msgstr "Zvolte nov� ve�kos�"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Vyberte n�stroj, ktor� chcete pou�i�"
+
+#: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 farieb (8 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tis�c farieb (15 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tis�c farieb (16 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
 msgstr "16 mili�nov farieb (24 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
 msgstr "4 miliardy farieb (32 bit)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
 msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
 msgstr "16 MB a viac"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "�tandardn� VGA, 640�480 @ 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800�600 @ 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 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:118
+#: ../../Xconfigurator_consts.pm_.c:121
 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:119
+#: ../../Xconfigurator_consts.pm_.c:122
 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:120
+#: ../../Xconfigurator_consts.pm_.c:123
 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:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Vysoko frekven�n� SVGA, 1024�768 @ 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Monitor, ktor� dok�e 1280�1024 @ 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Monitor, ktor� dok�e 1280�1024 @ 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Monitor, ktor� dok�e 1280�1024 @ 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor, ktor� dok�e 1600�1200 @ 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor, ktor� dok�e 1600�1200 @ 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr "ku�erav�"
-
-#: ../../any.pm_.c:17
-msgid "default"
-msgstr "predvolen�"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr "tie"
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr "brunetka"
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr "diev�a"
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr "blond�nka"
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr "automagicky"
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Prv� sektor zav�dzacieho oddielu"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
 msgstr "Prv� sektor disku (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
+#: ../../any.pm_.c:95
+#, fuzzy
+msgid "SILO Installation"
 msgstr "In�tal�cia lilo/grub"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
 msgstr "Kam si �el�te nain�talova� zav�dza�?"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "In�tal�cia lilo/grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "Ni�"
 
-#: ../../any.pm_.c:73
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Ak� zav�dza� chcete pou�i�?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+#, fuzzy
+msgid "Bootloader installation"
+msgstr "Hlavn� parametre zav�dza�a"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
 msgstr "Boot zariadenie"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (nepracuje spr�vne so star��mi BIOSmi)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
 msgstr "Kompaktn�"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
 msgstr "kompaktn�"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr "Pauza pred �tartom predvolen�ho jadra"
-
-#: ../../any.pm_.c:88
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
 msgstr "Video m�d"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Pauza pred �tartom predvolen�ho jadra"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Heslo"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Heslo (znovu)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
 msgstr "Obmedz vo�by pr�kazov�ho riadku"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
 msgstr "obmedz"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
 msgstr "Hlavn� parametre zav�dza�a"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 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:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Pros�m sk�ste znovu"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Heslo nes�hlas�"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -522,167 +555,380 @@ msgstr ""
 "Moment�lne sa tu nach�dzaj� tieto z�znamy.\n"
 "M��ete prid�va� �al�ie, alebo meni� existuj�ce."
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Prida�"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Hotovo"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Ak� typ z�znamu chcete prida�"
+
+#: ../../any.pm_.c:175
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "In� OS (SunOS...)"
+
+#: ../../any.pm_.c:175
 msgid "Other OS (windows...)"
 msgstr "In� OS (windows...)"
 
-#: ../../any.pm_.c:123
-msgid "Which type of entry do you want to add?"
-msgstr "Ak� typ z�znamu chcete prida�"
-
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
 msgstr "Obraz"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
 msgstr "Pridaj"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
 msgstr "��tanie/Z�pis"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
 msgstr "Tabu�ka"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
 msgstr "Nie celkom bezpe�n�"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
 msgstr "Z�znam"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:217
 msgid "Default"
 msgstr "Predvo�ba"
 
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
 msgstr "Odstr�� z�znam"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
 msgstr "Pr�zdny z�znam nie je dovolen�"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
 msgstr "Tento z�znam je u� pou�it�"
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Na�iel som %s %s rozhranie"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "M�te e�te nejak� �al�ie?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "M�te nejak� %s rozhranie?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Nie"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "�no"
+
+#: ../../any.pm_.c:505
+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:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "In�talujem ovl�da� pre %s kartu %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(modul %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Ktor� %s ovl�da� m�m sk�si�?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"Ovl�da� %s niekedy potrebuje pre spr�vnu �innos� doplnkov� inform�ciu, aj\n"
+"ke� zvy�ajne pracuje spr�vne aj bez nej. �el�te si zada� doplnkov� vo�by,\n"
+"alebo dovol�te ovl�da�u otestova� v� po��ta� a �daje si zisti�? Ob�as sa\n"
+"stane, �e toto testovanie po��ta� zablokuje, ale nemalo by sp�sobi� �iadnu "
+"�kodu."
+
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Automatick� zistenie"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Zadajte vo�by"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Teraz m��ete zada� parametre pre modul %s."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"Teraz m��ete zada� parametre pre modul %s.\n"
+"Parametre s� vo form�te ``meno=hodnota meno2=hodnota2 ...''.\n"
+"Napr�klad: ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Parametre modulu:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Nahr�vanie modulu %s zlyhalo.\n"
+"Chcete sa o to pok�si� znova s in�mi parametrami?"
+
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Vitajte v zavadzaci operacneho systemu %s!\n"
+"\n"
+"Pre zoznam moznych volieb stlacte <TAB>.\n"
+"\n"
+"Pre vyber volby, napiste jej meno a stlacte <ENTER>, alebo \n"
+"cakajte %d sekund pre predvolenu akciu.\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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Vitajte v zavadzaci operacneho systemu GRUB"
+
+# 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
+#
+#: ../../bootloader.pm_.c:597
+#, 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"
+
+# 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
+#
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Stlacte enter pre zavedenie oznaceneho OS, 'e' pre upravu"
+
+# 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
+#
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "prikazov pred zavedenim, alebo 'c' pre prikazovy riadok"
+
+# 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
+#
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "Oznaceny OS bude zavedeny za %d sekund."
+
+#: ../../bootloader.pm_.c:604
+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
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Desktop"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "�tart menu"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:612
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "N�vrat za %d sek�nd"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
 msgid "Create"
 msgstr "Vytvor"
 
-#: ../../diskdrake.pm_.c:19
+#: ../../diskdrake.pm_.c:22
 msgid "Unmount"
 msgstr "Odpoj"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
 msgid "Delete"
 msgstr "Zru�"
 
-#: ../../diskdrake.pm_.c:20
+#: ../../diskdrake.pm_.c:23
 msgid "Format"
 msgstr "Form�t"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
 msgid "Resize"
 msgstr "Zme� ve�kos�"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
 msgstr "Typ"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
 msgstr "Bod pripojenia"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
 msgstr "Zap�� /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
 msgstr "Prepni do expert m�du"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
 msgstr "Prepni do norm�lneho m�du"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
 msgstr "Obnov zo s�boru"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
 msgstr "Ulo� do s�boru"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
 msgstr "Obnov z diskety"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
 msgstr "Ulo� na disketu"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
 msgstr "Zma� v�etko"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
 msgstr "Naform�tuj v�etko"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
 msgstr "Automaticky prerozde�"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
 msgstr "V�etky prim�rne oddiely s� u� pou�it�"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
 msgstr "Nem��em prida� �al�� oddiel"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -690,59 +936,63 @@ msgstr ""
 "Ak chcete ma� viac diskov�ch oddielov, tak zma�te jeden z nich, aby sa dal "
 "vytvori� roz��ren� oddiel disku"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
 msgstr "Zachr�ni� partition tabu�ku"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
 msgstr "Sp�"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
 msgstr "Zap�sa� partition tabu�ku"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
 msgstr "Na��ta� znovu"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr "Pr�zdna"
-
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr "In�"
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
 msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Pr�zdna"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "In�"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
 msgstr "Typ s�borov�ho syst�mu:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
 msgstr "Detaily"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -754,17 +1004,17 @@ msgstr ""
 "Navrhujem zmeni� jeho ve�kos�\n"
 "(kliknite na�, potom kliknite na \"Zme� ve�kos�\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
 msgstr "Pros�m, najprv si za z�lohujte va�e d�ta"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
 msgstr "��tajte pozorne!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -774,77 +1024,77 @@ msgstr ""
 "miesta.\n"
 "(2048 sektorov bude sta�i�)"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
 msgstr "Bu�te opatrn�: t�to oper�cia je nebezpe�n�."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Chyba"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
 msgstr "Bod pripojenia: "
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
 msgstr "Zariadenie:"
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Ozna�enie v DOSe: %s (asi)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Za�iatok: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
 msgstr "Ve�kos�: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektorov"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Od cylindra %d po cylinder %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
 msgstr "Naform�tovan�\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
 msgstr "Nenaform�tovan�\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
 msgstr "Pripojen�\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Loopback s�bor(y): %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -852,79 +1102,79 @@ msgstr ""
 "Predvolen� oddiel pre �tart\n"
 "    (MS-DOS boot, nie pre lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
 msgstr "Hladina %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Ve�kos� k�sku %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-disky %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Meno loopback s�boru: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
 msgstr "Pros�m kliknite na oddiel"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Ve�kos�: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometria: %s cylindrov, %s hlavi�iek, %s sektorov\n"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Typ partition tabu�ky: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "na zbernici %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
 msgstr "Pripoj"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
 msgstr "Akt�vny"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
 msgstr "Pridaj do RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
 msgstr "Odober z RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
 msgstr "Modifikuj RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
 msgstr "Pou�i loopback"
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
 msgstr "Zvo� akciu"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -936,7 +1186,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:390
+#: ../../diskdrake.pm_.c:396
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -947,27 +1197,28 @@ 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:396
+#: ../../diskdrake.pm_.c:402
+#, fuzzy
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 "Nastavili ste softv�rov� RAID oddiel ako kore�ov� (/).\n"
 "�iaden zav�dza� syst�mu nedok�e zavies� syst�m so softv�rov�ho RAID\n"
 "oddielu. Preto je potrebn�, aby ste pridali e�te oddiel /boot v pr�pade,\n"
 "�e chcete pou��va� LILO alebo GRUB"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Namiesto toho pou�ite `%s''"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
 msgstr "Najprv spravte `Unmount''"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -975,41 +1226,42 @@ msgstr ""
 "Po zmene diskovej oblasti %s bud� v�etky d�ta na tejto oblasti nen�vratne "
 "straten�"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
 msgstr "Pokra�ova�?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
 msgstr "Koniec bez ulo�enia"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
 msgstr "Koniec bez zmeny partition tabu�ky?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
 msgstr "Zvo�te typ oddielu"
 
-#: ../../diskdrake.pm_.c:465
-msgid "Which partition type do you want?"
+#: ../../diskdrake.pm_.c:471
+#, fuzzy
+msgid "Which filesystem do you want?"
 msgstr "Ktor� typ oddielu chcete?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 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:484
+#: ../../diskdrake.pm_.c:490
 #, 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:485
+#: ../../diskdrake.pm_.c:491
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Kam si �el�te pripoji� zariadenie %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1017,138 +1269,143 @@ 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.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, 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:511
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
 msgstr "Form�tuje sa"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Form�tuje sa loopback s�bor %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Form�tuje sa oddiel %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
 msgstr "Po naform�tovan� v�etk�ch oddielov,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
 msgstr "bud� d�ta na t�chto oddieloch nen�vratne zru�en�"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
 msgstr "Presu�"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
 msgstr "Ktor� disk si �el�te posun��?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
 msgstr "Ktor� sektor si �el�te posun��?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
 msgstr "Pres�vam"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
 msgstr "Pres�vam oddiel..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, 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!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 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:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
 msgstr "Po��tam hranice FAT s�borov�ho syst�mu"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Men�m ve�kos�"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Ktor� typ oddielu chcete?"
+
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
 msgstr "V�etky d�ta na tejto oblasti by sa mali zaz�lohova�"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, 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.pm_.c:598
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
 msgstr "Zvolte nov� ve�kos�"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
 msgstr "Vytvor nov� oddiel"
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
 msgstr "Po�iato�n� sektor:"
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
 msgstr "Ve�kos� v MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
 msgstr "Typ s�borov�ho syst�mu: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
 msgstr "Preferencia: "
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
 msgstr "Tento oddiel nem��e by� pou�it� pre sp�tn� slu�ku"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
 msgstr "Sp�tn� slu�ka"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
 msgstr "Meno s�boru sp�tnej slu�ky: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 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.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
 msgstr "S�bor existuje. Pou�i�?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
 msgstr "Vyber s�bor"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1156,11 +1413,11 @@ msgstr ""
 "Z�lo�n� tabu�ka rozdelenia disku nem� rovnak� ve�kos�\n"
 "Naozaj pokra�ova�?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Varovanie"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1168,79 +1425,79 @@ msgstr ""
 "Vlo�te disketu do mechaniky\n"
 "V�etky d�ta na tejto diskete bud� nen�vratne straten�"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
 msgstr "Pok��am sa obnovi� partition tabu�ku"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
 msgstr "zariadenie"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
 msgstr "�rove�"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
 msgstr "ve�kos�"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
 msgstr "Vyberte existuj�ci RAID pre pridanie"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
 msgstr "nov�"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s form�tovanie %s zlyhalo"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, 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:186
-msgid "nfs mount failed"
-msgstr "nepodarilo sa pripoji� nfs"
-
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
 msgstr "nepodarilo sa pripoji�: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "chyba odpojenia %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
 msgstr "Body pripojenia musia za��na� /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, 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:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Kruhov� pripojenia %s\n"
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
+msgstr ""
+
+#: ../../fsedit.pm_.c:259
 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:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Chyba otv�rania %s pre z�pis: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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"
@@ -1249,69 +1506,82 @@ msgstr ""
 "mo�n� vytvori� nov� s�borov� syst�my. Skontrolujte v� hardv�r pre zistenie "
 "pr��iny probl�mu."
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
 msgstr "Nem�te �iadny oddiel disku!"
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
 msgstr ""
 "Zvo�te pros�m vami uprednost�ovan� jazyk pre in�tal�ciu a pou�itie v syst�me."
 
-#: ../../help.pm_.c:10
+#: ../../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 "Vyberte najvhodnej�ie rozlo�enie kl�ves z nasleduj�ceho zoznamu"
 
-#: ../../help.pm_.c:13
+#: ../../help.pm_.c:25
 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"
-"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).\n"
-"\n"
+"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
+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"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\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"
-msgstr ""
-"Zvo�te \"In�tal�cia\" ak ste pred t�m nemali nain�talovan� predo�l� verziu\n"
-"linuxu, alebo ak chcete pou��va� viac distrib�ci�, alebo verzii.\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"
-"Zvo�te \"Upgrade\" ak chcete aktualizova� predo�l� verzie linuxu Mandrake.\n"
+"\t* Recommanded: 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"
-"Zvo�te:\n"
 "\n"
-"  - Automatick�: Ak ste e�te nikdy Linux nein�talovali. Automaticky\n"
-" nain�taluje Linux-Mandrake ako jedin� opera�n� syst�m\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\n"
 "\n"
-"  - Vlastn� v�ber: Ak Linux u� trochu pozn�te, viete rozl��i�, �i chcete\n"
-"norm�lnu pracovn� stanicu, server, alebo v�voj�rsku pracovn� stanicu.\n"
-"Pod�a toho v nasleduj�com kroku aj zvo�te \"Norm�lna\", \"V�voj�rska\",\n"
-"alebo \"Server\".\n"
 "\n"
-"  - Expert: Ak sa v Linuxe vyzn�te a chcete si presne nastavi� aplik�cie,\n"
-"ktor� budete pou��va�.\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1319,16 +1589,16 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
 "Zvo�te:\n"
 "\n"
-"\n"
 "  - Vlastn� v�ber: Ak Linux u� trochu pozn�te, viete rozl��i�, �i chcete\n"
 "norm�lnu pracovn� stanicu, server, alebo v�voj�rsku pracovn� stanicu.\n"
 "Pod�a toho v nasleduj�com kroku aj zvo�te \"Norm�lna\", \"V�voj�rska\",\n"
@@ -1336,33 +1606,31 @@ msgstr ""
 "\n"
 "\n"
 "  - Expert: Ak sa v Linuxe vyzn�te a chcete si presne nastavi� aplik�cie,\n"
-"ktor� budete pou��va�.\n"
+"ktor� budete pou��va�."
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\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."
 msgstr ""
 "Rozdielne vo�by pre pou�itie v�ho po��ta�a s�:\n"
 "\n"
@@ -1379,149 +1647,347 @@ msgstr ""
 "    Windows SMB), ur�en� na autentifik�ciu (NIS), alebo datab�zov�, �i in�\n"
 "    Nebude ma� nain�talovan� grafick� prostredia (KDE, GNOME...)\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
+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 ""
+
+#: ../../help.pm_.c:108
 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"
+"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 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"
+"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"
-"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"
+"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"
-"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."
+"\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."
 msgstr ""
-"DrakX sa najsk�r pok�si rozpozna� jeden, alebo viac SCSI adapt�rov\n"
-"na PCI zbernici. Ak ich rozpozn� a dok�e n�js� spr�vny ovl�da�,\n"
-"dovol� ich pou��vanie automaticky.\n"
+
+#: ../../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"
+"\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"
-"Ak je v� SCSI adapt�r na ISA zbernici, alebo je s�ce na PCI, ale DrakX\n"
-"nedok�zal zvoli� spr�vny ovl�da�, alebo nem�te SCSI adapt�r, zobraz� sa\n"
-"dial�gov� okno. V �om budete m�c� zvoli� �i m�te, alebo nem�te SCSI\n"
-"adapt�r a ak �no, budete m�c� zvoli� aj ovl�da� zo zoznamu.\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"
-"Potom, �o vyberiete ovl�da�, sa v�s DrakX op�ta, �i chcete nastavi� aj\n"
-"nejak� jeho parametre. Najsk�r sk�ste necha� ovl�da� tak ako v�m bol\n"
-"pon�knut�: v��inou to pracuje spr�vne.\n"
+"   * Undo: you can use this option to cancel your changes.\n"
 "\n"
 "\n"
-"Ak nie, mus�te si potrebn� inform�cie zisti� z dokument�cie k dan�mu\n"
-"adapt�ru tak, ako je navrhovan� v in�tala�nej pr�ru�ke."
+"   * 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"
+msgstr ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:218
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"For information, each partition is listed as follows: \"Name\", "
+"\"Capacity\".\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"
+"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\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"
+"\"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"
-"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"
+"\"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"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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 ""
+
+#: ../../help.pm_.c:252
+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:257
+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"
-"- Ctrl-d  to delete a partition\n"
 "\n"
-"- Ctrl-m  to set the mount point\n"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"V tomto kroku budete ma� mo�nos� si zvoli� diskov� oddiel ur�en� pre\n"
-"in�tal�ciu v�ho Mandrake, resp. si potrebn� oddiely povytv�ra�.\n"
+
+#: ../../help.pm_.c:267
+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"
-"Ak chcete vytvori� nov� oddiel, m��ete zvoli� \"Automaticky prerozde�\" pre\n"
-"automatick� vytv�ranie oddielov pre Linux. M��ete zvoli� disk pre\n"
-"prerozdelenie kliknut�m napr�klad na \"hda\" pre prv� IDE pevn� disk,\n"
-"alebo \"sda\" pre prv� SCSI pevn� disk.\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"
-"Dva �asto pou��van� oddiely s�: kore�ov� oddiel (/) �o je z�kladn� kame�\n"
-"v �trukt�re Linux s�borov�ho syst�mu a /boot, ktor� obsahuje v�etky s�bory\n"
-"potrebn� pre spr�vne zavedenie syst�mu.\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"
-"Preto�e s� tieto kroky nevratn�, m��e proces rozde�ovania disku p�sobi�\n"
-"na nesk�sen�ch u��vate�ov zastra�uj�co a stresovo. DiskDrake tento proces\n"
-"zjednodu�uje, len na to naozaj najnutnej�ie. Pre��tajte si dokument�ciu a\n"
-"s k�udom sa pustte do pr�ce.\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"
-"Ka�d� vo�bu m��ete dosiahnu� aj pomocou kurzorov�ch skratiek. Pohyb medzi\n"
-"oddielmi ovl�date kl�vesou <Tab> a ��pkami <Up> a <Down>. Ke� je oddiel\n"
-"ozna�en�, m��ete pou�i�:\n"
+"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"- Ctrl-c pre vytvorenie nov�ho oddielu (ak je ozna�en� pr�zdna �as� disku)\n"
+"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
+"\"secondary hard drive\", etc.\n"
 "\n"
-"- Ctrl-d pre odstr�nenie oddielu\n"
 "\n"
-"- Ctrl-m pre nastavenie bodu pripojenia\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:300
+msgid "Please be patient. This operation can take several minutes."
+msgstr ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:303
 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."
+"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 ""
-"Ka�d� oddiel, ktor� bol nanovo vytvoren�, mus� by� pred pou�it�m\n"
-"naform�tovan�(form�tovanie znamen� vytv�ranie s�borov�ho syst�mu)\n"
-"Teraz m��ete preform�tova� aj oddiely, ktor� u� existovali ak z nich\n"
-"chcete odstr�ni� d�ta.\n"
-"Pozn�mka: Nie je nutn� reform�tova� star�ie oddiely."
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:329
+#, 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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"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 ""
 "V tomto kroku si m��ete zvoli� skupiny bal�kov ktor� chcete in�talova�.\n"
 "\n"
@@ -1532,131 +1998,153 @@ msgstr ""
 "bal�kov\"\n"
 "V tom pr�pade budete m�c� prech�dza� zoznamom viac ne� 1000 bal�kov..."
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:341
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:358
+#, 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 ""
 "Ak m�te v�etky CD zo zoznamu, stla�te OK.\n"
 "Ak nem�te �iadne, stla�te Zru�.\n"
 "Ak v�m ch�baj� iba niektor�, odzna�te ich a potom stla�te OK."
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:363
 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."
+"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 ""
-"In�taluj� sa bal�ky, ktor� ste ozna�ili. T�to oper�cia\n"
-"m��e trva� nieko�ko min�t. Ak ste zvolili upgrade u� existuj�ceho\n"
-"syst�mu, bude chv��ku trva� ne� za�ne in�tal�cia bal�kov."
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:371
 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"
-"\n"
-"\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
-"\n"
-"\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
-"Ak DrakX zlyh� pri h�adan� va�ej my�i, budete ma� mo�nos� zvoli� si\n"
-"spr�vnu my� zo zoznamu.\n"
-"\n"
-"\n"
-"Ak s�hlas�te s DrakX nastaven�m, jednoducho pokra�ujte �alej. Inak\n"
-"zvo�te typ my�i.\n"
-"\n"
-"\n"
-"V pr�pade s�riovej my�i by ste mali tie� zada� na ktor�mu s�riov�mu\n"
-"portu je pripojen�."
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
 msgstr ""
 "Pros�m ozna�te spr�vny port. Napr�klad COM1 port v MS Windows\n"
 "sa vol� ttyS0 v Linuxe."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:380
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\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"
-"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"
+"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 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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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."
+"If you wish to configure the network later after installation or if you "
+"have\n"
+"finished to configure your network connection, choose \"Done\"."
 msgstr ""
-"Tento krok je ur�en� pre konfigur�ciu pripojenia k lok�lnej sieti\n"
-"alebo modemu.\n"
-"\n"
-"Zvo�te \"Lok�lna sie�\" a DrakX sk�si n�js� na va�om po��ta�i sie�ov�\n"
-"kartu. PCI adapt�ry by mali by� n�jden� a inicializovan� automaticky.\n"
-"Ak m�te ISA sie�ov� kartu, alebo autodetekcia nebude pracova� spr�vne,\n"
-"budete po�iadan� o zvolenie spr�vneho ovl�da�a zo zoznamu.\n"
-"\n"
-"\n"
-"Tak, ako pre SCSI radi�, m��ete najsk�r sk�si� necha� ovl�da� bez zmeny\n"
-"parametrov a iba v pr�pade ne�spechu sa ich pok�si� nastavi� a pomocou\n"
-"dokument�cie v va�ej sie�ovej karte.\n"
-"\n"
-"\n"
-"Ak in�talujete Mandrake ako s��as� existuj�cej siete, po�iadajte spr�vcu\n"
-"siete o v�etky d�le�it� inform�cie (IP adresa, netmask, meno po��ta�a,\n"
-"pr�padne br�na).\n"
-"\n"
-"\n"
-"Zvo�te \"Dialup cez modem\" pre konfigur�ciu pripojenia na internet za\n"
-"pomoci modemu. DrakX sa pok�si n�js� v� modem, a ak sa mu to nepodar�,\n"
-"budete musie� zvoli� spr�vny s�riov� port, na ktorom je modem pripojen�."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:393
 msgid ""
-"Enter:\n"
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\n"
 "\n"
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"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:425
+#, fuzzy
+msgid ""
+"You may now configure your network device.\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\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 \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\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 ""
 "Zadajte:\n"
 "\n"
@@ -1672,7 +2160,22 @@ msgstr ""
 "  - Automatick� IP: Ak je vo va�ej sieti pou��van� bootp, alebo dhcp\n"
 "protokol, zvo�te t�to mo�nos�.\n"
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:437
+#, 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 ""
+"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:441
+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:445
 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."
@@ -1680,7 +2183,7 @@ 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:229
+#: ../../help.pm_.c:449
 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."
@@ -1689,13 +2192,15 @@ msgstr ""
 "Ak neviete �i budete proxy pou��va�, sp�tajte sa v�ho spr�vcu siete,\n"
 "alebo poskytovate�a internetu."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
@@ -1703,13 +2208,19 @@ msgstr ""
 "cryptografick� bal�ky. Najsk�r zvo�te miror server, odkia� budete bal�ky\n"
 "�aha� a potom zvo�te bal�ky, ktor� chcete in�talova�."
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
+
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
 "Teraz si m��ete zvoli� �asov� z�nu v ktorej �ijete.\n"
 "\n"
@@ -1717,15 +2228,22 @@ msgstr ""
 "Linux organizuje �as v GMT (Greenwichsk� �as) a preklad� ho do lok�lneho\n"
 "s oh�adom na �asov� z�nu, ktor� ste si zvolili."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 si m��ete zvoli�, ktor� slu�by chcete aby sa sp���ali pri zaveden�\n"
 "syst�mu.\n"
@@ -1733,78 +2251,159 @@ msgstr ""
 "Ak m� v� syst�m sl��i� ako server, bu�te pros�m ve�mi opatrn�. Je vhodn�\n"
 "nema� spusten� �iadnu slu�bu, ktor� naozaj nepotrebujete."
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:486
 msgid ""
-"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"
+"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:490
+msgid ""
+"If you wish to be able to print, please choose one printing system between\n"
+"CUPS and LPR.\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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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."
+"If you don't have printer, click on \"None\"."
 msgstr ""
-"Linux dok�e pracova� s mnoh�mi typmi tla�iarn�. Ka�d� z t�chto typov\n"
-"po�aduje in� nastavenie. Napriek tomu, �e print spooler pou��va ako \n"
-"predvolen� meno tla�iarne n�zov 'lp', (�i�e ak m�te tla�iare�, mus� sa\n"
-"tak vola�) m��ete pou�i� aj �al�ie men� oddelen� znakom '|'. Tak�e, ak\n"
-"preferujete napr�klad n�zov \"Moja tla�iare�\", m��ete zada�\n"
-"\"Moja tla�iare�|lp\".\n"
-"Tla�iare�, ktor� m� medzi svojimi menami \"lp\", je pou��van� ako\n"
-"predvolen�.\n"
+
+#: ../../help.pm_.c:505
+msgid ""
+"GNU/Linux can deal with many types of printer. Each of these types requires\n"
+"a different setup.\n"
 "\n"
 "\n"
-"Ak je va�a tla�iare� priamo pripojen� k v�mu po��ta�u, zvo�te\n"
-"\"Lok�lna tla�iare�\". Budete po�iadan� o zadanie portu a zvolenie\n"
-"spr�vneho tla�ov�ho filtra.\n"
+"If your printer is physically connected to your computer, select \"Local\n"
+"printer\".\n"
 "\n"
 "\n"
-"Ak m�te pr�stup k tla�iarni pripojenej ku vzdialen�mu unixov�mu syst�mu,\n"
-"zvo�te \"Vzdialen� tla�ov� fronta\". Budete musie� zada� meno tejto fronty,\n"
-"ale nie je potrebn� u��vate�sk� meno, �i heslo.\n"
+"If you want to access a printer located on a remote Unix machine, select\n"
+"\"Remote printer\".\n"
 "\n"
 "\n"
-"Ak chcete pristupova� k SMB tla�iarni (�o znamen�, �e tla�iare� je\n"
-"pripojen� k vzdialen�mu Windows 9x/NT syst�mu), budete musie� zada�\n"
-"jeho SMB meno (�o nemus� s�hlasi� s jeho TCP/IP menom), IP adresu,\n"
-"u��vate�sk� meno, pracovn� skupinu, heslo a samozrejme meno tla�iarne.\n"
-"To ist�, s v�nimkou pracovnej skupiny, plat� pre NetWare tla�iare�."
+"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:286
+#: ../../help.pm_.c:521
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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:542
+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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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 ""
+
+#: ../../help.pm_.c:585
+#, 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"
+"\n"
+"Do not make the password too long or complicated, though: you must be able "
+"to\n"
+"remember it without too much effort."
 msgstr ""
 "V tomto kroku m��ete zada� heslo pre u��vate�a root v�ho Linux-Mandrake\n"
 "syst�mu. Heslo mus� by� zadan� dva kr�t, pre kontrolu zhodnosti oboch\n"
@@ -1817,7 +2416,7 @@ msgstr ""
 "na �om ulo�en�ch. Heslo by malo by� zlo�en� z p�smen a ��slic s d�kou\n"
 "aspo� osem znakov."
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1825,7 +2424,7 @@ 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:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1833,7 +2432,7 @@ 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:310
+#: ../../help.pm_.c:611
 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"
@@ -1871,22 +2470,18 @@ msgstr ""
 "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."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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 ""
-"Ve�mi doporu�ujem aby ste tu odpovedali \"�no\". Ak toti� v bud�cnosti\n"
-"budete in�talova� Microsoft Windows, stane sa �e prep��u boot sektor.\n"
-"A ak nebudete ma� vytvoren� bootdisk, nebudete sa ma� ako dosta� do \n"
-"Linuxu."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:635
+#, fuzzy
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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"
@@ -1898,7 +2493,7 @@ msgstr ""
 "\n"
 "Pokia� si nie ste ist�, zvo�te \"Prv� sektor na disku\" (MBR)."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1906,10 +2501,11 @@ 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:347
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1925,7 +2521,8 @@ msgstr ""
 "kroku.\n"
 "prida� z�znam ru�ne. Bu�te v�ak opatrn� a zvo�te spr�vne parametre."
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1942,7 +2539,9 @@ msgid ""
 "\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."
 msgstr ""
 "Hlavn� parametre pre LILO a Grub s�:\n"
@@ -1963,10 +2562,64 @@ msgstr ""
 "    * normal: norm�lny 80x25 textov� m�d.\n"
 "    * <��slo>:  pou�ije sa kore�ponduj�ci textov� m�d."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+#, 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 a Grub s� takzvan� zav�dza�e syst�mu. Ich �lohou je na�tartova� Linux,\n"
+"alebo in� opera�n� syst�m po spusten� v�ho po��ta�a. V�c�inou s� ostatn�.\n"
+"opera�n� syst�my spr�vne rozpoznan�. Ak sa to nestane, m��ete v tomto "
+"kroku.\n"
+"prida� z�znam ru�ne. Bu�te v�ak opatrn� a zvo�te spr�vne parametre."
+
+#: ../../help.pm_.c:692
+#, 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 ""
+"Hlavn� parametre pre LILO a Grub s�:\n"
+"  - Boot zariadenie: Nastav� meno zariadenie ktor� obsahuje zav�dzac� "
+"sektor.\n"
+"    Pokia� neviete presne, �o m�te zvoli�, zvo�te \"/dev/hda\".\n"
+"\n"
+"\n"
+"  - Pauza pred �tartom predvolen�ho jadra: �pecifikuje �as v desatin�ch "
+"sek�nd\n"
+"    ktor� m� zav�dza� �aka�, k�m za�ne zav�dza� syst�m z predvolen�ho "
+"nastavenia.\n"
+"    Zav�dza� ne�ak�, ak \"delay\" nieje nastaven� alebo je nastaven� na 0.\n"
+"\n"
+"\n"
+"  - Video m�d: �pecifikuje VGA textov� m�d ktor� bude nastaven� po\n"
+"    zaveden� syst�mu. Mo�n� s� tieto hodnoty: \n"
+"    * normal: norm�lny 80x25 textov� m�d.\n"
+"    * <��slo>:  pou�ije sa kore�ponduj�ci textov� m�d."
+
+#: ../../help.pm_.c:705
+#, fuzzy
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -1987,7 +2640,7 @@ msgstr ""
 "skontrolova� nastavenie a pr�padne ho zmeni� to�ko kr�t, ko�ko budete\n"
 "potrebova�."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -1995,49 +2648,54 @@ 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:395
+#: ../../help.pm_.c:722
 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:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\n"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
 "\n"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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"
+"\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"
+"\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."
 msgstr ""
 "Teraz si m��ete zvoli� r�zne nastavenia v�ho syst�mu.\n"
 "\n"
@@ -2068,7 +2726,7 @@ msgstr ""
 "zaveden�\n"
 "    syst�mu, zvo�te t�to mo�nos�. (Pod X v�ak NumLock zapnut� nebude)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2082,96 +2740,117 @@ msgstr ""
 "Ak chcete zavies� in� existuj�ci opera�n� syst�m, pre��tajte si pros�m\n"
 "dodatkov� in�trukcie."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
 msgstr "Vo�ba jazyka"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
 msgstr "Vo�ba triedy in�tal�cie"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
 msgstr "Detekcia pevn�ho disku"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
 msgstr "Konfigur�cia my�i"
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
 msgstr "V�ber kl�vesnice"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "R�zne vo�by"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
 msgstr "S�borov� syst�my"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
 msgstr "Form�tovanie oddielov"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
 msgstr "V�ber bal�kov"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
 msgstr "In�tal�cia syst�mu"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
 msgstr "Sie�ov� slu�by"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr "Kryptografia"
-
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
 msgstr "Nastavenie �asovej z�ny"
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:53
 msgid "Configure services"
 msgstr "Nastavenie slu�ieb"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
 msgstr "Nastavenie tla�iarne"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "Nastavenie root hesla"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
 msgstr "Vytv�ranie u��vate�ov"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Zav�dzacia disketa"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
 msgstr "In�tal�cia zav�dza�a"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
 msgstr "Konfigur�cia X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr "Autoin�tala�n� disketa"
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
 msgstr "Koniec in�tal�cie"
 
-#: ../../install2.pm_.c:337
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Chyba pri ��tan� zo s�boru %f"
+
+#: ../../install_gtk.pm_.c:426
+#, fuzzy
+msgid "Please test the mouse"
+msgstr "Pros�m, zvo�te typ va�ej my�i."
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Pros�m, zvo�te typ va�ej my�i."
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../install_interactive.pm_.c:41
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -2181,231 +2860,249 @@ msgstr ""
 "Vytvorte oddiel (alebo kliknite na existuj�cu).\n"
 "Potom zvo�te akciu ``Bod pripojenia`` a nastavte na `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
-"Nedok�em pre��ta� tabu�ku rozdelenia disku, je pr�li� po�koden�\n"
-"Sk�sim odstr�ni� chybn� oddiely"
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "Mus�te nastavi� swap oddiel"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"DiskDrake nedok�zal korektne na��ta� tabu�ku rozdelenia disku.\n"
-"Pokra�ujte na vlastn� riziko!"
+"Nevytvorili ste swap oddiel\n"
+"\n"
+"Napriek tomu pokra�ova�?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr "H�ad�m kore�ov� oddiel."
+#: ../../install_interactive.pm_.c:68
+#, fuzzy
+msgid "Use free space"
+msgstr "Pou�i loopback"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr "Inform�cia"
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr "%s: Toto nie je kore�ov� oddiel, pros�m zvo�te in�."
+#: ../../install_interactive.pm_.c:78
+#, fuzzy
+msgid "Use existing partition"
+msgstr "Form�tuje sa"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr "Ch�ba kore�ov� oddiel"
+#: ../../install_interactive.pm_.c:80
+#, fuzzy
+msgid "There is no existing partition to use"
+msgstr "Pok��am sa obnovi� partition tabu�ku"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Nem��em pou�i� broadcast bez NIS dom�ny"
+#: ../../install_interactive.pm_.c:87
+#, fuzzy
+msgid "Use the Windows partition for loopback"
+msgstr "Pou�i loopback"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr "Chyba pri ��tan� zo s�boru %f"
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Ktor� oddiel chcete pou�i� pre Linux4Win?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Vyskytla sa chyba a neviem ju �plne vyrie�i�.\n"
-"Pokra�ujte na vlastn� zodpovednos�."
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Zvo�te ve�kosti"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Dvojn�sobn� bod pripojenia %s"
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Ve�kos� kore�ov�ho oddielu v MB: "
 
-#: ../../install_steps.pm_.c:323
-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"
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Ve�kos� oddielu v MB: "
+
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
 msgstr ""
-"Niektor� d�le�it� bal�ky neboli spr�vne nain�talovan�.\n"
-"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:390
-#, c-format
-msgid "Welcome to %s"
-msgstr "Vitajte v %s"
+#: ../../install_interactive.pm_.c:105
+#, fuzzy
+msgid "Which partition do you want to resize?"
+msgstr "Ktor� typ oddielu chcete?"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr "Nie je dostupn� �iadna floppy mechanika"
+#: ../../install_interactive.pm_.c:107
+#, fuzzy
+msgid "Computing Windows filesystem bounds"
+msgstr "Po��tam hranice FAT s�borov�ho syst�mu"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "Sp���am krok %s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr "Mus�te nastavi� swap oddiel"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
+#, fuzzy
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
-"Nevytvorili ste swap oddiel\n"
+"Varovanie!\n"
 "\n"
-"Napriek tomu pokra�ova�?"
+"DrakX teraz ide zmeni� ve�kos� v�ho windows oddielu. T�to oper�cia je\n"
+"nebezpe�n�. Bolo by vhodn� aby ste najsk�r spustili pod windows scandisk\n"
+"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_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Zvo�te ve�kos� ktor� chcete nain�talova�"
+#: ../../install_interactive.pm_.c:122
+#, fuzzy
+msgid "Which size do you want to keep for windows on"
+msgstr "Ktor� sektor si �el�te posun��?"
 
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Celkov� ve�kos�: "
+#: ../../install_interactive.pm_.c:123
+#, fuzzy, c-format
+msgid "partition %s"
+msgstr "Diskov� oddiel"
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Verzia: %s\n"
+#: ../../install_interactive.pm_.c:129
+#, fuzzy, c-format
+msgid "FAT resizing failed: %s"
+msgstr "Automatick� zmena ve�kosti zlyhala"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "Ve�kos�: %d KB\n"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr "Zvo�te bal�ky, ktor� chcete nain�talova�"
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr "Info"
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "In�tal�cia"
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr "In�talujem"
+#: ../../install_interactive.pm_.c:156
+#, fuzzy, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "Po zmene ve�kosti oddielu %s bud� v�etky d�ta nen�vratne straten�"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr "Pros�m �akajte, "
+#: ../../install_interactive.pm_.c:164
+#, fuzzy
+msgid "Expert mode"
+msgstr "Expert"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr "Zvy�n� �as "
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr "Celkov� �as "
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr "Pripravujem in�tal�ciu"
+#: ../../install_interactive.pm_.c:171
+#, fuzzy, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+"Teraz m��ete rozdeli� v� pevn� disk%s \n"
+"Ke� skon��te, nezabudnite ulo�i� zmeny pomocou `w'"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
-#, c-format
-msgid "Installing package %s"
-msgstr "In�talujem bal�k %s"
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Nem�te �iadny windows diskov� oddiel!"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr "Napriek tomu pokra�ova�?"
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Nem��em prida� �al�� oddiel"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr "Chyba pri zora�ovan� zoznamu bal�kov:"
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr "Pou�i� existuj�cu konfigur�ciu X11?"
+#: ../../install_interactive.pm_.c:218
+#, fuzzy, c-format
+msgid "Partitioning failed: %s"
+msgstr "Typ partition tabu�ky: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
-msgstr "Pros�m, zvo�te jednu z nasleduj�cich tried in�tal�cie:"
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Sp���am pr�cu so sie�ou"
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr "Nem�te �iadny windows diskov� oddiel!"
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Ukon�ujem pr�cu so sie�ou"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr "Na disku nem�te dos� priestoru pre Lnx4win"
+#: ../../install_steps.pm_.c:74
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
+"Vyskytla sa chyba a neviem ju �plne vyrie�i�.\n"
+"Pokra�ujte na vlastn� zodpovednos�."
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Dvojn�sobn� bod pripojenia %s"
+
+#: ../../install_steps.pm_.c:375
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"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 ""
-"Varovanie!\n"
-"\n"
-"DrakX teraz ide zmeni� ve�kos� v�ho windows oddielu. T�to oper�cia je\n"
-"nebezpe�n�. Bolo by vhodn� aby ste najsk�r spustili pod windows scandisk\n"
-"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."
+"Niektor� d�le�it� bal�ky neboli spr�vne nain�talovan�.\n"
+"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_gtk.pm_.c:236
-msgid "Automatic resizing failed"
-msgstr "Automatick� zmena ve�kosti zlyhala"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Vitajte v %s"
 
-#: ../../install_steps_gtk.pm_.c:265
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Ktor� oddiel chcete pou�i� pre Linux4Win?"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Nie je dostupn� �iadna floppy mechanika"
 
-#: ../../install_steps_gtk.pm_.c:284
-msgid "Choose the sizes"
-msgstr "Zvo�te ve�kosti"
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Sp���am krok %s'\n"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
-msgstr "Ve�kos� kore�ov�ho oddielu v MB: "
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
-msgstr "Ve�kos� oddielu v MB: "
+#: ../../install_steps_gtk.pm_.c:150
+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:320
+#: ../../install_steps_gtk.pm_.c:215
 #, 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:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2419,7 +3116,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:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2435,58 +3132,101 @@ 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:333
+#: ../../install_steps_gtk.pm_.c:228
 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:335
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Percentu�lny po�et bal�kov pre in�tal�ciu"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Zvo�te bal�ky, ktor� chcete nain�talova�"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "In�tal�cia"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Automatick� z�vislosti"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Uk� strom"
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Skri strom"
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Priame, alebo skupinov� triedenie"
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Chybn� bal�k"
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Meno: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Verzia: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Ve�kos�: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "D�le�it�: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Celkov� ve�kos�: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+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:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "Odstr�nen� bud� nasleduj�ce bal�ky"
+
+#: ../../install_steps_gtk.pm_.c:387
+#, fuzzy
+msgid "The following packages are going to be removed"
+msgstr "Nasleduj�ce bal�ky bud� pridan�/odstr�nen�"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "M��ete ozna�i�/odzna�i� tento bal�k"
+
+#: ../../install_steps_gtk.pm_.c:416
 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:473
+#: ../../install_steps_gtk.pm_.c:418
 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:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -2494,45 +3234,89 @@ msgstr ""
 "Tento bal�k potrebuje nov�iu verziu\n"
 "Ste si ist�, �e ho chcete odzna�i�?"
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 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:493
-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:496
-msgid "The following packages are going to be installed/removed"
-msgstr "Nasleduj�ce bal�ky bud� pridan�/odstr�nen�"
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr "M��ete ozna�i�/odzna�i� tento bal�k"
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "In�talujem"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Odhadujem"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Pros�m �akajte, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Zvy�n� �as "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Celkov� �as "
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Zru�"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Pripravujem in�tal�ciu"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d bal�ky"
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
-msgstr ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "In�talujem bal�k %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Accept"
+msgstr "Akceptuj u��vate�a"
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2546,181 +3330,385 @@ 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:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Zme� ve�kos�"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Napriek tomu pokra�ova�?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "Chyba pri zora�ovan� zoznamu bal�kov:"
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "Po�as in�tal�cie bal�kov sa vyskytla chyba:"
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr "Vyskytla sa chyba"
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
 msgid "Please, choose a language to use."
 msgstr "Pros�m, zvo�te jazyk."
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Kl�vesnica"
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Pros�m, zvo�te v� typ kl�vesnice"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 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:91
-msgid "Root Partition"
-msgstr "Kore�ov� oddiel"
-
-#: ../../install_steps_interactive.pm_.c:92
-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:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr "Trieda in�tal�cie"
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 msgid "Which installation class do you want?"
 msgstr "Ak� in�tala�n� triedu chcete pou�i�?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
 msgstr "In�tal�cia/Upgrade"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "Toto je in�tal�cia alebo upgrade?"
 
-#: ../../install_steps_interactive.pm_.c:110
-msgid "Automated"
-msgstr "Automatick�"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Customized"
 msgstr "Vlastn� v�ber"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr "Expert"
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
+#, fuzzy
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 "Ste si ist�, �e ste expert?\n"
 "Tu kon�� z�bava. Bud� v�m povolen� r�zne nebezpe�n� veci."
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+#, fuzzy
+msgid "Update"
 msgstr "Upgrade"
 
-#: ../../install_steps_interactive.pm_.c:135
-msgid "Normal"
-msgstr "Norm�lna"
+#: ../../install_steps_interactive.pm_.c:222
+#, fuzzy
+msgid "Workstation"
+msgstr "Inform�cia"
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr "V�voj�rska"
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Server"
 msgstr "Server"
 
-#: ../../install_steps_interactive.pm_.c:141
-msgid "Which usage is your system used for ?"
+#: ../../install_steps_interactive.pm_.c:228
+#, fuzzy
+msgid "What is your system used for?"
 msgstr "Na ak� pou�itie bude ur�en� v� syst�m ?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Pros�m, zvo�te typ va�ej my�i."
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Port my�i"
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 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:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Konfigurujem PCMCIA karty..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 msgid "Configuring IDE"
 msgstr "Konfigurujem IDE"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
 msgid "no available partitions"
 msgstr "nie s� dostupn� �iadne oddiely"
 
-#: ../../install_steps_interactive.pm_.c:184
-#, c-format
-msgid "(%dMB)"
-msgstr "(%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
-msgstr "Pros�m zvo�te oddiel, ktor� chcete pou�i� ako kore�ov�."
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Choose the mount points"
 msgstr "Zvo�te body pripojenia"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:316
+#, fuzzy, c-format
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"Nedok�em pre��ta� tabu�ku rozdelenia disku, je pr�li� po�koden�\n"
+"Sk�sim odstr�ni� chybn� oddiely"
+
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
+msgstr ""
+"DiskDrake nedok�zal korektne na��ta� tabu�ku rozdelenia disku.\n"
+"Pokra�ujte na vlastn� riziko!"
+
+#: ../../install_steps_interactive.pm_.c:337
+msgid "Root Partition"
+msgstr "Kore�ov� oddiel"
+
+#: ../../install_steps_interactive.pm_.c:338
+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:352
 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:236
+#: ../../install_steps_interactive.pm_.c:376
 msgid "Choose the partitions you want to format"
 msgstr "V�ber oddielov pre form�tovanie"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr "Kontrola chybn�ch blokov?"
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 msgid "Formatting partitions"
 msgstr "Form�tuje sa"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Vytv�ram a form�tujem s�bor %s"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 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:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr "H�ad�m dostupn� bal�ky"
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr "H�ad�m bal�ky pre aktualiz�ciu"
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, fuzzy, 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"
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Complete (%dMB)"
+msgstr "Norm�lna"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Minimum (%dMB)"
+msgstr "(%dMB)"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Recommended (%dMB)"
+msgstr "Norm�lna"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "Vlastn� v�ber"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Zvo�te ve�kos� ktor� chcete nain�talova�"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "V�ber skup�n bal�kov"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "Osobitn� vo�ba bal�kov"
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -2730,12 +3718,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:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom ozna�en� \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2743,173 +3731,11 @@ msgstr ""
 "In�talujem bal�k %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "Poin�tala�n� konfigur�cia"
 
-#: ../../install_steps_interactive.pm_.c:410
-msgid "Keep the current IP configuration"
-msgstr "Zachova� aktu�lnu IP konfigur�ciu"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr "Prekonfigurova� sie�"
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr "Sie�ov� slu�by nekonfigurova�"
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-msgid "Network Configuration"
-msgstr "Konfigur�cia siete"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Lok�lna sie� u� bola nakonfigurovan�. �el�te si:"
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr "�el�te si na va�om syst�me nakonfigurova� slu�by lok�lnej siete ?"
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr "nena�iel som sie�ov� kartu"
-
-#: ../../install_steps_interactive.pm_.c:449
-msgid "Modem Configuration"
-msgstr "Konfigur�cia modemu"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr "�el�te si na va�om syst�me nakonfigurova� pripojenie cez telef. sie�?"
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Konfigur�cia sie�ov�ho zariadenia %s"
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-"Zadajte IP konfigur�ciu tohoto po��ta�a.\n"
-"Ka�d� z�znam by mal by� zadan� ako IP adresa v dekadickom tvare\n"
-"oddelenom bodkami (napr. 1.2.3.4)."
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr "Automatick� IP"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr "IP adresa:"
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr "Maska siete:"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP adresa mus� by� vo form�te 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr "Konfigurujem sie�"
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-"Pros�m zadajte meno v�ho po��ta�a.\n"
-"Meno v�ho po��ta�a by malo byt plne kvalifikovan� host name,\n"
-"ako napr�klad ``hq.alert.sk''.\n"
-"Tie� m��ete zada� IP adresu br�ny ak ju viete"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr "DNS server:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr "Zariadenie smeruj�ce k br�ne:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr "Br�na:"
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr "N�zov po��ta�a:"
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr "H�ada� modem?"
-
-#: ../../install_steps_interactive.pm_.c:521
-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."
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr "Vo�by dialupu"
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr "Meno pripojenia"
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr "Telef�nne ��slo"
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr "Prihlasovacie ID"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr "Autentifik�cia"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr "PAP"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr "Zalo�en� na skriptoch"
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr "Zalo�en� na termin�ly"
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr "N�zov dom�ny"
-
-#: ../../install_steps_interactive.pm_.c:535
-msgid "First DNS Server"
-msgstr "Prv� DNS server"
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Second DNS Server"
-msgstr "Druh� DNS server"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2968,88 +3794,94 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 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:588
+#: ../../install_steps_interactive.pm_.c:676
 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:592
+#: ../../install_steps_interactive.pm_.c:679
 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:606
+#: ../../install_steps_interactive.pm_.c:691
+#, fuzzy
 msgid "Which is your timezone?"
-msgstr "Ktor� je va�a �asov� z�na?"
+msgstr "Na ak� pou�itie bude ur�en� v� syst�m ?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "S� va�e hardv�rov� hodiny nastaven� na GMT?"
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "Ktor� typ oddielu chcete?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "Bez hesla"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "Pou�i s�bor shadow"
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "shadow"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "Pou�i hesl� kryptovan� cez MD5"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "Pou�i NIS"
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "�lt� str�nky"
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, 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:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "NIS autentifik�cia"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS dom�na"
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS server"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Akceptuj u��vate�a"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Pridaj u��vate�a"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(u� pridan� %s)"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3059,60 +3891,87 @@ msgstr ""
 "Zadajte u��vate�a\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Re�lne meno"
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "U��vate�sk� meno"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Toto heslo je pr�li� jednoduch�"
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Pros�m zadajte u��vate�sk� meno"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 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 `_'"
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Tak�to u��vate� je u� pridan�"
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+#, fuzzy
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+"Individu�lna zav�dzacia disketa poskytuje mo�nos� zavies� v� syst�m Linux\n"
+"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"
+"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:869
 msgid "First floppy drive"
 msgstr "Prv� floppy mechanika"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "Druh� floppy mechanika"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Vynechaj"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -3134,64 +3993,33 @@ msgstr ""
 "\n"
 "�el�te si vytvori� zav�dzaciu disketu pre v� syst�m?"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "Prep��te, nena�iel som �iadnu disketov� mechaniku"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
 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:772
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Vlo�te disketu do mechaniky %s"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "Vytv�ram bootdisk"
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "In�tal�cia LILA zlyhala. Vyskytla sa nasleduj�ca chyba:"
-
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Do you want to use SILO?"
-msgstr "Chcete pou�i� SILO?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr "Hlavn� parametre SILA"
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-"V SILE s� moment�lne tieto z�znamy.\n"
-"M��ete ich meni�, alebo prid�va� �al�ie."
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr "Diskov� oddiel"
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr "Tento z�znam je u� pou�it�"
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr "In�tal�cia SILA zlyhala. Vyskytla sa nasleduj�ca chyba:"
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "Pripravuje sa zav�dza�"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
+#, fuzzy
 msgid "Do you want to use aboot?"
-msgstr "Chcete pou�i� ABOOT?"
+msgstr "Chcete pou�i� SILO?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3199,125 +4027,114 @@ 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:930
-msgid "Proxies configuration"
-msgstr "Konfigur�cia proxy servrov"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
-msgstr "FTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr "Proxy m� by� http://..."
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr "Proxy m� by� ftp://..."
+#: ../../install_steps_interactive.pm_.c:925
+#, fuzzy
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "In�tal�cia LILA zlyhala. Vyskytla sa nasleduj�ca chyba:"
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "�iadna"
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Ve�mi slab�"
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Slab�"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Stredn�"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Vysok�"
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoidn�"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "R�zne vo�by"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(m��e sp�sobi� stratu d�t)"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "Pou�i� optimaliz�ciu disku?"
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Vo�ba bezpe�nostnej �rovne"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Presn� ve�kos� pam�ti (na�iel som %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "Automatick� prip�janie vymenite�n�ch m�di�"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "Vy�isti� /tmp pri ka�dom �tarte"
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "Dovoli� multi profily"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "Zapn�� num lock pri �tarte"
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "Zadajte ve�kos� pam�ti v Mb"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "V tak vysokej �rovni bezpe�nosti nem��em pou�i� supermount"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
-"DrakX dok�e vytvori� konfigura�n� s�bory pre XFree 3.3 aj pre XFree 4.0.\n"
-"Predvolen� je 3.3 server, preto�e podporuje viac grafick�ch kariet.\n"
-"\n"
-"�el�te si vysk��a� XFree 4.0?"
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
-msgstr "Sk�si� n�js� PCI zariadenia?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Pou�i� existuj�cu konfigur�ciu X11?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 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:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Vlo�te �ist� disketu do mechaniky %s"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "Pripravujem auto in�tala�n� disketu"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -3327,7 +4144,7 @@ msgstr ""
 "\n"
 "Naozaj chcete ukon�i� in�tal�ciu?"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -3349,153 +4166,18 @@ msgstr ""
 "Inform�cie o konfigur�cii v�ho syst�mu je dostupn� v post install kapitole "
 "pr�ru�ky Official Linux Mandrake User's Guide."
 
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr "Ukon�ujem"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "In�talujem ovl�da� pre %s kartu %s"
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr "(modul %s)"
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Ktor� %s ovl�da� m�m sk�si�?"
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"Ovl�da� %s niekedy potrebuje pre spr�vnu �innos� doplnkov� inform�ciu, aj\n"
-"ke� zvy�ajne pracuje spr�vne aj bez nej. �el�te si zada� doplnkov� vo�by,\n"
-"alebo dovol�te ovl�da�u otestova� v� po��ta� a �daje si zisti�? Ob�as sa\n"
-"stane, �e toto testovanie po��ta� zablokuje, ale nemalo by sp�sobi� �iadnu "
-"�kodu."
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr "Automatick� zistenie"
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr "Zadajte vo�by"
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Teraz m��ete zada� parametre pre modul %s."
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-"Teraz m��ete zada� parametre pre modul %s.\n"
-"Parametre s� vo form�te ``meno=hodnota meno2=hodnota2 ...''.\n"
-"Napr�klad: ``io=0x300 irq=7''"
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr "Parametre modulu:"
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Nahr�vanie modulu %s zlyhalo.\n"
-"Chcete sa o to pok�si� znova s in�mi parametrami?"
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr "Sk�si� n�js� PCMCIA karty?"
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr "Konfigurujem PCMCIA karty..."
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Sk�si� n�js� %s zariadenia?"
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Na�iel som %s %s rozhranie"
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr "M�te e�te nejak� �al�ie?"
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "M�te nejak� %s rozhranie?"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Nie"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "�no"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr "Prezrite si inform�cie o technick�ch prostriedkoch"
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr "Sp���am pr�cu so sie�ou"
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr "Ukon�ujem pr�cu so sie�ou"
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "In�tal�cia Linux-Mandrake %s"
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> medzi polo�kami  |  <Medzera> ozna�uje  |  <F12> �alej"
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-"Teraz m��ete rozdeli� v� pevn� disk%s \n"
-"Ke� skon��te, nezabudnite ulo�i� zmeny pomocou `w'"
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr "Pros�m �akajte"
 
@@ -3505,7 +4187,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr "Nejednozna�nos� (%s), bu�te presnej��\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr "Chybn� vo�ba, sk�ste znovu\n"
 
@@ -3519,447 +4201,969 @@ msgstr " ? (predvolen� %s) "
 msgid "Your choice? (default %s) "
 msgstr "Va�a vo�ba? (predvolen� %s) "
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Va�a vo�ba? (predvolen� %s vlo�te `none' pre ni� "
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr "�esk�"
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr "Nemeck�"
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr "�panielska"
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr "F�nska"
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr "Franc�zska"
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr "N�rska"
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr "Polsk�"
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr "Rusk�"
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr "UK kl�vesnica"
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr "US kl�vesnica"
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr "Arm�nska (star�)"
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr "Arm�nska (p�sac� stroj)"
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr "Arm�nska (fonetick�)"
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr "Belgick�"
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr "Bulharsk�"
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr "Braz�lska"
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr "Bielorusk�"
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr "�vaj�iarska (Nemeck� rozlo�enie kl�ves)"
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr "�vaj�iarska (Franc�zske rozlo�enie kl�ves)"
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr "Nemeck� (bez m�tvych kl�ves)"
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr "D�nska"
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+#, fuzzy
+msgid "Dvorak (US)"
+msgstr "Dvorak"
+
+#: ../../keyboard.pm_.c:139
+#, fuzzy
+msgid "Dvorak (Norwegian)"
+msgstr "N�rska"
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr "Est�nska"
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gruz�nska (\"Rusk�\" rozlo�enie kl�ves)"
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gruz�nska (\"Latin\" rozlo�enie kl�ves)"
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr "Gr�cka"
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr "Ma�arsk�"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr "Chorv�tska"
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr "Izraelsk�"
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr "Izraelsk� (fonetick�)"
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+#, fuzzy
+msgid "Iranian"
+msgstr "Ukrainsk�"
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr "Islandsk�"
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr "Talianska"
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr "Latinsko Americk�"
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr "Holandsk�"
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litovsk� AZERTY (star�)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litovsk� AZERTY (nov�)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litovsk� QWERTY"
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litovsk� \"fonetick�\" QWERTY"
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr "Po�sk� (qwerty rozlo�enie kl�ves)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr "Po�sk� (qwertz rozlo�enie kl�ves)"
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr "Portugalsk�"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr "Kanadsk� (Quebec)"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr "Rusk� (Yawerty)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr "�v�dska"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr "Slovinsk�"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr "Slovensk�"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr "Thaisk� kl�vesnica"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Tureck� (tradi�n� \"F\" model)"
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Tureck� (modern� \"Q\" model)"
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr "Ukrainsk�"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr "US kl�vesnica (medzin�rodn�)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+#, fuzzy
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Litovsk� QWERTY"
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr "Juhoslovansk�"
 
-# 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.
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr "Sun my�"
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr "Kensington Thinking Mouse"
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr "Genius NetMouse"
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "V�eobecn�"
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "�rove�"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr "s�riov�"
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr "�tandardn� trojtla��tkov�"
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm_.c:53
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr "Logitech CC Series"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr "MM Series"
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (s�riov�, star� typ C7)"
+
+#: ../../mouse.pm_.c:64
+#, fuzzy
+msgid "busmouse"
+msgstr "�iadna my�"
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "ni�"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr "�iadna my�"
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr "Je to spr�vne?"
+
+#: ../../netconnect.pm_.c:93
+#, fuzzy
+msgid "Internet configuration"
+msgstr "Konfigur�cia proxy servrov"
+
+#: ../../netconnect.pm_.c:94
+#, fuzzy
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Otestova� konfigur�ciu?"
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Sie�ov� slu�by"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Ktor� disk si �el�te posun��?"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Meno pripojenia"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+#, fuzzy
+msgid "ISDN Configuration"
+msgstr "Konfigur�cia"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "Konfigur�cia proxy servrov"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
+msgstr ""
+
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
+msgstr ""
+
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
+msgstr ""
+
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:169
+#, fuzzy
+msgid "Provider phone number"
+msgstr "Telef�nne ��slo"
+
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
+msgstr ""
+
+#: ../../netconnect.pm_.c:172
+#, fuzzy
+msgid "Dialing mode"
+msgstr "N�zov dom�ny"
+
+#: ../../netconnect.pm_.c:174
+#, fuzzy
+msgid "Account Login (user name)"
+msgstr "Bod pripojenia"
+
+#: ../../netconnect.pm_.c:175
+#, fuzzy
+msgid "Account Password"
+msgstr "Heslo"
+
+#: ../../netconnect.pm_.c:176
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Heslo"
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "Test konfigur�cie"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:214
+#, fuzzy
+msgid "Which protocol do you want to use ?"
+msgstr "Ktor� typ oddielu chcete?"
+
+#: ../../netconnect.pm_.c:224
+#, fuzzy
+msgid "ISA / PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:226
+#, fuzzy
+msgid "PCI"
+msgstr "PCMCIA"
+
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
+msgstr ""
+
+#: ../../netconnect.pm_.c:233
+#, fuzzy
+msgid "What kind of card do you have?"
+msgstr "Ak� typ tla�iarne m�te?"
+
+#: ../../netconnect.pm_.c:239
+#, fuzzy
+msgid "Continue"
+msgstr "Pokra�ova�?"
+
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
+msgstr ""
+
+#: ../../netconnect.pm_.c:245
 msgid ""
-"Welcome to LILO the operating system chooser!\n"
 "\n"
-"To list the possible choices, press <TAB>.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait %d seconds for "
-"default boot.\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:257
+#, fuzzy
+msgid "Which is your ISDN card ?"
+msgstr "Ktor� je va�a �asov� z�na?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:287
+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 ""
+
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr ""
+
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "Zvolte nov� ve�kos�"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Pros�m zvo�te, ktor�mu s�riov�mu portu je va�a my� pripojen�."
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:352
+msgid ""
 "\n"
+"Do you agree?"
 msgstr ""
-"Vitajte v zav�dza�i LILO!\n"
+
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "Otestova� konfigur�ciu?"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "Konfigur�cia"
+
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "Chcete pou�i� ABOOT?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
+msgstr "H�ada� modem?"
+
+#: ../../netconnect.pm_.c:539
+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:544
+msgid "Dialup options"
+msgstr "Vo�by dialupu"
+
+#: ../../netconnect.pm_.c:545
+msgid "Connection name"
+msgstr "Meno pripojenia"
+
+#: ../../netconnect.pm_.c:546
+#, fuzzy
+msgid "Phone number"
+msgstr "Telef�nne ��slo"
+
+#: ../../netconnect.pm_.c:547
+msgid "Login ID"
+msgstr "Prihlasovacie ID"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
+msgstr "Autentifik�cia"
+
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
+msgstr "Zalo�en� na skriptoch"
+
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
+msgstr "Zalo�en� na termin�ly"
+
+#: ../../netconnect.pm_.c:550
+#, fuzzy
+msgid "Domain name"
+msgstr "Meno pripojenia"
+
+#: ../../netconnect.pm_.c:552
+msgid "First DNS Server"
+msgstr "Prv� DNS server"
+
+#: ../../netconnect.pm_.c:553
+msgid "Second DNS Server"
+msgstr "Druh� DNS server"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
 "\n"
-"Pre zoznam mo�n�ch volieb stla�te <TAB>.\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Meno pripojenia"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
 "\n"
-"Pre spustenie jednej z nich, nap��te jej meno a stla�te <ENTER>, alebo\n"
-"po�kajte %d sek�nd pre predvolen� mo�nos�.\n"
+"You can reconfigure your connection."
+msgstr "Sie�ov� slu�by"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Ktor� disk si �el�te posun��?"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
 "\n"
+"You can disconnect or reconfigure your connection."
+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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Vitajte v zav�dza�i opera�n�ho syst�mu GRUB"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Ktor� disk si �el�te posun��?"
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "Pou�ite kl�vesy %c a %c pre ozna�enie z�znamu zv�raznen�m"
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Meno pripojenia"
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Stla�te enter pre zavedenie ozna�en�ho OS, 'e' pre �pravu"
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Meno pripojenia"
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "pr�kazov pred zaveden�m, alebo 'c' pre pr�kazov� riadok"
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Sie�ov� slu�by"
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Ozna�en� OS bude zaveden� za %d sek�nd."
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "Pripojenie tla�iarne"
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
-msgstr "nie je dos� miesta v /boot"
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
-msgstr "Desktop"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Sie�ov� slu�by"
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
-msgstr "�tart menu"
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Sie�ov� slu�by"
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
-msgstr "Sun my�"
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
+msgstr ""
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
-msgstr "Apple ADB My�"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Expert"
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
-msgstr "Apple ADB My� (dvojtla��tkov�)"
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+#, fuzzy
+msgid "Connect to the Internet"
+msgstr "Meno pripojenia"
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
-msgstr "Apple ADB My� (troj a viac tla��tkov�)"
+#: ../../netconnect.pm_.c:672
+#, fuzzy
+msgid "What kind is your ISDN connection?"
+msgstr "Ku ktor�mu s�riov�mu portu je va�a my� pripojen�?"
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
-msgstr "Apple USB My�"
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Sie�ov� slu�by"
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
-msgstr "Apple USB My� (dvojtla��tkov�)"
+#: ../../netconnect.pm_.c:700
+#, fuzzy
+msgid "France"
+msgstr "Zru�"
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
-msgstr "Apple USB My� (troj a viac tla��tkov�)"
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
+msgstr ""
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
-msgstr "�tandardn� my� (PS/2)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
+msgstr ""
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
-msgstr "Logitech MouseMan/FirstMouse (PS/2)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
+msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
-msgstr "�tandardn� trojtla��tkov� (PS/2)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "Expert"
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
-msgstr "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
-msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
-msgstr "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
+msgstr ""
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
-msgstr "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
-msgstr "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Sie�ov� slu�by"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
-msgstr "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Ktor� typ oddielu chcete?"
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
-msgstr "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Sie�ov� slu�by"
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
-msgstr "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "Sie�ov� slu�by"
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
-msgstr "ATI Bus My�"
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Konfigur�cia siete"
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
-msgstr "Microsoft Bus My�"
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "Otestova� konfigur�ciu?"
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
-msgstr "Logitech Bus My�"
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "Sie�ov� slu�by"
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
-msgstr "USB My�"
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Meno pripojenia"
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
-msgstr "USB My� (troj a viac tla��tkov�)"
+#: ../../netconnect.pm_.c:835
+#, fuzzy
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr "Lok�lna sie� u� bola nakonfigurovan�. �el�te si:"
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
-msgstr "�iadna my�"
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "Ktor� disk si �el�te posun��?"
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A alebo viac (s�riov�)"
+#: ../../netconnect.pm_.c:858
+msgid "Network Configuration"
+msgstr "Konfigur�cia siete"
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (s�riov�)"
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (s�riov�)"
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr "nena�iel som sie�ov� kartu"
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (s�riov�)"
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+msgid "Configuring network"
+msgstr "Konfigurujem sie�"
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (s�riov�)"
+#: ../../network.pm_.c:274
+#, fuzzy
+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.\n"
+"Meno v�ho po��ta�a by malo byt plne kvalifikovan� host name,\n"
+"ako napr�klad ``hq.alert.sk''.\n"
+"Tie� m��ete zada� IP adresu br�ny ak ju viete"
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (s�riov�)"
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+#, fuzzy
+msgid "Host name"
+msgstr "N�zov po��ta�a:"
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
-msgstr "MM Series (s�riov�)"
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (s�riov�)"
+#: ../../network.pm_.c:302
+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 ""
+"Zadajte IP konfigur�ciu tohoto po��ta�a.\n"
+"Ka�d� z�znam by mal by� zadan� ako IP adresa v dekadickom tvare\n"
+"oddelenom bodkami (napr. 1.2.3.4)."
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (s�riov�, star� typ C7)"
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Konfigur�cia sie�ov�ho zariadenia %s"
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (s�riov�)"
+#: ../../network.pm_.c:314
+msgid "Automatic IP"
+msgstr "Automatick� IP"
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
-msgstr "�tandardn� my� (s�riov�)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "IP address"
+msgstr "IP adresa:"
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft kompatibiln� (s�riov�)"
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Netmask"
+msgstr "Maska siete:"
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "�tandardn� trojtla��tkov� (s�riov�)"
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (s�riov�)"
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP adresa mus� by� vo form�te 1.2.3.4"
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
-msgstr "Je to spr�vne?"
+#: ../../network.pm_.c:341
+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 ""
+"Pros�m zadajte meno v�ho po��ta�a.\n"
+"Meno v�ho po��ta�a by malo byt plne kvalifikovan� host name,\n"
+"ako napr�klad ``hq.alert.sk''.\n"
+"Tie� m��ete zada� IP adresu br�ny ak ju viete"
+
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "DNS server:"
+
+#: ../../network.pm_.c:347
+#, fuzzy
+msgid "Gateway"
+msgstr "Br�na:"
+
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "Zariadenie smeruj�ce k br�ne:"
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Poin�tala�n� konfigur�cia"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr "Proxy m� by� http://..."
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr "Proxy m� by� ftp://..."
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr "Na tejto platforme njeje podporovan� roz��ren� oddiel"
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 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 "
@@ -3970,21 +5174,21 @@ 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:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr "chyba pri ��tan� zo s�boru %s"
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Obnovenie zo s�boru %s zlyhalo: %s"
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr "Chybn� z�lohovac� s�bor"
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr "chyba pri z�pise do s�boru %s"
@@ -4018,42 +5222,56 @@ msgstr "zauj�mav�"
 msgid "maybe"
 msgstr "mo�no"
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr "i18n (d�le�it�)"
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr "i18n (ve�mi pekn�)"
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr "i18n (pekn�)"
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
-msgstr "Uk� menej"
-
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr "Uk� viac"
-
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Lok�lna tla�iare�"
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:20
+#, fuzzy
+msgid "Remote printer"
+msgstr "Vo�by vzdialenej lpd tla�iarne"
+
+#: ../../printer.pm_.c:21
+#, fuzzy
+msgid "Remote CUPS server"
+msgstr "Vzdialen� fronta"
+
+#: ../../printer.pm_.c:22
+#, fuzzy
+msgid "Remote lpd server"
 msgstr "Vzdialen� tla�ov� fronta"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "Vo�by tla�iarne pre NetWare"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Zariadenie tla�iarne"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Zis�ujem zariadenia..."
@@ -4067,11 +5285,11 @@ msgstr "Test portov"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Bola zisten� tla�iare�, model \"%s\" na "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr "Lok�lne zariadenie tla�iarne"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4079,15 +5297,15 @@ msgstr ""
 "Ku ktor�mu zariadeniu je va�a tla�iare� pripojen�?\n"
 "(/dev/lp0 zodpoved� LPT1)\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 msgid "Printer Device"
 msgstr "Zariadenie tla�iarne"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr "Vo�by vzdialenej lpd tla�iarne"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4097,19 +5315,19 @@ msgstr ""
 "tla�ov�ho servera a n�zov fronty na tomto serveri, do ktorej maj� by�\n"
 "tla�ov� �lohy zara�ovan�."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr "N�zov vzdialen�ho po��ta�a"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr "Vzdialen� fronta"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Vo�by tla�iarne SMB/Windows 9x/NT"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4123,27 +5341,27 @@ 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:81
+#: ../../printerdrake.pm_.c:90
 msgid "SMB server host"
 msgstr "N�zov SMB servra"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 msgid "SMB server IP"
 msgstr "IP adresa SMB servra"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr "N�zov zdie�an�ho zariadenia"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr "Pracovn� skupina"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr "Vo�by tla�iarne pre NetWare"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4154,130 +5372,155 @@ 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:107
+#: ../../printerdrake.pm_.c:125
 msgid "Printer Server"
 msgstr "Tla�ov� server"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr "N�zov tla�ovej fronty"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "Vo�by tla�iarne pre NetWare"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "Vo�by tla�iarne"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "Ve�mi slab�"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr "Ak� typ tla�iarne m�te?"
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+msgid "Do you want to test printing?"
+msgstr "�el�te si vysk��a� nastavenie tla�iarne?"
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr "Prebieha tla� testovacej str�nky..."
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"Testovacia str�nka bola zaslan� tla�ov�mu d�monu.\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:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+"Testovacia str�nka bola zaslan� tla�ov�mu d�monu.\n"
+"K�m za�ne tla�iare� tla�i�, m��e to chv��ku trva�.\n"
+"Prebehol test spr�vne?"
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr "�no, vytla�i� ASCII testovaciu str�nku"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr "�no, vytla�i� PostScript testovaciu str�nku"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr "�no, vytla�i� obidve testovacie str�nky"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr "Konfigur�cia tla�iarne"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Ak� typ tla�iarne m�te?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 msgid "Printer options"
 msgstr "Vo�by tla�iarne"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr "Ve�kos� papiera"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr "Vysun�� str�nku na konci �lohy?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr "Parametre Uniprint ovl�da�a"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr "Parametre farebnej h�bky"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr "Tla�i� text ako PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr "Obr�ten� poradie str�nok"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr "Opravi� schod�kov� efekt?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr "Po�et str�n na v�stupn� strany"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "Prav�/�av� okraj v bodoch (1/72 palca)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Horn�/Doln� okraj v bodoch (1/72 palca)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr "�al�ie parametre pre GhostScript"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr "�al�ie parametre textu"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "�el�te si vysk��a� nastavenie tla�iarne?"
-
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
-msgstr "Prebieha tla� testovacej str�nky..."
-
-#: ../../printerdrake.pm_.c:218
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"Testovacia str�nka bola zaslan� tla�ov�mu d�monu.\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:222
-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?"
-msgstr ""
-"Testovacia str�nka bola zaslan� tla�ov�mu d�monu.\n"
-"K�m za�ne tla�iare� tla�i�, m��e to chv��ku trva�.\n"
-"Prebehol test spr�vne?"
-
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:346
 msgid "Printer"
 msgstr "Tla�iarne"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printerdrake.pm_.c:347
 msgid "Would you like to configure a printer?"
 msgstr "�el�te si nastavi� tla�iare�?"
 
-#: ../../printerdrake.pm_.c:243
+#: ../../printerdrake.pm_.c:350
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4285,19 +5528,68 @@ msgstr ""
 "Moment�lne sa tu nach�dzaj� tieto tla�ov� fronty.\n"
 "M��ete prid�va� �al�ie, alebo meni� existuj�ce."
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "Odhadujem"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
 msgid "Select Printer Connection"
 msgstr "Zvo�te pripojenie tla�iarne"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
 msgid "How is the printer connected?"
 msgstr "Ako je tla�iare� pripojen�?"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:387
+#, fuzzy
+msgid "Select Remote Printer Connection"
+msgstr "Zvo�te pripojenie tla�iarne"
+
+#: ../../printerdrake.pm_.c:388
+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 ""
+
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
 msgid "Remove queue"
 msgstr "Odstr�� frontu"
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:400
+#, fuzzy
+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�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�?"
+
+#: ../../printerdrake.pm_.c:404
+#, fuzzy
+msgid "Name of printer"
+msgstr "Lok�lna tla�iare�"
+
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "Zadajte vo�by"
+
+#: ../../printerdrake.pm_.c:406
+#, fuzzy
+msgid "Location"
+msgstr "Inform�cia"
+
+#: ../../printerdrake.pm_.c:419
 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"
@@ -4308,45 +5600,45 @@ msgstr ""
 "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�?"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr "Meno fronty"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr "Spool adres�r"
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 msgid "Printer Connection"
 msgstr "Pripojenie tla�iarne"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, 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:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr "Nem��em zap�sa� s�bor $file"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr "mkraid zlyhal"
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid zlyhal (mo�no nie s� nain�talovan� raidtools)"
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Nie je dos� oddielov pre RAID �rovne %d\n"
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, periodick� pl�nova� pr�kazov."
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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."
@@ -4354,13 +5646,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:17
+#: ../../services.pm_.c:18
 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:19
+#: ../../services.pm_.c:20
 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 "
@@ -4370,7 +5662,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:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -4381,7 +5673,7 @@ 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:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -4389,7 +5681,7 @@ msgstr ""
 "Apache je WWW server. Je pou��van� na poskytovanie HTML str�nok a\n"
 "CGI skriptov."
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -4403,7 +5695,7 @@ msgstr ""
 "ako telnet, ftp, rsh, rlogin a in�. Vypnut�m inetd vypnete v�etky\n"
 "slu�by, za ktor� je zodpovedn�."
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -4413,14 +5705,14 @@ msgstr ""
 "/etc/sysconfig/keyboard. Nastavenie sa d� meni� napr�klad pomocou\n"
 "konfigura�n�ho n�stroja kbdconfig."
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 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:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -4428,7 +5720,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:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -4436,7 +5728,7 @@ msgstr ""
 "Prip�ja a odp�ja v�etky NFS, SMB (Windows) a NCP (NetWare)\n"
 "body pripojenia."
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -4444,7 +5736,7 @@ msgstr ""
 "Aktivuje/Deaktivuje v�etky sie�ov� zariadenia konfigurovan� pre spustenie\n"
 "po zaveden� syst�mu."
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 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"
@@ -4454,7 +5746,7 @@ msgstr ""
 "T�to slu�ba dovol� NFS servru exportova� adres�re predvolen� v s�bore\n"
 "/etc/exports"
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -4462,7 +5754,7 @@ 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:47
+#: ../../services.pm_.c:48
 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 "
@@ -4472,7 +5764,7 @@ msgstr ""
 "Podpora PCMCIA je v��inou pou��van� na spr�stupnenie sie�ovej karty,\n"
 "alebo modemu v notebookoch."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4483,7 +5775,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:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -4491,7 +5783,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:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -4499,7 +5791,7 @@ msgstr ""
 "Uklad� a obnovuje system entropy pool pre vy��iu kvalitu gener�tora\n"
 "n�hodn�ch ��sel."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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"
@@ -4509,7 +5801,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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -4517,7 +5809,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:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -4525,7 +5817,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:64
+#: ../../services.pm_.c:65
 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)."
@@ -4533,7 +5825,7 @@ 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:66
+#: ../../services.pm_.c:67
 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."
@@ -4541,53 +5833,200 @@ 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:68
+#: ../../services.pm_.c:69
 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�."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr "Sp���a a ukon�uje X Font Server pri �tarte a ukon�en� syst�mu."
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 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"
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
-"Vitajte v zav�dza�i opera�n�ho syst�mu SILO!\n"
-"\n"
-"Pre zoznam mo�n�ch volieb stla�te <TAB>.\n"
-"\n"
-"Pre v�ber vo�by, nap��te jej meno a stla�te <ENTER>, alebo \n"
-"�akajte %d sek�nd pre predvolen� akciu.\n"
-"\n"
+"Nedok�em pre��ta� tabu�ku rozdelenia disku, je pr�li� po�koden�\n"
+"Sk�sim odstr�ni� chybn� oddiely"
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr "Konfigur�cia LILO/GRUB"
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr "Vytvor zav�dzaciu disketu"
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 msgid "Format floppy"
 msgstr "Naform�tuj disketu"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 msgid "Choice"
 msgstr "Vo�ba"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "In�tal�cia LILA zlyhala. Vyskytla sa nasleduj�ca chyba:"
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Tabu�ka"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Konfigur�cia X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Tabu�ka"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+#, fuzzy
+msgid "Internet Connection Sharing"
+msgstr "Pripojenie tla�iarne"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+#, fuzzy
+msgid "using module"
+msgstr "N�zov dom�ny"
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "Na��tavam konfigur�ciu"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Konfigurujem IDE"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+msgid "Congratulations!"
+msgstr "Gratulujeme!"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4645,23 +6084,35 @@ msgstr "Nastavujem �rove� bezpe�nosti"
 msgid "Choose the tool you want to use"
 msgstr "Vyberte n�stroj, ktor� chcete pou�i�"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Ak� typ kl�vesnice m�te?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Zme� rozl��enie"
+
+#: ../../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 ""
+"Zme�te v� CD-ROM disk!\n"
+"\n"
+"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."
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Ak� typ my�i m�te?"
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
+msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr "nebolo n�jden� serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr "Emulova� 3 tla��tka?"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 msgid "Which serial port is your mouse connected to?"
 msgstr "Ku ktor�mu s�riov�mu portu je va�a my� pripojen�?"
 
@@ -4874,6 +6325,796 @@ msgstr "Hrad�m listy"
 msgid "Finding leaves takes some time"
 msgstr "H�adanie listov zaberie trochu �asu"
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Internet"
+
+msgid "Internet"
+msgstr "Internet"
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+msgid "Office"
+msgstr "Office"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multim�di�"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multim�di�"
+
+#, fuzzy
+msgid "KDE"
+msgstr "IDE"
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Multim�di�"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multim�di�"
+
+msgid "Gnome"
+msgstr "Gnome"
+
+msgid "Documentation"
+msgstr "Dokument�cia"
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Gnome"
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Multim�di�"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Zvo�te ve�kos� ktor� chcete nain�talova�"
+
+#~ msgid "Total size: "
+#~ msgstr "Celkov� ve�kos�: "
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "Prekonfigurova� sie�"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Meno pripojenia"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Meno pripojenia"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Meno pripojenia"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Meno pripojenia"
+
+#, fuzzy
+#~ msgid "Germany"
+#~ msgstr "Nemeck�"
+
+#, fuzzy
+#~ msgid "Germany (1TR6)"
+#~ msgstr "Nemeck�"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "�o chcete robi�?"
+
+#, fuzzy
+#~ msgid "Install/Rescue"
+#~ msgstr "In�tal�cia"
+
+#, fuzzy
+#~ msgid "Rescue"
+#~ msgstr "Zme� ve�kos�"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Ktor� typ oddielu chcete?"
+
+#, 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Zvo�te \"In�tal�cia\" ak ste pred t�m nemali nain�talovan� predo�l� verziu\n"
+#~ "linuxu, alebo ak chcete pou��va� viac distrib�ci�, alebo verzii.\n"
+#~ "\n"
+#~ "Zvo�te \"Upgrade\" ak chcete aktualizova� predo�l� verzie linuxu Mandrake:\n"
+#~ "%s or %s.\n"
+#~ "\n"
+#~ "Zvo�te:\n"
+#~ "\n"
+#~ "  - Automatick�: Ak ste e�te nikdy Linux nein�talovali. Automaticky\n"
+#~ " nain�taluje Linux-Mandrake ako jedin� opera�n� syst�m\n"
+#~ "\n"
+#~ "  - Vlastn� v�ber: Ak Linux u� trochu pozn�te, viete rozl��i�, �i chcete\n"
+#~ "norm�lnu pracovn� stanicu, server, alebo v�voj�rsku pracovn� stanicu.\n"
+#~ "Pod�a toho v nasleduj�com kroku aj zvo�te \"Norm�lna\", \"V�voj�rska\",\n"
+#~ "alebo \"Server\".\n"
+#~ "\n"
+#~ "  - Expert: Ak sa v Linuxe vyzn�te a chcete si presne nastavi� aplik�cie,\n"
+#~ "ktor� budete pou��va�.\n"
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "V tomto kroku budete ma� mo�nos� si zvoli� diskov� oddiel ur�en� pre\n"
+#~ "in�tal�ciu v�ho Mandrake, resp. si potrebn� oddiely povytv�ra�.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ak chcete vytvori� nov� oddiel, m��ete zvoli� \"Automaticky prerozde�\" pre\n"
+#~ "automatick� vytv�ranie oddielov pre Linux. M��ete zvoli� disk pre\n"
+#~ "prerozdelenie kliknut�m napr�klad na \"hda\" pre prv� IDE pevn� disk,\n"
+#~ "alebo \"sda\" pre prv� SCSI pevn� disk.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dva �asto pou��van� oddiely s�: kore�ov� oddiel (/) �o je z�kladn� kame�\n"
+#~ "v �trukt�re Linux s�borov�ho syst�mu a /boot, ktor� obsahuje v�etky s�bory\n"
+#~ "potrebn� pre spr�vne zavedenie syst�mu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Preto�e s� tieto kroky nevratn�, m��e proces rozde�ovania disku p�sobi�\n"
+#~ "na nesk�sen�ch u��vate�ov zastra�uj�co a stresovo. DiskDrake tento proces\n"
+#~ "zjednodu�uje, len na to naozaj najnutnej�ie. Pre��tajte si dokument�ciu a\n"
+#~ "s k�udom sa pustte do pr�ce.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ka�d� vo�bu m��ete dosiahnu� aj pomocou kurzorov�ch skratiek. Pohyb medzi\n"
+#~ "oddielmi ovl�date kl�vesou <Tab> a ��pkami <Up> a <Down>. Ke� je oddiel\n"
+#~ "ozna�en�, m��ete pou�i�:\n"
+#~ "\n"
+#~ "- Ctrl-c pre vytvorenie nov�ho oddielu (ak je ozna�en� pr�zdna �as� disku)\n"
+#~ "\n"
+#~ "- Ctrl-d pre odstr�nenie oddielu\n"
+#~ "\n"
+#~ "- Ctrl-m pre nastavenie bodu pripojenia\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."
+#~ msgstr ""
+#~ "Ka�d� oddiel, ktor� bol nanovo vytvoren�, mus� by� pred pou�it�m\n"
+#~ "naform�tovan�(form�tovanie znamen� vytv�ranie s�borov�ho syst�mu)\n"
+#~ "Teraz m��ete preform�tova� aj oddiely, ktor� u� existovali ak z nich\n"
+#~ "chcete odstr�ni� d�ta.\n"
+#~ "Pozn�mka: Nie je nutn� reform�tova� star�ie oddiely."
+
+#~ 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."
+#~ msgstr ""
+#~ "In�taluj� sa bal�ky, ktor� ste ozna�ili. T�to oper�cia\n"
+#~ "m��e trva� nieko�ko min�t. Ak ste zvolili upgrade u� existuj�ceho\n"
+#~ "syst�mu, bude chv��ku trva� ne� za�ne in�tal�cia bal�kov."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "Ak DrakX zlyh� pri h�adan� va�ej my�i, budete ma� mo�nos� zvoli� si\n"
+#~ "spr�vnu my� zo zoznamu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ak s�hlas�te s DrakX nastaven�m, jednoducho pokra�ujte �alej. Inak\n"
+#~ "zvo�te typ my�i.\n"
+#~ "\n"
+#~ "\n"
+#~ "V pr�pade s�riovej my�i by ste mali tie� zada� na ktor�mu s�riov�mu\n"
+#~ "portu je pripojen�."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "Tento krok je ur�en� pre konfigur�ciu pripojenia k lok�lnej sieti\n"
+#~ "alebo modemu.\n"
+#~ "\n"
+#~ "Zvo�te \"Lok�lna sie�\" a DrakX sk�si n�js� na va�om po��ta�i sie�ov�\n"
+#~ "kartu. PCI adapt�ry by mali by� n�jden� a inicializovan� automaticky.\n"
+#~ "Ak m�te ISA sie�ov� kartu, alebo autodetekcia nebude pracova� spr�vne,\n"
+#~ "budete po�iadan� o zvolenie spr�vneho ovl�da�a zo zoznamu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tak, ako pre SCSI radi�, m��ete najsk�r sk�si� necha� ovl�da� bez zmeny\n"
+#~ "parametrov a iba v pr�pade ne�spechu sa ich pok�si� nastavi� a pomocou\n"
+#~ "dokument�cie v va�ej sie�ovej karte.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ak in�talujete Mandrake ako s��as� existuj�cej siete, po�iadajte spr�vcu\n"
+#~ "siete o v�etky d�le�it� inform�cie (IP adresa, netmask, meno po��ta�a,\n"
+#~ "pr�padne br�na).\n"
+#~ "\n"
+#~ "\n"
+#~ "Zvo�te \"Dialup cez modem\" pre konfigur�ciu pripojenia na internet za\n"
+#~ "pomoci modemu. DrakX sa pok�si n�js� v� modem, a ak sa mu to nepodar�,\n"
+#~ "budete musie� zvoli� spr�vny s�riov� port, na ktorom je modem pripojen�."
+
+#, fuzzy
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "Linux dok�e pracova� s mnoh�mi typmi tla�iarn�. Ka�d� z t�chto typov\n"
+#~ "po�aduje in� nastavenie. Napriek tomu, �e print spooler pou��va ako \n"
+#~ "predvolen� meno tla�iarne n�zov 'lp', (�i�e ak m�te tla�iare�, mus� sa\n"
+#~ "tak vola�) m��ete pou�i� aj �al�ie men� oddelen� znakom '|'. Tak�e, ak\n"
+#~ "preferujete napr�klad n�zov \"Moja tla�iare�\", m��ete zada�\n"
+#~ "\"Moja tla�iare�|lp\".\n"
+#~ "Tla�iare�, ktor� m� medzi svojimi menami \"lp\", je pou��van� ako\n"
+#~ "predvolen�.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ak je va�a tla�iare� priamo pripojen� k v�mu po��ta�u, zvo�te\n"
+#~ "\"Lok�lna tla�iare�\". Budete po�iadan� o zadanie portu a zvolenie\n"
+#~ "spr�vneho tla�ov�ho filtra.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ak m�te pr�stup k tla�iarni pripojenej ku vzdialen�mu unixov�mu syst�mu,\n"
+#~ "zvo�te \"Vzdialen� tla�ov� fronta\". Budete musie� zada� meno tejto fronty,\n"
+#~ "ale nie je potrebn� u��vate�sk� meno, �i heslo.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ak chcete pristupova� k SMB tla�iarni (�o znamen�, �e tla�iare� je\n"
+#~ "pripojen� k vzdialen�mu Windows 9x/NT syst�mu), budete musie� zada�\n"
+#~ "jeho SMB meno (�o nemus� s�hlasi� s jeho TCP/IP menom), IP adresu,\n"
+#~ "u��vate�sk� meno, pracovn� skupinu, heslo a samozrejme meno tla�iarne.\n"
+#~ "To ist�, s v�nimkou pracovnej skupiny, plat� pre NetWare tla�iare�."
+
+#, fuzzy
+#~ 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."
+#~ msgstr ""
+#~ "Ve�mi doporu�ujem aby ste tu odpovedali \"�no\". Ak toti� v bud�cnosti\n"
+#~ "budete in�talova� Microsoft Windows, stane sa �e prep��u boot sektor.\n"
+#~ "A ak nebudete ma� vytvoren� bootdisk, nebudete sa ma� ako dosta� do \n"
+#~ "Linuxu."
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Strati� zmeny?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "Pripojenie tla�iarne"
+
+#~ msgid "Host name:"
+#~ msgstr "N�zov po��ta�a:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Ak� typ my�i m�te?"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Automatick� rozl��enia"
+
+#~ 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"
+#~ msgstr ""
+#~ "Pok�sim sa n�js� pou�ite�n� frekvencie.\n"
+#~ "Va�a obrazovka bude teraz chv��ku blika�\n"
+#~ "Ak chcete, m��ete vypn�� monitor, na konci budete po�u� p�pnutie"
+
+#~ 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?"
+#~ msgstr ""
+#~ "M��em sa pok�si� n�js� pou�ite�n� rozl��enia (napr. 800x600).\n"
+#~ "Niekedy m��e d�js� v zatuhnutiu po��ta�a.\n"
+#~ "Chcete to sk�si�?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Nena�iel som �iadne grafick� m�dy\n"
+#~ "Sk�ste zvoli� in� grafick� kartu, alebo monitor"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "H�ad�m mo�n� grafick� m�dy"
+
+#~ msgid "Apple ADB Mouse"
+#~ msgstr "Apple ADB My�"
+
+#~ msgid "Apple ADB Mouse (2 Buttons)"
+#~ msgstr "Apple ADB My� (dvojtla��tkov�)"
+
+#~ msgid "Apple ADB Mouse (3+ Buttons)"
+#~ msgstr "Apple ADB My� (troj a viac tla��tkov�)"
+
+#~ msgid "Apple USB Mouse"
+#~ msgstr "Apple USB My�"
+
+#~ msgid "Apple USB Mouse (2 Buttons)"
+#~ msgstr "Apple USB My� (dvojtla��tkov�)"
+
+#~ msgid "Apple USB Mouse (3+ Buttons)"
+#~ msgstr "Apple USB My� (troj a viac tla��tkov�)"
+
+#~ msgid "Generic Mouse"
+#~ msgstr "�tandardn� my�"
+
+#~ msgid "ASCII MieMouse"
+#~ msgstr "ASCII MieMouse"
+
+#~ msgid "Genius NetMouse Pro"
+#~ msgstr "Genius NetMouse Pro"
+
+#~ msgid "ATI Bus Mouse"
+#~ msgstr "ATI Bus My�"
+
+#~ msgid "Microsoft Bus Mouse"
+#~ msgstr "Microsoft Bus My�"
+
+#~ msgid "Logitech Bus Mouse"
+#~ msgstr "Logitech Bus My�"
+
+#~ msgid "USB Mouse"
+#~ msgstr "USB My�"
+
+#~ msgid "USB Mouse (3 buttons or more)"
+#~ msgstr "USB My� (troj a viac tla��tkov�)"
+
+#~ msgid "Microsoft Rev 2.1A or higher (serial)"
+#~ msgstr "Microsoft Rev 2.1A alebo viac (s�riov�)"
+
+#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#~ msgstr "Logitech MouseMan+/FirstMouse+ (s�riov�)"
+
+#~ msgid "ASCII MieMouse (serial)"
+#~ msgstr "ASCII MieMouse (s�riov�)"
+
+#~ msgid "Genius NetMouse (serial)"
+#~ msgstr "Genius NetMouse (s�riov�)"
+
+#~ msgid "Generic Mouse (serial)"
+#~ msgstr "�tandardn� my� (s�riov�)"
+
+#~ msgid "Microsoft compatible (serial)"
+#~ msgstr "Microsoft kompatibiln� (s�riov�)"
+
+#~ msgid "Generic 3 Button Mouse (serial)"
+#~ msgstr "�tandardn� trojtla��tkov� (s�riov�)"
+
+#, fuzzy
+#~ msgid "Kensington Thinking Mouse (serial)"
+#~ msgstr "Kensington Thinking Mouse"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "nepodarilo sa pripoji� nfs"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "Cryptographic"
+#~ msgstr "Kryptografia"
+
+#~ msgid "Do you want to configure a local network for your system?"
+#~ msgstr "�el�te si na va�om syst�me nakonfigurova� slu�by lok�lnej siete ?"
+
+#~ msgid "Show less"
+#~ msgstr "Uk� menej"
+
+#~ msgid "Show more"
+#~ msgstr "Uk� viac"
+
+#~ msgid "curly"
+#~ msgstr "ku�erav�"
+
+#~ msgid "default"
+#~ msgstr "predvolen�"
+
+#~ msgid "tie"
+#~ msgstr "tie"
+
+#~ msgid "brunette"
+#~ msgstr "brunetka"
+
+#~ msgid "girl"
+#~ msgstr "diev�a"
+
+#~ msgid "woman-blond"
+#~ msgstr "blond�nka"
+
+#~ msgid "automagic"
+#~ msgstr "automagicky"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Ak� typ kl�vesnice m�te?"
+
+#~ msgid "Normal"
+#~ msgstr "Norm�lna"
+
+#~ msgid "Try to find PCMCIA cards?"
+#~ msgstr "Sk�si� n�js� PCMCIA karty?"
+
+#~ msgid "Try to find %s devices?"
+#~ msgstr "Sk�si� n�js� %s zariadenia?"
+
+#~ msgid "Modem Configuration"
+#~ msgstr "Konfigur�cia modemu"
+
+#~ msgid ""
+#~ "Do you want to configure a dialup connection with modem for your system?"
+#~ msgstr ""
+#~ "�el�te si na va�om syst�me nakonfigurova� pripojenie cez telef. sie�?"
+
+#~ msgid "Try to find PCI devices?"
+#~ msgstr "Sk�si� n�js� PCI zariadenia?"
+
+#~ msgid "Searching root partition."
+#~ msgstr "H�ad�m kore�ov� oddiel."
+
+#~ msgid "%s: This is not a root partition, please select another one."
+#~ msgstr "%s: Toto nie je kore�ov� oddiel, pros�m zvo�te in�."
+
+#~ msgid "No root partition found"
+#~ msgstr "Ch�ba kore�ov� oddiel"
+
+#~ msgid "Can't use broadcast with no NIS domain"
+#~ msgstr "Nem��em pou�i� broadcast bez NIS dom�ny"
+
+#~ msgid "Please choose a partition to use as your root partition."
+#~ msgstr "Pros�m zvo�te oddiel, ktor� chcete pou�i� ako kore�ov�."
+
+#~ msgid "You don't have any enough room for Lnx4win"
+#~ msgstr "Na disku nem�te dos� priestoru pre Lnx4win"
+
+#~ msgid ", %U MB"
+#~ msgstr ", %U MB"
+
+#~ msgid "Automated"
+#~ msgstr "Automatick�"
+
+# 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.
+#
+#~ 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 ""
+#~ "Vitajte v zavadzaci LILO!\n"
+#~ "\n"
+#~ "Pre zoznam moznych volieb stlacte <TAB>.\n"
+#~ "\n"
+#~ "Pre spustenie jednej z nich, napiste jej meno a stlacte <ENTER>, alebo\n"
+#~ "pockajte %d sekund pre predvolenu moznost.\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
+#
+#~ 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 ""
+#~ "Vitajte v zavadzaci operacneho systemu SILO!\n"
+#~ "\n"
+#~ "Pre zoznam moznych volieb stlacte <TAB>.\n"
+#~ "\n"
+#~ "Pre vyber volby, napiste jej meno a stlacte <ENTER>, alebo \n"
+#~ "cakajte %d sekund pre predvolenu akciu.\n"
+#~ "\n"
+
+#~ msgid "SILO main options"
+#~ msgstr "Hlavn� parametre SILA"
+
+#~ msgid ""
+#~ "Here are the following entries in SILO.\n"
+#~ "You can add some more or change the existing ones."
+#~ msgstr ""
+#~ "V SILE s� moment�lne tieto z�znamy.\n"
+#~ "M��ete ich meni�, alebo prid�va� �al�ie."
+
+#~ msgid "This label is already in use"
+#~ msgstr "Tento z�znam je u� pou�it�"
+
+#~ msgid "Installation of SILO failed. The following error occured:"
+#~ msgstr "In�tal�cia SILA zlyhala. Vyskytla sa nasleduj�ca chyba:"
+
+#~ 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."
+#~ msgstr ""
+#~ "DrakX sa najsk�r pok�si rozpozna� jeden, alebo viac SCSI adapt�rov\n"
+#~ "na PCI zbernici. Ak ich rozpozn� a dok�e n�js� spr�vny ovl�da�,\n"
+#~ "dovol� ich pou��vanie automaticky.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ak je v� SCSI adapt�r na ISA zbernici, alebo je s�ce na PCI, ale DrakX\n"
+#~ "nedok�zal zvoli� spr�vny ovl�da�, alebo nem�te SCSI adapt�r, zobraz� sa\n"
+#~ "dial�gov� okno. V �om budete m�c� zvoli� �i m�te, alebo nem�te SCSI\n"
+#~ "adapt�r a ak �no, budete m�c� zvoli� aj ovl�da� zo zoznamu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Potom, �o vyberiete ovl�da�, sa v�s DrakX op�ta, �i chcete nastavi� aj\n"
+#~ "nejak� jeho parametre. Najsk�r sk�ste necha� ovl�da� tak ako v�m bol\n"
+#~ "pon�knut�: v��inou to pracuje spr�vne.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ak nie, mus�te si potrebn� inform�cie zisti� z dokument�cie k dan�mu\n"
+#~ "adapt�ru tak, ako je navrhovan� v in�tala�nej pr�ru�ke."
+
+#~ msgid "Shutting down"
+#~ msgstr "Ukon�ujem"
+
 #~ msgid "useless"
 #~ msgstr "zbyto�n�"
 
diff --git a/perl-install/share/po/sl.po b/perl-install/share/po/sl.po
index 045464599..b807730ea 100644
--- a/perl-install/share/po/sl.po
+++ b/perl-install/share/po/sl.po
@@ -1,59 +1,105 @@
 # Translatrion file of Mandrake graphic install
 # Copyright (C) 1999 Mandrakesoft
+# Alen Salamun <alien@alienworld.org>, 2000.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-06-07 19:28+0200\n"
-"PO-Revision-Date: 1999-08-25 11:07+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
+"PO-Revision-Date: 2000-09-05 20:49+0200\n"
 "Last-Translator: Alen Salamun <alien@alienworld.org>\n"
 "Language-Team: Slovenian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:117 ../../Xconfigurator.pm_.c:237
-msgid "Generic"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:173
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:179
 msgid "Graphic card"
-msgstr "Izberite kartico"
+msgstr "Grafi�na kartica"
 
-#: ../../Xconfigurator.pm_.c:173
+#: ../../Xconfigurator.pm_.c:179
 msgid "Select a graphic card"
-msgstr "Izberite kartico"
+msgstr "Izberite grafi�no kartico"
 
-#: ../../Xconfigurator.pm_.c:174
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:180
 msgid "Choose a X server"
-msgstr "Izberite kartico"
+msgstr "Izberite stre�nik X"
 
-#: ../../Xconfigurator.pm_.c:174
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:180
 msgid "X server"
-msgstr "Izberite stre�nik"
+msgstr "Stre�nik X"
 
-#: ../../Xconfigurator.pm_.c:199
-msgid "Select the memory size of your graphic card"
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
+#, fuzzy, c-format
+msgid "XFree %s"
+msgstr "Izberite stre�nik XFree86: %s"
+
+#: ../../Xconfigurator.pm_.c:220
+#, fuzzy
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Kak�en tip vnosa �elite dodati?"
+
+#: ../../Xconfigurator.pm_.c:232
+#, fuzzy, 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 ""
+"Va�a kartica lahko uporablja strojno 3D pospe�evanje samo z XFree 3.3. \n"
+"�elite uporabljati XFree 3.3 namesto XFree 4.0?"
 
-#: ../../Xconfigurator.pm_.c:226
-msgid "Choose options for server"
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
+#, fuzzy, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "�elite podporo strojno 3D pospe�evanje?"
+
+#: ../../Xconfigurator.pm_.c:245
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:248
+#, 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 ""
+
+#: ../../Xconfigurator.pm_.c:250
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:265
 #, fuzzy
+msgid "XFree configuration"
+msgstr "Nastavitev zaslona"
+
+#: ../../Xconfigurator.pm_.c:301
+msgid "Select the memory size of your graphic card"
+msgstr "Izberite velikost pomnilnika va�e grafi�ne kartice"
+
+#: ../../Xconfigurator.pm_.c:345
+msgid "Choose options for server"
+msgstr "Izberite nastavitve stre�nika"
+
+#: ../../Xconfigurator.pm_.c:356
 msgid "Choose a monitor"
-msgstr "Izberite kartico"
+msgstr "Izberite monitor"
 
-#: ../../Xconfigurator.pm_.c:237
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:356
 msgid "Monitor"
-msgstr "Baza monitorjev"
+msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:359
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -66,1214 +112,1448 @@ msgid ""
 "monitor.\n"
 " If in doubt, choose a conservative setting."
 msgstr ""
-"Dolo�iti morate horizontalno sinhronizacijsko obmo�je va�ega monitorja.\n"
-"Izberete lahko bodisi eno od �e definiranih obmo�ij spodaj, ki ustrezajo\n"
-"industrijsko standardnim vrstam monitorjev, ali pa sami dolo�ite obmo�je.\n"
+"Kriti�na parametra sta: vertikalna osve�itev (to je hitrost s katero je "
+"osve�en celoten zaslon) in najbolj pomembna horizontalna osve�itev (to je "
+"hitrost s katero so osve�ene vrstice).\n"
 "\n"
-"ZELO POMEMBNO je, da ne dolo�ite vrste monitorja s horizontalnim\n"
-"sinhronizacijskim obmo�jem nad zmo�nostmi va�ega monitorja.  �e ste v\n"
-"dvomih, izberite konzervativno nastavitev."
+"ZELO POMEMBNO je, da ne izberete monitorja z osve�itvami, ki so izven "
+"sposobnosti va�ega monitorja. S tem lahko po�kodujete va� monitor!\n"
+"�e ste v dvomih, izberite konservativno nastavitev."
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Horizontal refresh rate"
-msgstr ""
+msgstr "Horizontalna sinhronizacija"
 
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:366
 msgid "Vertical refresh rate"
-msgstr ""
+msgstr "Vertikalna sinhronizacija"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:405
 msgid "Monitor not configured"
-msgstr ""
+msgstr "Monitor ni nastavljen"
 
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:408
 msgid "Graphic card not configured yet"
-msgstr ""
+msgstr "Grafi�na kartica �e ni nastavljena"
 
-#: ../../Xconfigurator.pm_.c:292
+#: ../../Xconfigurator.pm_.c:411
 msgid "Resolutions not chosen yet"
-msgstr ""
+msgstr "Lo�ljivost �e ni izbrana"
 
-#: ../../Xconfigurator.pm_.c:305
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:427
 msgid "Do you want to test the configuration?"
-msgstr "Xconfigurator bo zdaj zagnal X in preveril nastavitve."
-
-#: ../../Xconfigurator.pm_.c:309
-msgid "Warning: testing is dangerous on this graphic card"
-msgstr ""
+msgstr "�elite preizkusiti nastavitev?"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:431
 #, fuzzy
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr "Pozor: testiranje na izbrani grafi�ni kartici je nevarno"
+
+#: ../../Xconfigurator.pm_.c:434
 msgid "Test of the configuration"
-msgstr "Nastavitev zaslona"
+msgstr "Preizkus nastavitev"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid ""
 "\n"
 "try to change some parameters"
 msgstr ""
+"\n"
+"poskusite spremeniti nekatere parametre"
 
-#: ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:473
 msgid "An error has occurred:"
-msgstr ""
+msgstr "Pri�lo je do napake:"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:495
 #, c-format
 msgid "Leaving in %d seconds"
-msgstr ""
+msgstr "Zapu��am v %d sekundah"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:505
 msgid "Is this the correct setting?"
-msgstr ""
+msgstr "Je to pravilna nastavitev?"
 
-#: ../../Xconfigurator.pm_.c:386
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:513
 msgid "An error has occurred, try to change some parameters"
-msgstr "Med poskusom izvajanja pripomo�ka grep je pri�lo do napake."
-
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
-msgid "Automatic resolutions"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:395
-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"
-msgstr ""
+msgstr "Pri�lo je do napake, poskusite spremeniti nekatere parametre"
 
-#: ../../Xconfigurator.pm_.c:453 ../../printerdrake.pm_.c:167
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
 msgid "Resolution"
-msgstr "  Lo�ljivost: %d�%d"
+msgstr "Lo�ljivost"
 
-#: ../../Xconfigurator.pm_.c:488
+#: ../../Xconfigurator.pm_.c:585
 msgid "Choose the resolution and the color depth"
-msgstr ""
+msgstr "Izberite lo�ljivost in barvno globino"
 
-#: ../../Xconfigurator.pm_.c:490
-#, fuzzy, c-format
+#: ../../Xconfigurator.pm_.c:587
+#, c-format
 msgid "Graphic card: %s"
-msgstr "Izberite kartico"
+msgstr "Izberite grafi�no kartico: %s"
 
-#: ../../Xconfigurator.pm_.c:491
-#, fuzzy, c-format
+#: ../../Xconfigurator.pm_.c:588
+#, c-format
 msgid "XFree86 server: %s"
-msgstr "Izberite stre�nik"
+msgstr "Izberite stre�nik XFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:500
+#: ../../Xconfigurator.pm_.c:597
 msgid "Show all"
-msgstr ""
+msgstr "Poka�i vse"
 
-#: ../../Xconfigurator.pm_.c:524
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:621
 msgid "Resolutions"
-msgstr "  Lo�ljivost: %d�%d"
-
-#: ../../Xconfigurator.pm_.c:576
-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?"
-msgstr ""
+msgstr "Lo�ljivosti"
 
-#: ../../Xconfigurator.pm_.c:581
-msgid ""
-"No valid modes found\n"
-"Try with another video card or monitor"
-msgstr ""
-
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:1019
 #, c-format
 msgid "Keyboard layout: %s\n"
-msgstr ""
+msgstr "Razpored tipkovnice: %s\n"
 
-#: ../../Xconfigurator.pm_.c:922
-#, fuzzy, c-format
+#: ../../Xconfigurator.pm_.c:1020
+#, c-format
 msgid "Mouse type: %s\n"
-msgstr "  Vrsta monitorja %d\n"
+msgstr "Tip mi�ke: %s\n"
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:1021
 #, c-format
 msgid "Mouse device: %s\n"
-msgstr ""
+msgstr "Naprava mi�ke: %s\n"
 
-#: ../../Xconfigurator.pm_.c:924
-#, fuzzy, c-format
+#: ../../Xconfigurator.pm_.c:1022
+#, c-format
 msgid "Monitor: %s\n"
-msgstr "Baza monitorjev"
+msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:925
-#, fuzzy, c-format
+#: ../../Xconfigurator.pm_.c:1023
+#, c-format
 msgid "Monitor HorizSync: %s\n"
-msgstr "  Vrsta monitorja %d\n"
+msgstr "Horizontalna frekvenca monitorja: %s\n"
 
-#: ../../Xconfigurator.pm_.c:926
-#, fuzzy, c-format
+#: ../../Xconfigurator.pm_.c:1024
+#, c-format
 msgid "Monitor VertRefresh: %s\n"
-msgstr "  Vrsta monitorja %d\n"
+msgstr "Vertikalna frekvenca monitorja: %s\n"
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:1025
 #, c-format
 msgid "Graphic card: %s\n"
-msgstr ""
+msgstr "Grafi�na kartica: %s\n"
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:1026
 #, c-format
 msgid "Graphic memory: %s kB\n"
-msgstr ""
+msgstr "Grafi�ni pomnilnik: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:1028
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Vertikalna frekvenca monitorja: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1029
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Lo�ljivosti"
+
+#: ../../Xconfigurator.pm_.c:1031
 #, c-format
 msgid "XFree86 server: %s\n"
-msgstr ""
+msgstr "Stre�nik XFree86: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1032
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "Stre�nik XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:1051
 #, fuzzy
 msgid "Preparing X-Window configuration"
-msgstr "Nastavitev zaslona"
+msgstr "Priprava nastavitve X-Windows"
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:1065
 msgid "Change Monitor"
-msgstr ""
+msgstr "Spremeni monitor"
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Change Graphic card"
-msgstr ""
+msgstr "Spremeni grafi�no kartico"
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:1067
 msgid "Change Server options"
-msgstr ""
+msgstr "Spremeni nastavitve stre�nika"
 
-#: ../../Xconfigurator.pm_.c:961
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:1068
 msgid "Change Resolution"
-msgstr "  Lo�ljivost: %d�%d"
-
-#: ../../Xconfigurator.pm_.c:962
-msgid "Automatical resolutions search"
-msgstr ""
+msgstr "Spremeni lo�ljivost"
 
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:1069
 msgid "Show information"
-msgstr ""
+msgstr "Poka�i informacijo"
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:1070
 msgid "Test again"
-msgstr ""
+msgstr "Testiraj ponovno"
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
-msgstr "Odnehaj"
+msgstr "Kon�aj"
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
 msgid "What do you want to do?"
-msgstr ""
+msgstr "kaj �elite narediti?"
 
-#: ../../Xconfigurator.pm_.c:979
-msgid "Forget the changes?"
-msgstr ""
+#: ../../Xconfigurator.pm_.c:1082
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Nastavitev zaslona"
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1103
 #, c-format
 msgid "Please relog into %s to activate the changes"
-msgstr ""
+msgstr "Za uveljavitev sprememb, se ponovno prijavite v %s"
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1123
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr ""
+msgstr "Odjavite se in nato pritisnite Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1126
 msgid "X at startup"
-msgstr ""
+msgstr "X v zagonu"
 
-#: ../../Xconfigurator.pm_.c:1017
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:1127
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
 msgstr ""
-"Xconfigurator lahko nastavi ra�unalnik tako, da samodejno za�ene X po zagonu "
-"sistema.  Bi radi vedno zagnali X, ko za�enete stroj?"
+"Ra�unalnik lahko samodejno po zagonu sistema za�ene stre�nik X.\n"
+"�elite zagnati stre�nik X po zagonu?"
 
-#: ../../Xconfigurator_consts.pm_.c:4
-msgid "256 colors (8 bits)"
-msgstr ""
+#: ../../Xconfigurator.pm_.c:1151
+msgid "Autologin"
+msgstr "Samodejna prijava"
 
-#: ../../Xconfigurator_consts.pm_.c:5
-msgid "32 thousand colors (15 bits)"
+#: ../../Xconfigurator.pm_.c:1152
+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."
 msgstr ""
+"Ra�unalnik lahko samodejno po zagonu v sistem prijavi uporabnika.\n"
+"�e tega ne �elite, pritisnite gumb prekli�i."
+
+#: ../../Xconfigurator.pm_.c:1154
+msgid "Choose the default user:"
+msgstr "Izberite privzetega uporabnika:"
+
+#: ../../Xconfigurator.pm_.c:1155
+#, fuzzy
+msgid "Choose the window manager to run:"
+msgstr "Izberite okenskega upravitelja, ki naj bo pognan:"
 
 #: ../../Xconfigurator_consts.pm_.c:6
-msgid "65 thousand colors (16 bits)"
-msgstr ""
+msgid "256 colors (8 bits)"
+msgstr "256 barv (8 bitov)"
 
 #: ../../Xconfigurator_consts.pm_.c:7
-msgid "16 million colors (24 bits)"
-msgstr ""
+msgid "32 thousand colors (15 bits)"
+msgstr "32 tiso� barv (15 bitov)"
 
 #: ../../Xconfigurator_consts.pm_.c:8
+msgid "65 thousand colors (16 bits)"
+msgstr "65 tiso� barv (16 bitov)"
+
+#: ../../Xconfigurator_consts.pm_.c:9
+msgid "16 million colors (24 bits)"
+msgstr "16 milijonov barv (24 bitov)"
+
+#: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
-msgstr ""
+msgstr "4 milijarde barv (32 bitov)"
 
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
-msgstr ""
+msgstr "256 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:107
 msgid "512 kB"
-msgstr ""
+msgstr "512 kB"
 
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
-msgstr ""
+msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
-msgstr ""
+msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
-msgstr ""
+msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
-msgstr ""
+msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:112
 msgid "16 MB or more"
-msgstr ""
+msgstr "16 MB ali ve�"
 
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:117 ../../Xconfigurator_consts.pm_.c:118
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standardni VGA, 640�480 @ 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800�600 @ 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
-msgstr "Zdru�ljiv z 8514, 1024�768 @ 87 Hz prepleteno (ne 800�600)"
+msgstr "Zdru�ljiv z 8514, 1024�768 @ 87 Hz prepleteno (brez 800�600)"
 
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024�768 @ 87 Hz prepleteno, 800�600 @ 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
-msgstr "Raz�irjeni Super VGA, 800�600 @ 60 Hz, 640�480 @ 72 Hz"
+msgstr "Raz�irjen Super VGA, 800�600 @ 60 Hz, 640�480 @ 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
-msgstr "Neprepleteni SVGA, 1024�768 @ 60 Hz, 800�600 @ 72 Hz"
+msgstr "Neprepleten SVGA, 1024�768 @ 60 Hz, 800�600 @ 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
-msgstr "Visoko frekven�ni SVGA, 1024�768 @ 70 Hz"
+msgstr "Visoko frekven�en SVGA, 1024�768 @ 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Monitor, ki zmore 1280�1024 @ 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Monitor, ki zmore 1280�1024 @ 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Monitor, ki zmore 1280�1024 @ 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor, ki zmore 1600�1200 @ 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor, ki zmore 1600�1200 @ 76 Hz"
 
-#: ../../any.pm_.c:17
-msgid "curly"
-msgstr ""
-
-#: ../../any.pm_.c:17
-#, fuzzy
-msgid "default"
-msgstr "Uporabljam privzeto"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:17
-msgid "tie"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "brunette"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "girl"
-msgstr ""
-
-#: ../../any.pm_.c:18
-msgid "woman-blond"
-msgstr ""
-
-#: ../../any.pm_.c:19
-msgid "automagic"
-msgstr ""
-
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
 msgid "First sector of boot partition"
-msgstr ""
+msgstr "Prvi sektor zagonskega razdelka"
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
 msgid "First sector of drive (MBR)"
-msgstr ""
+msgstr "Prvi sektor pogona (MBR)"
 
-#: ../../any.pm_.c:65
-msgid "LILO/grub Installation"
-msgstr ""
+#: ../../any.pm_.c:95
+msgid "SILO Installation"
+msgstr "Namestitev SILO"
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
 msgid "Where do you want to install the bootloader?"
-msgstr ""
+msgstr "Kam �elite namestiti zagonski nalagalnik?"
 
-#: ../../any.pm_.c:73
-#, fuzzy
+#: ../../any.pm_.c:101
+msgid "LILO/grub Installation"
+msgstr "Namestitev LILO/grub"
+
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
-msgstr "Ne"
+msgstr "Ni�"
 
-#: ../../any.pm_.c:73
-#, fuzzy
+#: ../../any.pm_.c:111
 msgid "Which bootloader(s) do you want to use?"
-msgstr "Kateri stre�nik potrebujete?"
+msgstr "Kateri zagonski nalagalnik �elite uporabljati?"
 
-#: ../../any.pm_.c:84
+#: ../../any.pm_.c:125
+msgid "Bootloader installation"
+msgstr "Namestitev zagonskega nalagalnika"
+
+#: ../../any.pm_.c:127
 msgid "Boot device"
-msgstr ""
+msgstr "Zagonska naprava"
 
-#: ../../any.pm_.c:85
+#: ../../any.pm_.c:128
 msgid "LBA (doesn't work on old BIOSes)"
-msgstr ""
+msgstr "LBA (ne deluje z starej�imi BIOS-i)"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "Compact"
-msgstr ""
+msgstr "Kompaktno"
 
-#: ../../any.pm_.c:86
+#: ../../any.pm_.c:129
 msgid "compact"
-msgstr ""
+msgstr "kompaktno"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
-msgid "Delay before booting default image"
-msgstr ""
-
-#: ../../any.pm_.c:88
-#, fuzzy
+#: ../../any.pm_.c:130 ../../any.pm_.c:199
 msgid "Video mode"
-msgstr "Grafi�ni pomnilnik"
+msgstr "Grafi�ni na�in"
 
-#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:654
-#: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
-#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:132
+msgid "Delay before booting default image"
+msgstr "Pavza pred zaganjanjem privzete slike"
+
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
-msgstr ""
+msgstr "Geslo"
 
-#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
 #: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
-msgstr ""
+msgstr "Geslo (ponovno)"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "Restrict command line options"
-msgstr ""
+msgstr "Omejitev mo�nosti ukazne vrstice"
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:136
 msgid "restrict"
-msgstr ""
+msgstr "omeji"
 
-#: ../../any.pm_.c:98
+#: ../../any.pm_.c:142
 msgid "Bootloader main options"
-msgstr ""
+msgstr "Glavne mo�nosti zagonskega nalagalnika"
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:145
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
-msgstr ""
+msgstr "Mo�nost ``Omejitev mo�nosti ukazne vrstice'' ni uporabna brez gesla"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
-msgstr ""
+msgstr "Poskusite ponovno"
 
-#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
-msgstr ""
+msgstr "Gesla se ne ujemata"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:157
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
 msgstr ""
+"Tukaj so razli�ni vnosi.\n"
+"Lahko dodate �e kak�nega ali spremenite obstoje�ega"
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
-#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:352
+#: ../../standalone/rpmdrake_.c:302
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
-#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
-#: ../../standalone/adduserdrake_.c:36
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
+#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
-msgstr ""
+msgstr "Kon�ano"
+
+#: ../../any.pm_.c:174
+msgid "Which type of entry do you want to add?"
+msgstr "Kak�en tip vnosa �elite dodati?"
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:175
 msgid "Linux"
-msgstr ""
+msgstr "Linux"
 
-#: ../../any.pm_.c:123
-msgid "Other OS (windows...)"
-msgstr ""
+#: ../../any.pm_.c:175
+msgid "Other OS (SunOS...)"
+msgstr "Ostali OS (SunOs...)"
 
-#: ../../any.pm_.c:123
-#, fuzzy
-msgid "Which type of entry do you want to add?"
-msgstr "Kateri stre�nik potrebujete?"
+#: ../../any.pm_.c:175
+msgid "Other OS (windows...)"
+msgstr "Ostali OS (Okna...)"
 
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:196
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
-#: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../any.pm_.c:197 ../../any.pm_.c:206
 msgid "Root"
-msgstr ""
+msgstr "Korenski"
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:198
 msgid "Append"
-msgstr ""
+msgstr "Pripni"
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:200
 msgid "Initrd"
-msgstr ""
+msgstr "Initrd"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:201
 msgid "Read-write"
-msgstr ""
+msgstr "Branje-pisanje"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:208
 msgid "Table"
-msgstr ""
+msgstr "Tabela"
 
-#: ../../any.pm_.c:153
+#: ../../any.pm_.c:209
 msgid "Unsafe"
-msgstr ""
+msgstr "Tvegano"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:215
 msgid "Label"
-msgstr ""
+msgstr "Labela"
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
-#, fuzzy
+#: ../../any.pm_.c:217
 msgid "Default"
-msgstr "Uporabljam privzeto"
-
-#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
-#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:635 ../../printerdrake.pm_.c:272
+msgstr "Privzeto"
+
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
+#: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
+#: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
+#: ../../my_gtk.pm_.c:486 ../../my_gtk.pm_.c:661 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:418
 msgid "Ok"
 msgstr "V redu"
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:220
 msgid "Remove entry"
-msgstr ""
+msgstr "Odstrani vnos"
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:223
 msgid "Empty label not allowed"
-msgstr ""
+msgstr "Prazna labela ni dovoljena"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:224
 msgid "This label is already used"
+msgstr "Ta labela je �e uporabljena"
+
+#: ../../any.pm_.c:500
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Najdenih %s %s vmesnikov"
+
+#: ../../any.pm_.c:501
+msgid "Do you have another one?"
+msgstr "Imate �e kak�nega?"
+
+#: ../../any.pm_.c:502
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Imate vmesnike %s?"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
+#: ../../printerdrake.pm_.c:233
+msgid "No"
+msgstr "Ne"
+
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
+msgid "Yes"
+msgstr "Da"
+
+#: ../../any.pm_.c:505
+msgid "See hardware info"
+msgstr "Glejte informacije o strojni opremi"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:522
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Namestitev gonilnika za %s kartico %s"
+
+#: ../../any.pm_.c:523
+#, c-format
+msgid "(module %s)"
+msgstr "(modul %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:534
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Kateri %s gonilnik naj bo preizku�en?"
+
+#: ../../any.pm_.c:542
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
 msgstr ""
+"V nekaterih primerih potrebuje gonilnik %s za pravilno delovanje dodatne\n"
+" informacije. Lahko se zgodi, da deluje normalno tudi brez. �elite navesti\n"
+"dodatne nastavitve zanj ali dovolite gonilniku da poskusi pridobiti "
+"potrebne\n"
+"informacije samodejno? Lahko se zgodi, da se ra�unalnik nepredvidoma "
+"ustavi,\n"
+"kar pa naj ne bi povzro�ilo nobene �kode."
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
-msgid "Create"
+#: ../../any.pm_.c:547
+msgid "Autoprobe"
+msgstr "Samodejna zaznava"
+
+#: ../../any.pm_.c:547
+msgid "Specify options"
+msgstr "Navedite nastavitve"
+
+#: ../../any.pm_.c:551
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Sedaj lahko posredujete nastavitve za modul %s."
+
+#: ../../any.pm_.c:557
+#, 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 ""
+"Sedaj lahko posredujete nastavitve za modul %s.\n"
+"Nastavitve so oblike ``ime=vrednost ime2=vrednost2 ...''.\n"
+"Na primer: ``io=0x300 irq=7''"
 
-#: ../../diskdrake.pm_.c:19
-msgid "Unmount"
+#: ../../any.pm_.c:560
+msgid "Module options:"
+msgstr "Nastavitve modula:"
+
+#: ../../any.pm_.c:570
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
 msgstr ""
+"Nalaganje modula %s je bilo neuspe�no.\n"
+"�elite poskusiti znova z drugimi parametri?"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
-msgid "Delete"
+# 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)
+# 
+#: ../../bootloader.pm_.c:234
+#, fuzzy, c-format
+msgid ""
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system in the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
 msgstr ""
+"Pozdravljeni v izbiralcu operacijskega sistema %s!\n"
+"\n"
+"Za seznam moznih izbir pritisnite <TAB>.\n"
+"\n"
+"Za nalaganje ene izmed njih napisite ime in pritisnite <ENTER> ali\n"
+"pocakajte %d sekund za prevzet zagon.\n"
+"\n"
 
-#: ../../diskdrake.pm_.c:20
-msgid "Format"
+# 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
+#
+#: ../../bootloader.pm_.c:596
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr "Pozdravljeni v izbiralcu operacijskega sistema GRUB!"
+
+#: ../../bootloader.pm_.c:597
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "Uporabite tipke %c in %c za izbiro vnosa"
+
+#: ../../bootloader.pm_.c:598
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Pritisnite enter za zagon izbranega OS, 'e' za urejevanje"
+
+#: ../../bootloader.pm_.c:599
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "ukazov pred zagonom ali 'c' za ukazno vrstico."
+
+#: ../../bootloader.pm_.c:600
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "Izbran vnos bo zagnan samodejno cez %d sekund."
+
+#: ../../bootloader.pm_.c:604
+msgid "not enough room in /boot"
+msgstr "premalo prostora v /boot"
+
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../bootloader.pm_.c:696
+msgid "Desktop"
+msgstr "Namizje"
+
+#: ../../bootloader.pm_.c:696
+msgid "Start Menu"
+msgstr "Meni Start"
+
+#: ../../common.pm_.c:610
+#, c-format
+msgid "%d minutes"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
-msgid "Resize"
+#: ../../common.pm_.c:612
+msgid "1 minute"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../common.pm_.c:614
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "Zapu��am v %d sekundah"
+
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419
+msgid "Create"
+msgstr "Ustvari"
+
+#: ../../diskdrake.pm_.c:22
+msgid "Unmount"
+msgstr "Odklopi"
+
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421
+msgid "Delete"
+msgstr "Izbri�i"
+
+#: ../../diskdrake.pm_.c:23
+msgid "Format"
+msgstr "Formatiraj"
+
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602
+msgid "Resize"
+msgstr "Spremeni velikost"
+
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419
+#: ../../diskdrake.pm_.c:472
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492
 msgid "Mount point"
-msgstr ""
+msgstr "To�ka priklopa"
 
-#: ../../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:38
 msgid "Write /etc/fstab"
-msgstr ""
+msgstr "Zapi�i /etc/fstab"
 
-#: ../../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:39
 msgid "Toggle to expert mode"
-msgstr ""
+msgstr "Spremeni v napredni na�in"
 
-#: ../../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:40
 msgid "Toggle to normal mode"
-msgstr ""
+msgstr "Spremeni v normalen na�in"
 
-#: ../../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:41
 msgid "Restore from file"
-msgstr ""
+msgstr "Obnovi iz datoteke"
 
-#: ../../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:42
 msgid "Save in file"
-msgstr ""
+msgstr "Shrani v datoteko"
 
-#: ../../diskdrake.pm_.c:40
+#: ../../diskdrake.pm_.c:43
+msgid "Wizard"
+msgstr "�arovnik"
+
+#: ../../diskdrake.pm_.c:44
 msgid "Restore from floppy"
-msgstr ""
+msgstr "Obnovi z diskete"
 
-#: ../../diskdrake.pm_.c:41
+#: ../../diskdrake.pm_.c:45
 msgid "Save on floppy"
-msgstr ""
+msgstr "Shrani na disketo"
 
-#: ../../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:49
 msgid "Clear all"
-msgstr ""
+msgstr "Izbri�i vse"
 
-#: ../../diskdrake.pm_.c:46
+#: ../../diskdrake.pm_.c:50
 msgid "Format all"
-msgstr ""
+msgstr "Formatiraj vse"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:51
 msgid "Auto allocate"
-msgstr ""
+msgstr "Samodejno alociranje"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "All primary partitions are used"
-msgstr ""
+msgstr "Vsi primarni razdelki so uporabljeni"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid "I can't add any more partition"
-msgstr ""
+msgstr "Razdelkov ni ve� mogo�e dodati"
 
-#: ../../diskdrake.pm_.c:50
+#: ../../diskdrake.pm_.c:54
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr ""
+"�e �elite imeti ve� razdelkov, enega izbri�ite, tako da bo mo�no ustvariti "
+"raz�irjen razdelek"
 
-#: ../../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:57
 msgid "Rescue partition table"
-msgstr ""
+msgstr "Re�evanje razdelitvene tabele"
 
-#: ../../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:58
 msgid "Undo"
-msgstr ""
+msgstr "Razveljavi"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:59
 msgid "Write partition table"
-msgstr ""
+msgstr "Zapi�i razdelitveno tabelo"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:60
 msgid "Reload"
-msgstr ""
+msgstr "Nalo�i ponovno"
 
-#: ../../diskdrake.pm_.c:96
+#: ../../diskdrake.pm_.c:101
 msgid "loopback"
-msgstr ""
-
-#: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr ""
+msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Ext2"
-msgstr ""
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "FAT"
-msgstr ""
+msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "HFS"
-msgstr ""
+msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:109
-msgid "Other"
-msgstr ""
+#: ../../diskdrake.pm_.c:114
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:109
+#: ../../diskdrake.pm_.c:114
 msgid "Swap"
-msgstr ""
+msgstr "Swap"
 
 #: ../../diskdrake.pm_.c:115
+msgid "Empty"
+msgstr "Prazno"
+
+#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125
+msgid "Other"
+msgstr "Drugo"
+
+#: ../../diskdrake.pm_.c:121
 msgid "Filesystem types:"
-msgstr ""
+msgstr "Tipi datote�nih sistemov:"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:130
 msgid "Details"
-msgstr ""
+msgstr "Podrobnosti"
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:144
 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 ""
+"Imate velik FAT razdelek (ponavadi v uporabi\n"
+"DOS-a/Oken). Predlagamo vam, da najprej \n"
+"spremenite velikost tega razdelka (pritisnite\n"
+"nanj, nato pa pritisnite \"Spremeni velikost\")"
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:149
 msgid "Please make a backup of your data first"
-msgstr ""
+msgstr "Najprej naredite varnostno kopijo podatkov"
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166
+#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524
+#: ../../diskdrake.pm_.c:546
 msgid "Read carefully!"
-msgstr ""
+msgstr "Preberite pazljivo!"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:152
 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 ""
+"�e nameravate uporabiti aboot, pustite dovolj prostega prostora (2048 "
+"sektorjev je dovolj)\n"
+"na za�etku diska"
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:166
 msgid "Be careful: this operation is dangerous."
-msgstr ""
+msgstr "Bodite previdni: Ta operacija je nevarna."
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
-#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
-#: ../../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:38
+#: ../../install_steps_interactive.pm_.c:315 ../../standalone/diskdrake_.c:60
+#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Napaka"
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694
 msgid "Mount point: "
-msgstr ""
+msgstr "To�ka priklopa:"
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269
 msgid "Device: "
-msgstr ""
+msgstr "Naprava:"
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
-msgstr ""
+msgstr "DOS �rka pogona: %s (ugibanje)\n"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272
 msgid "Type: "
-msgstr ""
+msgstr "Tip:"
 
-#: ../../diskdrake.pm_.c:225
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:231
+#, c-format
 msgid "Start: sector %s\n"
-msgstr "poskusil uporabiti %s\n"
+msgstr "Za�etek: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:232
 #, c-format
 msgid "Size: %d MB"
-msgstr ""
+msgstr "Velikost: %d MB"
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:234
 #, c-format
 msgid ", %s sectors"
-msgstr ""
+msgstr ", %s sektorjev"
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
-msgstr ""
+msgstr "Cilinder %d do cilinder %d\n"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:237
 msgid "Formatted\n"
-msgstr ""
+msgstr "Formatirano\n"
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:238
 msgid "Not formatted\n"
-msgstr ""
+msgstr "Neformatirano\n"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:239
 msgid "Mounted\n"
-msgstr ""
+msgstr "Priklopljeno\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "RAID md%s\n"
-msgstr ""
+msgstr "RAID ms%s\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "Loopback file(s): %s\n"
-msgstr ""
+msgstr "Datoteka(e) loopback: %s\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:242
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
+"Prevzet zagonski razdelek\n"
+"    (za zagon MS-DOS, ne lilo)\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Level %s\n"
-msgstr ""
+msgstr "Stopnja %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "Chunk size %s\n"
-msgstr ""
+msgstr "Velikost kosa %s\n"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:246
 #, c-format
 msgid "RAID-disks %s\n"
-msgstr ""
+msgstr "RAID-diski %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:248
 #, c-format
 msgid "Loopback file name: %s"
-msgstr ""
+msgstr "Datoteka loopback: %s"
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:265
 msgid "Please click on a partition"
-msgstr ""
+msgstr "Kliknite na razdelek"
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Size: %d MB\n"
-msgstr ""
+msgstr "Velikost: %d MB\n"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:271
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr ""
+msgstr "Geometrija: %s cilindrov, %s glav, %s sektorjev\n"
 
-#: ../../diskdrake.pm_.c:267
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:273
+#, c-format
 msgid "Partition table type: %s\n"
-msgstr "  Vrsta monitorja %d\n"
+msgstr "Tip razdelitvene tabele: %s\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:274
 #, c-format
 msgid "on bus %d id %d\n"
-msgstr ""
+msgstr "na vodilu %d id %d\n"
 
-#: ../../diskdrake.pm_.c:281
-#, fuzzy
+#: ../../diskdrake.pm_.c:287
 msgid "Mount"
-msgstr "Baza monitorjev"
+msgstr "Priklopljeno"
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:288
 msgid "Active"
-msgstr ""
+msgstr "Aktivno"
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:289
 msgid "Add to RAID"
-msgstr ""
+msgstr "Dodaj k RAID"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:290
 msgid "Remove from RAID"
-msgstr ""
+msgstr "Odstrani iz RAID"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:291
 msgid "Modify RAID"
-msgstr ""
+msgstr "Spremeni RAID"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:292
 msgid "Use for loopback"
-msgstr ""
+msgstr "Uporabi za loopback"
 
-#: ../../diskdrake.pm_.c:293
-#, fuzzy
+#: ../../diskdrake.pm_.c:299
 msgid "Choose action"
-msgstr "Izberite kartico"
+msgstr "Izberite akcijo"
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:392
 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 ""
+"Oprostite, vendar /boot ne morete ustvariti tako dale� na pogonu (na "
+"cilinder > 1024).\n"
+"Ali boste uporabljali LILO, ki ne bo deloval ali pa ne boste uporabljali "
+"LILO, tako da /boot ne potrebujete"
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:396
 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 ""
+"Razdelek, ki ste ga izbrali kot korenskega (/), se fizi�no nahaja za\n"
+"1024-im cilindrom trdega diska in tudi razdelka /boot nimate.\n"
+"�e nameravate uporabljati LILO, ne pozabite dodati /boot razdelka"
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:402
 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 if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
+"Za korenski (/) razdelek ste izbrali programski RAID razdelek.\n"
+"Nobeden zagonski nalagalnik ne bo deloval brez /boot razdelka.\n"
+"Ne pozabite dodati /boot razdelka"
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421
 #, c-format
 msgid "Use ``%s'' instead"
-msgstr ""
+msgstr "Namesto tega uporabite ``%s''"
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:424
 msgid "Use ``Unmount'' first"
-msgstr ""
+msgstr "Najprej uporabite ``Odklopi''"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
+"Po spremembi tipa razdelka %s, bodo vsi podatki na tem razdelku izgubljeni"
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:437
 msgid "Continue anyway?"
-msgstr ""
+msgstr "Naj nadaljujem?"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without saving"
-msgstr ""
+msgstr "Konec brez zapisovanja sprememb"
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:442
 msgid "Quit without writing the partition table?"
-msgstr ""
+msgstr "Konec brez zapisovanja razdelitvene tabele?"
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:470
 msgid "Change partition type"
-msgstr ""
+msgstr "Spremeni tip razdelka"
 
-#: ../../diskdrake.pm_.c:465
+#: ../../diskdrake.pm_.c:471
 #, fuzzy
-msgid "Which partition type do you want?"
+msgid "Which filesystem do you want?"
 msgstr "Kateri stre�nik potrebujete?"
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr ""
+msgstr "ReiserFS ne morete uporabiti na razdelkih manj�ih od 32MB"
 
-#: ../../diskdrake.pm_.c:484
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:490
+#, c-format
 msgid "Where do you want to mount loopback file %s?"
-msgstr "Kateri stre�nik potrebujete?"
+msgstr "Kam �elite priklopiti loopback datoteko %s?"
 
-#: ../../diskdrake.pm_.c:485
-#, fuzzy, c-format
+#: ../../diskdrake.pm_.c:491
+#, c-format
 msgid "Where do you want to mount device %s?"
-msgstr "Kateri stre�nik potrebujete?"
+msgstr "Kam �elite priklopiti napravo %s?"
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:496
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
+"Ne morem izklopiti to�ke priklopa, ker je ta razdelek uporabljen za "
+"loopback.\n"
+"Najprej odstranite loopback"
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:515
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
+"Po formatiranju razdelka %s bodo vsi podatki na tem razdelku izgubljeni"
 
-#: ../../diskdrake.pm_.c:511
-#, fuzzy
+#: ../../diskdrake.pm_.c:517
 msgid "Formatting"
-msgstr "Zaganjam X"
+msgstr "Formatiranje"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:518
 #, c-format
 msgid "Formatting loopback file %s"
-msgstr ""
+msgstr "Formatiranje loopback datoteko %s"
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:402
 #, c-format
 msgid "Formatting partition %s"
-msgstr ""
+msgstr "Formatiranje razdelka %s"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "After formatting all partitions,"
-msgstr ""
+msgstr "Po formatiranju vseh razdelkov,"
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:524
 msgid "all data on these partitions will be lost"
-msgstr ""
+msgstr "bodo vsi podatki na teh razdelkih izgubljeni"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Move"
-msgstr ""
+msgstr "Premakni"
 
-#: ../../diskdrake.pm_.c:529
-#, fuzzy
+#: ../../diskdrake.pm_.c:531
 msgid "Which disk do you want to move it to?"
-msgstr "Kateri frekven�ni �ip (ang. clockchip) imate?"
+msgstr "Na kateri disk �elite premakniti?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:532
 msgid "Sector"
-msgstr ""
+msgstr "Sektor"
 
-#: ../../diskdrake.pm_.c:534
-#, fuzzy
+#: ../../diskdrake.pm_.c:533
 msgid "Which sector do you want to move it to?"
-msgstr "Kateri stre�nik potrebujete?"
+msgstr "Na kateri sektor �elite premakniti?"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving"
-msgstr ""
+msgstr "Premikanje"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:536
 msgid "Moving partition..."
-msgstr ""
+msgstr "Premikanje razdelka..."
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:546
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
-msgstr ""
+msgstr "Razdelitvena tabela pogona %s bo zapisana na disk!"
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:548
 msgid "You'll need to reboot before the modification can take place"
-msgstr ""
+msgstr "Preden bodo obveljale spremembe morate ponovno zagnati ra�unalnik"
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569
 msgid "Computing FAT filesystem bounds"
-msgstr ""
+msgstr "Ra�unanje mej FAT datote�nega sistema"
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
-#: ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
-msgstr ""
+msgstr "Spreminjanje velikosti"
+
+#: ../../diskdrake.pm_.c:592
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "Kateremu razdeleku �elite spremeniti velikost?"
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:597
 msgid "All data on this partition should be backed-up"
-msgstr ""
+msgstr "Podatki na tem razdelku naj bodo arhivirani"
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:599
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
+"Po spremembi velikosti razdelka %s bodo vsi podatki na tem razdelku "
+"izgubljeni"
 
-#: ../../diskdrake.pm_.c:598
-#, fuzzy
+#: ../../diskdrake.pm_.c:609
 msgid "Choose the new size"
-msgstr "Izberite kartico"
+msgstr "Izberite novo velikost"
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
+#: ../../partition_table_raw.pm_.c:101
 msgid "MB"
-msgstr ""
+msgstr "MB"
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:666
 msgid "Create a new partition"
-msgstr ""
+msgstr "Ustvarjanje novega razdelka"
 
-#: ../../diskdrake.pm_.c:673
-#, fuzzy
+#: ../../diskdrake.pm_.c:686
 msgid "Start sector: "
-msgstr "poskusil uporabiti %s\n"
+msgstr "Za�etni sektor: "
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765
 msgid "Size in MB: "
-msgstr ""
+msgstr "Velikost v MB: "
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768
 msgid "Filesystem type: "
-msgstr ""
+msgstr "Tip datote�nega sistema: "
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:696
 msgid "Preference: "
-msgstr ""
+msgstr "Lastnosti:"
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:744
 msgid "This partition can't be used for loopback"
-msgstr ""
+msgstr "Ta razdelek ne more biti uporabljen za loopback"
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:754
 msgid "Loopback"
-msgstr ""
+msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:764
 msgid "Loopback file name: "
-msgstr ""
+msgstr "Ime loopback datoteke: "
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:790
 msgid "File already used by another loopback, choose another one"
-msgstr ""
+msgstr "Datoteko �e uporablja drug loopback, izberite drugo"
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:791
 msgid "File already exists. Use it?"
-msgstr ""
+msgstr "Datoteka �e obstaja. Jo uporabim?"
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
-#, fuzzy
+#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829
 msgid "Select file"
-msgstr "Izberite grafi�ne na�ine"
+msgstr "Izberite datoteko"
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:822
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
+"Velikost varnostne kopije zagonske tabele nima enake velikosti\n"
+"Naj nadaljujem?"
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:830
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:831
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
+"Vstavite disketo v pogon\n"
+"Vsi podatki na tej disketi bodo uni�eni"
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:842
 msgid "Trying to rescue partition table"
-msgstr ""
+msgstr "Re�evanje razdelitvene tabele"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:853
 msgid "device"
-msgstr ""
+msgstr "naprava"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:854
 msgid "level"
-msgstr ""
+msgstr "stopnja"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:855
 msgid "chunk size"
-msgstr ""
+msgstr "velikost kosa"
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:867
 msgid "Choose an existing RAID to add to"
-msgstr ""
+msgstr "Izberite obstoje� RAID za dodajanje"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:868
 msgid "new"
-msgstr ""
+msgstr "nov"
 
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
 #, c-format
 msgid "%s formatting of %s failed"
-msgstr ""
+msgstr "%s formatiranje %s neuspe�no"
 
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:133
 #, c-format
 msgid "I don't know how to format %s in type %s"
-msgstr ""
-
-#: ../../fs.pm_.c:186
-msgid "nfs mount failed"
-msgstr ""
+msgstr "Formatiranje %s s tipom %s ni poznano"
 
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:218
 msgid "mount failed: "
-msgstr ""
+msgstr "priklop neuspe�en: "
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:230
 #, c-format
 msgid "error unmounting %s: %s"
-msgstr ""
+msgstr "napaka pri odklopu %s: %s"
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:235
 msgid "Mount points must begin with a leading /"
-msgstr ""
+msgstr "To�ke priklopa se morajo za�eti z /"
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:238
 #, c-format
 msgid "There is already a partition with mount point %s\n"
-msgstr ""
+msgstr "Razdelek s to�ko priklopa %s �e obstaja\n"
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:246
 #, c-format
 msgid "Circular mounts %s\n"
+msgstr "Kro�ni priklopi %s\n"
+
+#: ../../fsedit.pm_.c:258
+msgid "This directory should remain within the root filesystem"
 msgstr ""
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:259
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
+"Za to to�ko priklopa potrebujete pravi datote�ni sistem(ext2,reiserfs)\n"
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:335
 #, c-format
 msgid "Error opening %s for writing: %s"
-msgstr ""
+msgstr "Napaka pri odpiranju %s za pisanje: %s"
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:417
 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 ""
+"Pri�lo je do napake - ni veljavnih naprav na katerih bi se lahko ustvaril "
+"nov datote�ni sistem. Preverite strojno opremo za mo�en vzrok problema"
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:431
 msgid "You don't have any partitions!"
-msgstr ""
+msgstr "Nimate razdelkov!"
+
+#: ../../help.pm_.c:9
+#, fuzzy
+msgid ""
+"Please choose your preferred language for installation and system usage."
+msgstr "Izberite �eljen jezik za namestitev in uporabo sistema."
 
-#: ../../help.pm_.c:7
-msgid "Choose preferred language for install and system usage."
+#: ../../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:10
+#: ../../help.pm_.c:22
 msgid "Choose the layout corresponding to your keyboard from the list above"
+msgstr "Izberite iz seznama razpored, ki ustreza va�i tipkovnici"
+
+#: ../../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:13
+#: ../../help.pm_.c:30
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
+"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"
-"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).\n"
 "\n"
+"Please choose \"Update\" if you wish to update an already installed version "
+"of Linux-Mandrake.\n"
 "\n"
-"Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
-"choose this. NOTE:\n"
-"    networking will not be configured during installation, use "
-"\"LinuxConf\"\n"
-"    to configure it after the install completes.\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"
-"  - 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"
+"\t* Recommanded: 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"
-"  - 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"
+"\n"
+"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
+"the primary usage (workstation, server,\n"
+"\t  development) of your sytem. You will need to answer to more questions "
+"than in \"Recommanded\" installation\n"
+"\t  class, so you need to know how GNU/Linux works to choose this "
+"installation class.\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 ""
 
-#: ../../help.pm_.c:37
+#: ../../help.pm_.c:56
 msgid ""
 "Select:\n"
 "\n"
@@ -1281,325 +1561,884 @@ msgid ""
 "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!\n"
+"DOING!"
 msgstr ""
+"Izberite:\n"
+"\n"
+" - Prilagojen: �e ste dovolj seznanjeni z GNU/Linux-om lahko izberete\n"
+"   primaren namen uporabe va�ega sistema. Glejte spodaj za podrobnosti.\n"
+"\n"
+"\n"
+" - Napreden: Priporo�eno samo �e ste z GNU/Linux-om zelo dobro seznanjeni\n"
+"   in �elite opraviti zelo prilagojeno namestitev. Tudi tukaj boste lahko\n"
+"   izbrali primaren namen uporabe va�ega sistema.\n"
+"   IZBERITE TO MO�NOST, �E RESNI�NO VESTE KAJ DELATE!"
 
-#: ../../help.pm_.c:49
+#: ../../help.pm_.c:68
+#, fuzzy
 msgid ""
-"The different choices for your machine's usage (provided, hence, that you "
-"have\n"
-"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
-"following:\n"
+"You must now define your machine usage. Choices are:\n"
 "\n"
-"  - Normal: choose this if you intend to use your machine primarily for\n"
-"    everyday use (office work, graphics manipulation and so on). Do not\n"
-"    expect any compiler, development utility et al. installed.\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"
-"  - Development: as its name says. Choose this if you intend to use your\n"
-"    machine primarily for software development. You will then have a "
-"complete\n"
-"    collection of software installed in order to compile, debug and format\n"
-"    source code, or create software packages.\n"
 "\n"
-"  - Server: choose this if the machine which you're installing "
-"Linux-Mandrake\n"
-"    on is intended to be used as a server. Either a file server (NFS or "
-"SMB),\n"
-"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
-"    printing), an authentication server (NIS), a database server and so on. "
-"As\n"
-"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\n"
-msgstr ""
+"\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."
+msgstr ""
+"Mo�nosti primarnega namena uporabe va�ega sistema (�e ste izbrali razred\n"
+"namestitve \"Prilagojen\" ali \"Napreden\") so naslednje:\n"
+"\n"
+" - Normalno: izberite, �e boste uporabljali sistem predvsem za vsakodnevno\n"
+"   uporabo (pisarni�ka dela, grafika ipd.). Ne pri�akujte namestitve\n"
+"   prevajalnikov, razvojnih orodij ipd.\n"
+"\n"
+" - Razvoj: kot pove �e ime, izberite to mo�nost, �e nameravate uporabljati\n"
+"   sistem predvsem za razvoj programske opreme. Po namestitvi boste imeli\n"
+"   name��eno popolno zbirko programske opreme za prevajanje, razhro��evanje\n"
+"   in oblikovanje izvorne kode, ter ustvarjanje programskih paketov.\n"
+"\n"
+" - Stre�nik: izberite, �e bo sistem, na katerega name��ate Linux-Mandrake\n"
+"   uporabljen kot stre�nik. Npr. kot datote�ni stre�nik (NFS ali SMB),\n"
+"   tiskalni stre�nik (Protokol Unix lp (Line Printer) ali tiskanje v okolju\n"
+"   Windows s pomo�jo SMB), stre�nik za overjanje (NIS), datote�ni stre�nik\n"
+"   ipd. Ne pri�akujte namestitve raznih dodatkov (KDE, GNOME...).\n"
 
-#: ../../help.pm_.c:70
+#: ../../help.pm_.c:84
+#, fuzzy
 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"
+"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 bo posku�al poiskati PCI SCSI krmilnik(e). \n"
+"�e bo najden kak�en SCSI krmilnik in prepoznan gonilnik zanj, bo gonilnik\n"
+"samodejno name��en.\n"
+"\n"
+"�e nimate SCSI krmilnikov ali imate ISA ali PCI SCSI krmilnik, ki ga DrakX\n"
+"ne prepozna, boste vpra�ani, �e imate v sistemu kak�en SCSI krmilnik. �e v\n"
+"sistemu nimate SCSI krmilnikov pritisnite 'Ne'. �e boste pritisnili 'Da' se\n"
+"vam bo odprl seznam gonilnikov, iz katerega lahko izberete va� krmilnik.\n"
+"\n"
+"\n"
+"�e boste ro�no izbrali gonilnik, vas bo DrakX vpra�al �e �elite "
+"specificirati\n"
+"nastavitve zanj. Dovolite DrakX-u, da jih poskusi nastaviti samodejno.\n"
+"\n"
+"�e tega ne boste izbrali, boste morali nastavitve vnesti sami.\n"
+"Poglejte za nasvete kako pridobiti nastavitve iz sistema Windows (�e imate\n"
+"sistem name��en), dokumentacije prilo�ene strojni opremi ali iz "
+"proizvajal�evih\n"
+"spletnih strani (�e imate dostop do internet-a) v navodila za namestitev."
+
+#: ../../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"
+"\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"
-"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"
+"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"
-"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"
+"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 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."
+"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."
 msgstr ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:160
 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 Linux or from another partitionning 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"
+"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"
-"If you have to create new partitions, use \"Auto allocate\" to "
-"automatically\n"
-"create partitions for Linux. You can select the disk for partitionning 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"
+"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"
-"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"
+"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"
-"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"
 "\n"
+"   * Auto allocate:: this option allows you to automatically create Ext2 and "
+"swap partitions in free space of your\n"
+"     hard drive.\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"
 "\n"
-"- Ctrl-c  to create a new partition (when an empty partition is selected)\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"
-"- Ctrl-d  to delete a partition\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"
-"- Ctrl-m  to set the mount point\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"
+msgstr ""
+
+#: ../../help.pm_.c:218
+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 ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:252
 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."
+"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:139
+#: ../../help.pm_.c:257
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"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"
-"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\n"
-"the 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\n"
-"through more than 1000 packages..."
+"\n"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:267
 msgid ""
-"If you have all the CDs in the list above, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"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 ""
+
+#: ../../help.pm_.c:300
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:303
 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."
+"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 ""
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:329
+#, fuzzy
 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 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 ""
+"Sedaj lahko izberete skupino paketov, ki jih �elite\n"
+"namestiti ali nadgraditi\n"
 "\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
+"DrakX bo nato preveril ali je za celotno namestitev na voljo dovolj "
+"prostora\n"
+"V primeru, da prostora ne bo dovolj, boste obve��eni. �e boste kljub\n"
+"temu nadaljevali, se bo namestitev nadaljevala z izbranimi paketi, vendar\n"
+"bodo nekateri manj pomembni izpu��eni. �e boste na dnu seznama izbrali "
+"mo�nost\n"
+"\"Izbira posameznih paketov\", boste lahko izbirali med ve� kot 1000 "
+"paketi..."
+
+#: ../../help.pm_.c:341
+msgid ""
+"You can now choose individually all the packages you\n"
+"wish to install.\n"
 "\n"
 "\n"
-"In case of a serial mouse, you will also have to tell DrakX\n"
-"which serial port it is connected to."
+"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 ""
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:358
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"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 ""
+"�e imate vse CD-je iz spodnjega seznama, pritisnite 'V redu'.\n"
+"�e nimate nobenega CD-ja iz spodnjega seznama, pritisnite 'Prekli�i'.\n"
+"�e nekateri CD-ji manjkajo, jih odizberite, nato pritisnite 'V redu'."
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:363
 msgid ""
-"This section is dedicated to configuring a local area\n"
-"network (LAN) or a modem.\n"
+"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"
-"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"
+"Please be patient."
+msgstr ""
+
+#: ../../help.pm_.c:371
+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:376
+#, fuzzy
+msgid ""
+"Please select the correct port. For example, the COM1\n"
+"port under MS Windows is named ttyS0 under GNU/Linux."
+msgstr ""
+"Izberite pravilna vrata. Npr: COM1 pod Okni so poimenovana ttyS0\n"
+"pod GNU/Linux-om."
+
+#: ../../help.pm_.c:380
+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"
-"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"
+"If you do not have any connection to the Internet or a local network, "
+"choose\n"
+"\"Disable networking\".\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"
+"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:393
+msgid ""
+"No modem has been detected. Please select the serial port on which it is "
+"plugged.\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."
+"For information, the first serial port (called \"COM1\" under Microsoft\n"
+"Windows) is called \"ttyS0\" under Linux."
+msgstr ""
+
+#: ../../help.pm_.c:400
+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:407
+msgid ""
+"If your modem is an external modem, please turn on it now to let DrakX "
+"detect it automatically."
+msgstr ""
+
+#: ../../help.pm_.c:410
+msgid "Please turn on your modem and choose the correct one."
+msgstr ""
+
+#: ../../help.pm_.c:413
+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:420
+#, 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 ""
+"Sedaj lahko vnesete mo�nosti omre�ja na klic. �e niste prepri�ani kaj "
+"vnesti,\n"
+"dobite pravilne informacije pri va�em ponudniku internet-a."
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:425
+#, fuzzy
 msgid ""
-"Enter:\n"
+"You may now configure your network device.\n"
 "\n"
-"  - IP address: if you don't know it, ask your network administrator or "
-"ISP.\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 ""
+"Vnesite:\n"
 "\n"
-"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
-"sure, ask your network administrator or ISP.\n"
+"  - Naslov IP: �e ga ne poznate, povpra�ajte vzdr�evalca va�ega omre�ja.\n"
 "\n"
 "\n"
-"  - Automatic IP: If your network uses bootp or dhcp protocol, select \n"
-"this option. If selected, no value is needed in \"IP address\". If you are\n"
-"not sure, ask your network administrator or ISP.\n"
+"  - Omre�na maska: \"255.255.255.0\" je ponavadi pravilna izbira. �e niste\n"
+"prepri�ani, povpra�ajte vzdr�evalca omre�ja.\n"
+"\n"
+"\n"
+"  - Samodejni IP: izberite to mo�nost, �e v omre�ju uporabljate protokol\n"
+"BOOTP ali DHCP. Pri izbiri te mo�nosti ni potrebno vnesti \"Naslov IP\". �e\n"
+"niste prepri�ani, povpra�ajte vzdr�evalca va�ega omre�ja.\n"
+
+#: ../../help.pm_.c:437
+#, 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 ""
+"�e va�e omre�je uporablja NIS, izberite \"Uporabi NIS\". �e niste "
+"prepri�ani,\n"
+"povpra�ajte vzdr�evalca va�ega omre�ja."
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:441
+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:445
 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 ""
+"Sedaj lahko vnesete mo�nosti omre�ja na klic. �e niste prepri�ani kaj "
+"vnesti,\n"
+"dobite pravilne informacije pri va�em ponudniku internet-a."
 
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:449
 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 ""
+"�e boste uporabljali stre�nik proxy, ga sedaj nastavite. �e niste "
+"prepri�ani\n"
+"ali naj ga uporabljate, povpra�ajte va�ega ponudnika internet-a."
 
-#: ../../help.pm_.c:233
+#: ../../help.pm_.c:453
+#, 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 ""
+"Paket za kriptografijo lahko namestite, �e ste pravilno namestili povezavo "
+"v\n"
+"internet. Najprej izberite zrcalni stre�nik iz katerega �elite prenesti\n"
+"pakete, nato izberite pakete, katere �elite namestiti.\n"
+"\n"
+"Zrcalni stre�nik in pakete izberite v skladu z va�o zakonodajo."
+
+#: ../../help.pm_.c:462
+msgid "You can now select your timezone according to where you live."
+msgstr ""
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:465
+#, fuzzy
 msgid ""
-"You can now select your timezone according to where you live.\n"
+"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"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
-"in local time according to the time zone you have selected."
+"If you use Microsoft Windows on this computer, choose \"No\"."
 msgstr ""
+"Sedaj lahko izberete �asovno cono, glede na to kje �ivite.\n"
+"\n"
+"\n"
+"GNU/Linux uporablja �as v formatu GMT ali \"Greenwich Mean Time\" in ga\n"
+"prevede v lokalni �as glede na izbrano �asovno cono."
 
-#: ../../help.pm_.c:248
+#: ../../help.pm_.c:473
+#, fuzzy
 msgid ""
-"You may now choose which services you want to see started at boot time.\n"
+"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"
-"Be especially careful in this step if you intend to use your machine as a\n"
-"server: you will probably want not to start any services which you don't\n"
-"want."
+"\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 ""
+"Sedaj lahko izberete servise, ki se naj za�enejo pri zagonu. Ko boste z\n"
+"mi�ko nad servisom, se vam bo prikazal balon�ek s pomo�jo, ki opisuje\n"
+"vlogo posameznega servisa.\n"
+"\n"
+"Bodite posebej pozorni pri tem koraku, �e boste ra�unalnik uporabljali kot\n"
+"stre�nik: verjetno ne boste �eleli poganjati servisov, ki jih ne �elite."
+
+#: ../../help.pm_.c:486
+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:257
+#: ../../help.pm_.c:490
 msgid ""
-"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"
+"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"
-"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"
+"LPR is the old printing system used in previous Linux-Mandrake "
+"distributions.\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"
+"If you don't have printer, click on \"None\"."
+msgstr ""
+
+#: ../../help.pm_.c:505
+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 ""
+
+#: ../../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"
+"\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 ""
+
+#: ../../help.pm_.c:542
+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:567
+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 ""
+
+#: ../../help.pm_.c:575
+msgid "You must now select your printer in the above list."
+msgstr ""
+
+#: ../../help.pm_.c:578
+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"
-"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."
+"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 ""
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:585
+#, fuzzy
 msgid ""
-"You can now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
+"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"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should NEVER be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"\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 ""
+"Sedaj lahko vnesete geslo root za va� sistem Linux-Mandrake\n"
+"Geslo morate vnesti dvakrat, da se preveri identi�nost obeh\n"
+"vnosov.\n"
+"\n"
+"Uporabnik root je administrator sistema in edini uporabnik, ki lahko\n"
+"spreminja nastavitev sistema. Zato izberite geslo posebej pazljivo!\n"
+"Neavtorizirana uporaba ra�una root je lahko zelo nevarna za integriteto\n"
+"va�ega sistema in podatkov, ter ostalih sistemov povezanih nanj. Geslo naj\n"
+"bo sestavljeno iz alfanumeri�nih znakov in dolgo vsaj 8 znakov. NIKOLI ga\n"
+"nikamor ne zapisujte. Ne izberite predolgega ali preve� kompliciranega\n"
+"gesla, da ga ne boste pozabili!"
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:603
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
 msgstr ""
+"Za bolj varen sistem izberite \"Uporabi datoteko 'shadow'\" in\n"
+"\"Uporabi gesla MD5\"."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:607
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
 msgstr ""
+"�e va�e omre�je uporablja NIS, izberite \"Uporabi NIS\". �e niste "
+"prepri�ani,\n"
+"povpra�ajte vzdr�evalca va�ega omre�ja."
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:611
 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"
@@ -1622,35 +2461,54 @@ msgid ""
 "you will have created here, and login as root only for administration\n"
 "and maintenance purposes."
 msgstr ""
+"Sedaj lahko ustvarite enega ali ve� \"navadnih\" uporabni�kih ra�unov.\n"
+"Ustvarite lahko enega ali ve� ra�unov za vsako osebo, ki ji boste dovolili\n"
+"uporabo ra�unalnika. Vsak uporabnik bo imel svoje lastnosti (grafi�no\n"
+"okolje, nastavitve programov itd.) in svoj \"doma� imenik\", v katerem bodo\n"
+"te lastnosti shranjene.\n"
+"\n"
+"Najprej ustvarite ra�un zase! Tudi �e boste edin uporabnik sistema, se NE\n"
+"PRIJAVLJAJTE kot root za vsakodnevna opravila. To bi bil velik varnosti\n"
+"riziko, saj je neuporabnost sistema lahko oddaljena samo eno tipkarsko\n"
+"napako!\n"
+"\n"
+"Zato se prijavljajte v sistem z uporabni�kim ra�unom, ki ga boste ustvarili\n"
+"tukaj. Kot root se prijavite samo za administracijske in vzdr�evalne namene."
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:630
 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 Linux any more."
+"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:335
+#: ../../help.pm_.c:635
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\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 ""
+"Izberite kam �elite zapisati\n"
+"informacije potrebne za zagon GNU/Linux-a.\n"
+"\n"
+"\n"
+"Razen, �e natan�no veste kaj delate, izberite \"Prvi sektor pogona (MBR)\"."
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:643
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
 msgstr ""
+"Razen �e specifi�no veste druga�e, je obi�ajna izbira \"/dev/hda\"\n"
+" (primaren master IDE disk) ali \"/dev/sda\" (prvi SCSI disk)."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:647
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\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"
@@ -1660,8 +2518,14 @@ msgid ""
 "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) in Grub sta zagonska nalagalnika. Omogo�ata zagon\n"
+"GNU/Linux-a ali kateregakoli drugega operacijskega sistema na va�em\n"
+"ra�unalniku. Ponavadi so drugi operacijski sistemi pravilno prepoznani in\n"
+"name��eni. V primeru, da ni tako, lahko tukaj ro�no dodate vnos. Pazljivo\n"
+"izberite pravilne parametre."
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:659
+#, fuzzy
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1678,14 +2542,83 @@ msgid ""
 "\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."
 msgstr ""
+"Glavne mo�nosti LILO in Grub so:\n"
+"  - Zagonska naprava: Ime naprave (npr. razdelka na trdem disku\n"
+"ki vsebuje zagonski sektor. Razen, �e specifi�no veste druga�e izberite\n"
+"\"/dev/hda\".\n"
+"\n"
+"\n"
+"  - Pavza pred zagonom prevzete slike: �as v desetinkah sekunde, ki ga naj\n"
+"zagonski nalagalnik �aka, preden za�ne zaganjati prvo sliko.\n"
+"Ta mo�nost je uporabna za sisteme, ki takoj po prepoznani tipkovnici\n"
+"za�nejo zaganjati sistem. Zagonski nalagalnik ne �aka, �e pavza ni dolo�ena\n"
+"ali �e je vrednost postavljena na ni�.\n"
+"\n"
+"\n"
+"  - Video na�in: Tekstoven na�in VGA, ki naj bo izbran ob zagonu. Na voljo\n"
+"so naslednje vrednosti: \n"
+"    * normal: normalen tekstoven na�in 80x25.\n"
+"    * <�tevilka>: uporabi ustrezen tekstoven na�in."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:680
+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 SPARC zagonski nalagalnik: omogo�a zagon\n"
+"GNU/Linux-a ali kateregakoli drugega operacijskega sistema na va�em\n"
+"ra�unalniku. Ponavadi so drugi operacijski sistemi pravilno prepoznani in\n"
+"name��eni. V primeru, da ni tako, lahko tukaj ro�no dodate vnos. Pazljivo\n"
+"izberite pravilne parametre.\n"
+"\n"
+"\n"
+"Lahko drugim tudi prepre�ite dostop do ostalih operacijskih sistemov. V\n"
+"tem primeru izbri�ite odgovarjajo�e vnose, vendar boste za njihov zagon\n"
+"kasneje potrebovali zagonsko disketo!"
+
+#: ../../help.pm_.c:692
+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 ""
+"Glavne mo�nosti SILO so:\n"
+"  - Namestitev zagonskega nalagalnika: Izberite kam �elite zapisati\n"
+"informacije potrebne za zagon GNU/Linux-a. Razen, �e natan�no veste\n"
+"kaj delate, izberite \"Prvi sektor pogona (MBR)\".\n"
+"\n"
+"\n"
+"  - Pavza pred zagonom prevzete slike: �as v desetinkah sekunde, ki ga naj\n"
+"zagonski nalagalnik �aka, preden za�ne zaganjati prvo sliko.\n"
+"Ta mo�nost je uporabna za sisteme, ki takoj po prepoznani tipkovnici\n"
+"za�nejo zaganjati sistem. Zagonski nalagalnik ne �aka, �e pavza ni dolo�ena\n"
+"ali �e je vrednost postavljena na ni�."
+
+#: ../../help.pm_.c:705
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\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"
@@ -1696,58 +2629,108 @@ msgid ""
 "settings suit you. If they don't, you can come back and\n"
 "change them, as many times as necessary."
 msgstr ""
+"Sedaj je �as za nastavitev sistema X Windows, ki je jedro grafi�nega\n"
+"sistema GNU/Linux. Nastaviti morate grafi�no kartico in monitor. Ve�ina\n"
+"korakov je samodejnih, tako da boste verjetno morali samo preveriti\n"
+"kaj je bilo narejeno in sprejeti nastavitve :)\n"
+"\n"
+"\n"
+"Po kon�ani nastavitvi, se bo zagnal sistem X (razen, �e niste tega\n"
+"onemogo�ili v DrakX), tako da boste lahko preverili �e so vse nastavitve\n"
+"pravilne. �e nastavitve ne bodo pravilne, jih lahko ponovno spremenite\n"
+"kolikokrat bo pa� potrebno."
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:718
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
 msgstr ""
+"�e je v nastavitvah sistema X kaj narobe, uporabite te mo�nosti za pravilno\n"
+"nastavitev sistema X Windows."
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:722
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
 msgstr ""
+"�e bi raj�i uporabljali grafi�no prijavljanje v sistem, izberite \"Da\". "
+"Druga�e\n"
+"izberite \"Ne\"."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:726
+#, fuzzy
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Use hard drive optimizations: this option can improve hard disk "
-"performance\n"
-"    but is only for advanced users: some buggy chipsets can ruin your data, "
-"so\n"
-"    beware. Note that the kernel has a builtin blacklist of drives and\n"
-"    chipsets, but if you want to avoid bad surprises, leave this option "
-"unset.\n"
-"\n"
-"  - Choose security level: you can choose a security level for your\n"
-"    system. Please refer to the manual for complete information. Basically: "
-"if\n"
-"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
-"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
-"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
-"user\n"
-"    and then use \"su\". More generally, do not expect to use your machine\n"
-"    for anything but as a server. You have been warned.\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"
+"\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"
+"\n"
 "\n"
-"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
-"no\n"
-"    standard method to ask the BIOS about the amount of RAM present in your\n"
-"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
-"    correctly. If this is the case, you can specify the correct amount of "
-"RAM\n"
-"    here. Note that a difference of 2 or 4 MB is normal.\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"
-"  - Removable media automounting: if you would prefer not to manually\n"
-"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"    \"umount\", select this option. \n"
 "\n"
-"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
-"    select this option (Note: NumLock may or may not work under X)."
+"* 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"
+"\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"
+"\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."
 msgstr ""
+"Sedaj lahko izberete razli�ne mo�nosti za va� sistem.\n"
+"\n"
+"  - Uporabi optimizacijo za trde diske: ta mo�nost lahko izbolj�a delovanje\n"
+"    trdih diskov, vendar je samo za napredne uporabnike. Nekateri nabori\n"
+"    �ipov z napakami lahko uni�ijo va�e podatke, zato bodite pazljivi. "
+"Jedro\n"
+"    ima vgrajeno seznam pogonov in naborov, ki povzro�ajo probleme, vendar\n"
+"    �e se �elite izogniti neprijetnim presene�enjem, pustite mo�nost\n"
+"    neizbrano.\n"
+"\n"
+"  - Izberite varnostno stopnjo: izberete lahko varnostno stopnjo va�ega\n"
+"    sistema. Za popolne informacije poglejte v navodila. Osnovno: \n"
+"    �e neveste, izberite \"Srednja\".\n"
+"\n"
+"  - Natan�na velikost RAM-a. �e je potrebno: na�alost, je dana�njem svetu\n"
+"    PC ra�unalnikov ni standardne metode spra�evanja BIOS-a za velikost\n"
+"    prisotnega pomnilnika. Zato lahko GNU/Linux nepravilno prepozna "
+"velikost\n"
+"    pomnilnika. V tem primeru lahko tukaj podate pravilno velikost "
+"pomnilnika.\n"
+"    Razlika za 2 ali 4 MB je normalna.\n"
+"\n"
+"  - Samodejno priklapljanje odstranitvenih medijev: �e ne �elite ro�no\n"
+"    priklapljati odstranitvenih medijev (CD-ROM, diskete, Zip...) z uporabo\n"
+"    ukazov \"mount\" in \"umount\", izberite to mo�nost.\n"
+"\n"
+"  - Omogo�en NumLock pri zagonu: �e �elite NumLock omogo�iti pri zagonu,\n"
+"    izberite to mo�nost (Opozorilo: NumLock lahko pod sistemom X dela ali "
+"ne\n"
+"    dela)."
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:755
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -1755,316 +2738,372 @@ msgid ""
 "If you want to boot into another existing operating system, please read\n"
 "the additional instructions."
 msgstr ""
+"Sistem se bo ponovno zagnal.\n"
+"\n"
+"Po zagonu, se bo samodejno nalo�il va� nov sistem Linux Mandrake.\n"
+"�e �elite zagon drugega operacijskega sistema, preberite dodatna navodila."
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:40
 msgid "Choose your language"
-msgstr ""
+msgstr "Izberite jezik"
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:41
 msgid "Select installation class"
-msgstr ""
+msgstr "Izberite razred namestitve"
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:42
 msgid "Hard drive detection"
-msgstr ""
+msgstr "Prepoznavanje trdega diska"
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:43
 msgid "Configure mouse"
-msgstr ""
+msgstr "Nastavitev mi�ke"
 
-#: ../../install2.pm_.c:47
-#, fuzzy
+#: ../../install2.pm_.c:44
 msgid "Choose your keyboard"
-msgstr "Izberite kartico"
+msgstr "Izberite tipkovnico"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Drugo"
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:46
 msgid "Setup filesystems"
-msgstr ""
+msgstr "Nastavitev datote�nega sistema"
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:47
 msgid "Format partitions"
-msgstr ""
+msgstr "Formatiranje razdelkov"
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:48
 msgid "Choose packages to install"
-msgstr ""
+msgstr "Izberite pakete za namestitev"
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:49
 msgid "Install system"
-msgstr ""
+msgstr "Namestitev sistema"
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:50
 msgid "Configure networking"
-msgstr ""
+msgstr "Nastavitev omre�ja"
 
-#: ../../install2.pm_.c:54
-msgid "Cryptographic"
-msgstr ""
-
-#: ../../install2.pm_.c:55
-#, fuzzy
+#: ../../install2.pm_.c:52
 msgid "Configure timezone"
-msgstr "Nastavitev RAMDAC"
+msgstr "Nastavitev �asovne cone"
 
-#: ../../install2.pm_.c:56
-#, fuzzy
+#: ../../install2.pm_.c:53
 msgid "Configure services"
-msgstr "Nastavitev RAMDAC"
+msgstr "Nastavitev servisov"
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:54
 msgid "Configure printer"
-msgstr ""
+msgstr "Nastavitev tiskalnika"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:653
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
-msgstr ""
+msgstr "Nastavitev gesla root"
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:56
 msgid "Add a user"
-msgstr ""
+msgstr "Dodaj uporabnika"
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:58
 msgid "Create a bootdisk"
-msgstr ""
+msgstr "Ustvarjanje zagonske diskete"
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:60
 msgid "Install bootloader"
-msgstr ""
+msgstr "Namestitev zagonskega nalagalnika"
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:61
 msgid "Configure X"
-msgstr ""
+msgstr "Nastavitev X"
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:63
 msgid "Auto install floppy"
 msgstr ""
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:65
 msgid "Exit install"
+msgstr "Izhod iz namestitve"
+
+#: ../../install_any.pm_.c:584
+msgid "Error reading file $f"
+msgstr "Napaka pri branju datoteke $f"
+
+#: ../../install_gtk.pm_.c:426
+msgid "Please test the mouse"
+msgstr "Preizkusite mi�ko"
+
+#: ../../install_gtk.pm_.c:427
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "Preizkusite mi�ko"
+
+#: ../../install_gtk.pm_.c:428
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: ../../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 ""
 
-#: ../../install2.pm_.c:337
+#: ../../install_interactive.pm_.c:41
 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 ""
+"Potrebujete korenski razdelek.\n"
+"Ustvarite nov razdelek (ali izberite obstoje�ega).\n"
+"Nato izberite ``To�ka priklju�itve'' in jo nastavite na `/'"
 
-#: ../../install_any.pm_.c:334 ../../standalone/diskdrake_.c:61
-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 ""
+#: ../../install_interactive.pm_.c:46
+msgid "You must have a swap partition"
+msgstr "Potrebujete razdelek swap"
 
-#: ../../install_any.pm_.c:351
+#: ../../install_interactive.pm_.c:47
 msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
 msgstr ""
+"Nimate razdelka swap\n"
+"\n"
+"Naj vseeno nadaljujem?"
 
-#: ../../install_any.pm_.c:373
-msgid "Searching root partition."
-msgstr ""
+#: ../../install_interactive.pm_.c:68
+msgid "Use free space"
+msgstr "Uporabi razpolo�ljiv prostor"
 
-#: ../../install_any.pm_.c:402
-msgid "Information"
-msgstr ""
+#: ../../install_interactive.pm_.c:70
+msgid "Not enough free space to allocate new partitions"
+msgstr "Premalo razpolo�ljivega prostora za nov razdelek"
 
-#: ../../install_any.pm_.c:403
-#, c-format
-msgid "%s: This is not a root partition, please select another one."
-msgstr ""
+#: ../../install_interactive.pm_.c:78
+msgid "Use existing partition"
+msgstr "Uporabi obstoje� razdelek"
 
-#: ../../install_any.pm_.c:405
-msgid "No root partition found"
-msgstr ""
+#: ../../install_interactive.pm_.c:80
+msgid "There is no existing partition to use"
+msgstr "Na voljno ni nobenega obstoje�ega razdelka"
 
-#: ../../install_any.pm_.c:443
-msgid "Can't use broadcast with no NIS domain"
-msgstr ""
+#: ../../install_interactive.pm_.c:87
+msgid "Use the Windows partition for loopback"
+msgstr "Uporabi razdelek Oken (Windows) za loopback"
 
-#: ../../install_any.pm_.c:606
-msgid "Error reading file $f"
-msgstr ""
+#: ../../install_interactive.pm_.c:90
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Kateri razdelek �elite uporabiti za Linux4Win?"
 
-#: ../../install_steps.pm_.c:75
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
+#: ../../install_interactive.pm_.c:92
+msgid "Choose the sizes"
+msgstr "Izberite velikosti"
 
-#: ../../install_steps.pm_.c:176
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr ""
+#: ../../install_interactive.pm_.c:93
+msgid "Root partition size in MB: "
+msgstr "Velikost korenskega razdelka v MB: "
 
-#: ../../install_steps.pm_.c:323
-msgid ""
-"Some important packages didn't get installed properly.\n"
-"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
-msgstr ""
+#: ../../install_interactive.pm_.c:94
+msgid "Swap partition size in MB: "
+msgstr "Velikost razdelka swap v MB: "
 
-#: ../../install_steps.pm_.c:390
-#, c-format
-msgid "Welcome to %s"
-msgstr ""
+#: ../../install_interactive.pm_.c:102
+msgid "Use the free space on the Windows partition"
+msgstr "Uporabi razpolo�ljiv prostor v razdelku Oken (Windows)"
 
-#: ../../install_steps.pm_.c:742
-msgid "No floppy drive available"
-msgstr ""
+#: ../../install_interactive.pm_.c:105
+msgid "Which partition do you want to resize?"
+msgstr "Kateremu razdeleku �elite spremeniti velikost?"
 
-#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:129
-#: ../../install_steps_stdio.pm_.c:26
+#: ../../install_interactive.pm_.c:107
+msgid "Computing Windows filesystem bounds"
+msgstr "Ra�unanje mej datote�nega sistema Oken (Windows)"
+
+#: ../../install_interactive.pm_.c:109
 #, c-format
-msgid "Entering step `%s'\n"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
 msgstr ""
+"Spreminjalec velikosti FAT ne deluje na va�em razdelku, \n"
+"pri�lo je do naslednje napake: %s"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
+#: ../../install_interactive.pm_.c:112
+msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
+"Va� razdelek Oken (Windows) je preve� fragmentiran. Najprej po�enite "
+"``defrag''"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
+#: ../../install_interactive.pm_.c:113
 msgid ""
-"You don't have a swap partition\n"
+"WARNING!\n"
 "\n"
-"Continue anyway?"
+"DrakX will now resize your Windows partition. Be careful: this operation is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
 msgstr ""
+"OPOZORILO!\n"
+"\n"
+"DrakX bo sedaj spremenil velikost razdelku Oken (Windows). Bodite previdni:\n"
+"ta operacija je nevarna. �e tega �e niste opravili, kon�ajte namestitev in\n"
+"za�enite scandisk pod Okni (�e �elite po�enite �e defrag), nato ponovno\n"
+"za�enite namestitev. Naredite tudi varnostno kopijo podatkov.\n"
+"�e ste prepri�ani, pritisnite \"V redu\"."
 
-#: ../../install_steps_graphical.pm_.c:287
-#, fuzzy
-msgid "Choose the size you want to install"
-msgstr "Ali �elite zdaj zagnati ,X -probeonly`?"
-
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
+#: ../../install_interactive.pm_.c:122
+msgid "Which size do you want to keep for windows on"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:451
-#: ../../standalone/rpmdrake_.c:136
+#: ../../install_interactive.pm_.c:123
 #, c-format
-msgid "Version: %s\n"
-msgstr ""
+msgid "partition %s"
+msgstr "razdelek %s"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
+#: ../../install_interactive.pm_.c:129
 #, c-format
-msgid "Size: %d KB\n"
-msgstr ""
+msgid "FAT resizing failed: %s"
+msgstr "Spreminjanje velikosti FAT neuspe�no: %s"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
+#: ../../install_interactive.pm_.c:144
+msgid ""
+"There is no FAT partitions to resize or to use as loopback (or not enough "
+"space left)"
 msgstr ""
+"Ni ve� razdelkov FAT za spremembo velikosti ali uporabo kot loopback\n"
+"(ali premalo prostora)"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr ""
+#: ../../install_interactive.pm_.c:150
+msgid "Erase entire disk"
+msgstr "Brisanje celotnega diska"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr ""
+#: ../../install_interactive.pm_.c:150
+msgid "Remove Windows(TM)"
+msgstr "Odstranjevanje Oken(TM)"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr ""
+#: ../../install_interactive.pm_.c:153
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr "Imate ve� kot en trdi disk, na katerega �elite namestiti Linux?"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr ""
+#: ../../install_interactive.pm_.c:156
+#, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "VSI razdelki in podatki na disku %s bodo izgubljeni"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr ""
+#: ../../install_interactive.pm_.c:164
+msgid "Expert mode"
+msgstr "Napredni na�in"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr ""
+#: ../../install_interactive.pm_.c:164
+msgid "Use diskdrake"
+msgstr "Uporabi diskdrake"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr ""
+#: ../../install_interactive.pm_.c:168
+msgid "Use fdisk"
+msgstr "Uporabi fdisk"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
+#: ../../install_interactive.pm_.c:171
 #, c-format
-msgid "Installing package %s"
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
 msgstr ""
+"Sedej lahko ustvarjate/spreminjate razdelke na %s.\n"
+"Po kon�anem delu ne pozabite shraniti sprememb z ukazom `w'"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr ""
+#: ../../install_interactive.pm_.c:195
+#, fuzzy
+msgid "You don't have enough free space on your Windows partition"
+msgstr "Uporabi razpolo�ljiv prostor v razdelku Oken (Windows)"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr ""
+#: ../../install_interactive.pm_.c:210
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Razdelkov ni ve� mogo�e dodati"
 
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr ""
+#: ../../install_interactive.pm_.c:213
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "DrakX-ov �arovnik za razdelke je najdel naslednje re�itve:"
 
-#: ../../install_steps_gtk.pm_.c:158
-msgid "Please, choose one of the following classes of installation:"
+#: ../../install_interactive.pm_.c:218
+#, c-format
+msgid "Partitioning failed: %s"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:199
-msgid "You don't have any windows partitions!"
-msgstr ""
+#: ../../install_interactive.pm_.c:233
+msgid "Bringing up the network"
+msgstr "Vklop omre�ja"
 
-#: ../../install_steps_gtk.pm_.c:201
-msgid "You don't have any enough room for Lnx4win"
-msgstr ""
+#: ../../install_interactive.pm_.c:238
+msgid "Bringing down the network"
+msgstr "Izklop omre�ja"
 
-#: ../../install_steps_gtk.pm_.c:217
+#: ../../install_steps.pm_.c:74
 msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
+"Pri�lo je do napake, ki je sistem ne zna obdelati na lep na�in.\n"
+"Nadaljujte na svojo odgovornost."
 
-#: ../../install_steps_gtk.pm_.c:236
-msgid "Automatic resizing failed"
+#: ../../install_steps.pm_.c:196
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Podvojena to�ka priklopa %s"
+
+#: ../../install_steps.pm_.c:375
+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 ""
+"Nekateri pomembni paketi niso bili ustrezno name��eni.\n"
+"Verjetno imate povarjen CD medij ali pogon CD-ROM.\n"
+"Preverite medij na ra�unlaniku z Linux-om z uporabo ukaza \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_gtk.pm_.c:265
-#, fuzzy
-msgid "Which partition do you want to use to put Linux4Win?"
-msgstr "Kateri stre�nik potrebujete?"
+#: ../../install_steps.pm_.c:450
+#, c-format
+msgid "Welcome to %s"
+msgstr "Pozdravljeni v %s"
 
-#: ../../install_steps_gtk.pm_.c:284
-#, fuzzy
-msgid "Choose the sizes"
-msgstr "Izberite kartico"
+#: ../../install_steps.pm_.c:662
+msgid "No floppy drive available"
+msgstr "Na voljno ni nobenega disketnega pogona"
 
-#: ../../install_steps_gtk.pm_.c:286
-msgid "Root partition size in MB: "
+#: ../../install_steps_auto_install.pm_.c:43
+#: ../../install_steps_stdio.pm_.c:23
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Vstop v korak `%s'\n"
+
+#: ../../install_steps_gtk.pm_.c:136
+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 "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:288
-msgid "Swap partition size in MB: "
+#: ../../install_steps_gtk.pm_.c:150
+msgid "Please, choose one of the following classes of installation:"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:320
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:322
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2073,7 +3112,7 @@ msgid ""
 "a percentage of 100%% will install all selected packages."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2083,103 +3122,188 @@ msgid ""
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:230
 #, fuzzy
 msgid "Percentage of packages to install"
 msgstr "Izberite kartico"
 
-#: ../../install_steps_gtk.pm_.c:376
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "Izberite pakete, ki jih �elite namestiti"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "Informacije"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Namestiti"
+
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:429 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:430 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:431
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:450
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Razli�ica: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Velikost: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:382
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:386
+#, fuzzy
+msgid "The following packages are going to be installed"
+msgstr "Izberite kartico"
+
+#: ../../install_steps_gtk.pm_.c:387
+msgid "The following packages are going to be removed"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:477
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:480
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:493
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:496
-msgid "The following packages are going to be installed/removed"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:505
-msgid "You can't select/unselect this package"
-msgstr ""
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "Name��anje"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:469
 #, fuzzy
 msgid "Estimating"
 msgstr "Zaganjam X"
 
-#: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "Prosim po�akajte, "
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "Preostal �as "
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "Skupen �as"
+
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
+#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Preklic"
 
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "Priprava namestitbe"
+
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:565
-msgid ", %U MB"
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "Name��anje paketa %s"
+
+#: ../../install_steps_gtk.pm_.c:531
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+msgid "Accept"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:596
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2189,374 +3313,412 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_gtk.pm_.c:559 ../../install_steps_interactive.pm_.c:147
+#, fuzzy
+msgid "Refuse"
+msgstr "Spremeni velikost"
+
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "Naj vseeno nadaljujem?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps_interactive.pm_.c:38
 msgid "An error occurred"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:57
+#: ../../install_steps_interactive.pm_.c:54
+#, fuzzy
 msgid "Please, choose a language to use."
+msgstr "Ali �elite sedaj zagnati ,X -probeonly`?"
+
+#: ../../install_steps_interactive.pm_.c:70
+msgid "License agreement"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:72
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+"Introduction\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"
+"\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 Linux-Mandrake 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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:154
+#: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:73
+#: ../../install_steps_interactive.pm_.c:155
+#: ../../standalone/keyboarddrake_.c:22
 #, fuzzy
 msgid "Please, choose your keyboard layout."
 msgstr "Izberite kartico"
 
-#: ../../install_steps_interactive.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:166
 msgid "You can choose other languages that will be available after install"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:91
-msgid "Root Partition"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:92
-msgid "What is the root partition (/) of your system?"
+#: ../../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:520
+msgid "All"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
-#: ../../install_steps_interactive.pm_.c:140
+#: ../../install_steps_interactive.pm_.c:181
+#: ../../install_steps_interactive.pm_.c:227
 msgid "Install Class"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:181
 #, fuzzy
 msgid "Which installation class do you want?"
 msgstr "Kateri stre�nik potrebujete?"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Install/Upgrade"
-msgstr ""
+#: ../../install_steps_interactive.pm_.c:183
+#, fuzzy
+msgid "Install/Update"
+msgstr "Namestiti"
 
-#: ../../install_steps_interactive.pm_.c:102
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:183
+msgid "Is this an install or an update?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:110
-#, fuzzy
-msgid "Automated"
-msgstr "Prilagojeno"
+#: ../../install_steps_interactive.pm_.c:192
+msgid "Recommended"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:112
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:211
 #, fuzzy
 msgid "Customized"
 msgstr "Prilagojeno"
 
-#: ../../install_steps_interactive.pm_.c:113
-#: ../../install_steps_interactive.pm_.c:124
+#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:211
 msgid "Expert"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:122
+#: ../../install_steps_interactive.pm_.c:206
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"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?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:129
-msgid "Upgrade"
+#: ../../install_steps_interactive.pm_.c:216
+msgid "Update"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:135
-#, fuzzy
-msgid "Normal"
-msgstr "Obi�ajni DAC"
+#: ../../install_steps_interactive.pm_.c:222
+msgid "Workstation"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:136
+#: ../../install_steps_interactive.pm_.c:223
 msgid "Development"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:224
 #, fuzzy
 msgid "Server"
 msgstr "Izberite stre�nik"
 
-#: ../../install_steps_interactive.pm_.c:141
+#: ../../install_steps_interactive.pm_.c:228
 #, fuzzy
-msgid "Which usage is your system used for ?"
+msgid "What is your system used for?"
 msgstr "Kateri stre�nik potrebujete?"
 
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:24
 #, fuzzy
 msgid "Please, choose the type of your mouse."
-msgstr "Ali �elite zdaj zagnati ,X -probeonly`?"
+msgstr "Ali �elite sedaj zagnati ,X -probeonly`?"
 
-#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:251 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:161
+#: ../../install_steps_interactive.pm_.c:252
 #, fuzzy
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Kateri stre�nik potrebujete?"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:271
+msgid "Configuring PCMCIA cards..."
+msgstr "Nastavitev kartic PCMCIA..."
+
+#: ../../install_steps_interactive.pm_.c:271
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../install_steps_interactive.pm_.c:275
 #, fuzzy
 msgid "Configuring IDE"
 msgstr "Nastavitev zaslona"
 
-#: ../../install_steps_interactive.pm_.c:172
+#: ../../install_steps_interactive.pm_.c:275
 msgid "IDE"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:182
+#: ../../install_steps_interactive.pm_.c:288
+#, fuzzy
 msgid "no available partitions"
+msgstr "Zaganjam X"
+
+#: ../../install_steps_interactive.pm_.c:291
+msgid "Scanning partitions to find mount points"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:299
+#, fuzzy
+msgid "Choose the mount points"
+msgstr "Ali �elite sedaj zagnati ,X -probeonly`?"
+
+#: ../../install_steps_interactive.pm_.c:316
 #, c-format
-msgid "(%dMB)"
+msgid ""
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:191
-msgid "Please choose a partition to use as your root partition."
+#: ../../install_steps_interactive.pm_.c:329
+msgid ""
+"DiskDrake failed to read correctly the partition table.\n"
+"Continue at your own risk!"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
-msgid "Choose the mount points"
-msgstr ""
+#: ../../install_steps_interactive.pm_.c:337
+#, fuzzy
+msgid "Root Partition"
+msgstr "Zaganjam X"
 
-#: ../../install_steps_interactive.pm_.c:210
+#: ../../install_steps_interactive.pm_.c:338
+#, fuzzy
+msgid "What is the root partition (/) of your system?"
+msgstr "Kateri stre�nik potrebujete?"
+
+#: ../../install_steps_interactive.pm_.c:352
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:376
+#, fuzzy
 msgid "Choose the partitions you want to format"
-msgstr ""
+msgstr "Ali �elite zdaj zagnati ,X -probeonly`?"
 
-#: ../../install_steps_interactive.pm_.c:240
+#: ../../install_steps_interactive.pm_.c:386
 msgid "Check bad blocks?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:397
 #, fuzzy
 msgid "Formatting partitions"
 msgstr "Zaganjam X"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:401
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:404
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:410
 msgid "Looking for available packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:267
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Finding packages to upgrade"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:284
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:433
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Complete (%dMB)"
+msgstr "Obi�ajni DAC"
+
+#: ../../install_steps_interactive.pm_.c:449
+#, c-format
+msgid "Minimum (%dMB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:317
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy, c-format
+msgid "Recommended (%dMB)"
+msgstr "Obi�ajni DAC"
+
+#: ../../install_steps_interactive.pm_.c:455
+#, fuzzy
+msgid "Custom"
+msgstr "Prilagojeno"
+
+#: ../../install_steps_interactive.pm_.c:462
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Ali �elite zdaj zagnati ,X -probeonly`?"
+
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:612
 #, fuzzy
 msgid "Post-install configuration"
 msgstr "Nastavitev zaslona"
 
-#: ../../install_steps_interactive.pm_.c:410
-#, fuzzy
-msgid "Keep the current IP configuration"
-msgstr "Nastavitev zaslona"
-
-#: ../../install_steps_interactive.pm_.c:411
-msgid "Reconfigure network now"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:412
-msgid "Do not set up networking"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:415
-#: ../../install_steps_interactive.pm_.c:420
-#, fuzzy
-msgid "Network Configuration"
-msgstr "Nastavitev zaslona"
-
-#: ../../install_steps_interactive.pm_.c:416
-msgid "Local networking has already been configured. Do you want to:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:421
-msgid "Do you want to configure a local network for your system?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:427
-msgid "no network card found"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:449
-#, fuzzy
-msgid "Modem Configuration"
-msgstr "Nastavitev zaslona"
-
-#: ../../install_steps_interactive.pm_.c:450
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:462
-#: ../../install_steps_interactive.pm_.c:463
-#, c-format
-msgid "Configuring network device %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:464
-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 ""
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Automatic IP"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "IP address:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Netmask:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "(bootp/dhcp)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:492
-msgid "Configuring network"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:493
-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 ""
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "DNS server:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway device:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Gateway:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:497
-msgid "Host name:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:510
-msgid "Try to find a modem?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:521
-#, fuzzy
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Kateri stre�nik potrebujete?"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "Dialup options"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:528
-msgid "Connection name"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:529
-msgid "Phone number"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:530
-msgid "Login ID"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Authentication"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "CHAP"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "PAP"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Script-based"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:532
-msgid "Terminal-based"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid "Domain name"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:535
-#, fuzzy
-msgid "First DNS Server"
-msgstr "Izberite stre�nik"
-
-#: ../../install_steps_interactive.pm_.c:536
-#, fuzzy
-msgid "Second DNS Server"
-msgstr "Izberite stre�nik"
-
-#: ../../install_steps_interactive.pm_.c:549
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2595,91 +3757,96 @@ msgid ""
 "USA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:588
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:592
+#: ../../install_steps_interactive.pm_.c:679
 #, fuzzy
 msgid "Please choose the packages you want to install."
 msgstr "Izberite kartico"
 
-#: ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:691
 #, fuzzy
 msgid "Which is your timezone?"
 msgstr "Kateri stre�nik potrebujete?"
 
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:731
+#, fuzzy
+msgid "Which printing system do you want to use?"
+msgstr "Kateri stre�nik potrebujete?"
+
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:657
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:780
 #, fuzzy
 msgid "NIS Server"
 msgstr "Izberite stre�nik"
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -2687,62 +3854,80 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
+#: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:710
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:723
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:853
+msgid ""
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:869
 #, fuzzy
 msgid "First floppy drive"
 msgstr "Izberite stre�nik"
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:870
 #, fuzzy
 msgid "Second floppy drive"
 msgstr "Izberite stre�nik"
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "Preskok"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -2756,192 +3941,154 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:885
+#, fuzzy
 msgid "Sorry, no floppy drive available"
-msgstr ""
+msgstr "Izberite stre�nik"
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:888
+#, fuzzy
 msgid "Choose the floppy drive you want to use to make the bootdisk"
-msgstr ""
+msgstr "Ali �elite zdaj zagnati ,X -probeonly`?"
 
-#: ../../install_steps_interactive.pm_.c:772
-#, c-format
+#: ../../install_steps_interactive.pm_.c:894
+#, fuzzy, c-format
 msgid "Insert a floppy in drive %s"
-msgstr ""
+msgstr "Izberite stre�nik"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
-msgid "Installation of LILO failed. The following error occured:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:806
-#, fuzzy
-msgid "Do you want to use SILO?"
-msgstr "Ali �elite zdaj zagnati ,X -probeonly`?"
-
-#: ../../install_steps_interactive.pm_.c:817
-msgid "SILO main options"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:830
-msgid ""
-"Here are the following entries in SILO.\n"
-"You can add some more or change the existing ones."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:858
-msgid "Partition"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:878
-msgid "This label is already in use"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:892
-msgid "Installation of SILO failed. The following error occured:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:913
 #, fuzzy
 msgid "Do you want to use aboot?"
 msgstr "Ali �elite zdaj zagnati ,X -probeonly`?"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:930
-#, fuzzy
-msgid "Proxies configuration"
-msgstr "Nastavitev zaslona"
-
-#: ../../install_steps_interactive.pm_.c:931
-msgid "HTTP proxy"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:932
-msgid "FTP proxy"
+#: ../../install_steps_interactive.pm_.c:925
+msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Proxy should be http://..."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Proxy should be ftp://..."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:977
 msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 3.3 server is used because it works on more graphic cards.\n"
-"\n"
-"Do you want to try XFree 4.0?"
+"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."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1017
-msgid "Try to find PCI devices?"
+#: ../../install_steps_interactive.pm_.c:982
+msgid ""
+"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
+"give digits instead of normal letters (eg: pressing `p' gives `6')"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "Naj uporabim �e obstoje�o nastavitev X11?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -2954,141 +4101,17 @@ msgid ""
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1086
-#, fuzzy
-msgid "Shutting down"
-msgstr "Zaganjam X"
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, 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 ""
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr "Ne"
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr "Da"
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr ""
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr ""
 
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 
-#: ../../install_steps_newt.pm_.c:43
-#, c-format
-msgid ""
-"You can now partition your %s hard drive\n"
-"When you are done, don't forget to save using `w'"
-msgstr ""
-
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:273
 msgid "Please wait"
 msgstr ""
 
@@ -3098,7 +4121,7 @@ msgid "Ambiguity (%s), be more precise\n"
 msgstr ""
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
 msgstr ""
 
@@ -3112,462 +4135,967 @@ msgstr ""
 msgid "Your choice? (default %s) "
 msgstr ""
 
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr ""
 
-#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
 msgid "Czech"
 msgstr ""
 
-#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
 msgid "German"
 msgstr ""
 
-#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:106
 msgid "Dvorak"
 msgstr ""
 
-#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
 msgid "Spanish"
 msgstr ""
 
-#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
 msgid "Finnish"
 msgstr ""
 
-#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
 msgid "French"
 msgstr ""
 
-#: ../../keyboard.pm_.c:96 ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
 msgid "Norwegian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:97
+#: ../../keyboard.pm_.c:111
 msgid "Polish"
 msgstr ""
 
-#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
 msgid "Russian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
 msgid "UK keyboard"
 msgstr ""
 
-#: ../../keyboard.pm_.c:100 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
 msgid "US keyboard"
 msgstr ""
 
-#: ../../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:121
 msgid "Armenian (old)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:122
 msgid "Armenian (typewriter)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:123
 msgid "Armenian (phonetic)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:112
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
 msgid "Belgian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:129
 msgid "Bulgarian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:130
 msgid "Brazilian (ABNT-2)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:115
+#: ../../keyboard.pm_.c:131
 msgid "Belarusian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:132
 msgid "Swiss (German layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:133
 msgid "Swiss (French layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:136
 msgid "German (no dead keys)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:137
 msgid "Danish"
 msgstr ""
 
-#: ../../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:138
+msgid "Dvorak (US)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:139
+msgid "Dvorak (Norwegian)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:140
 msgid "Estonian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:144
 msgid "Georgian (\"Russian\" layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:145
 msgid "Georgian (\"Latin\" layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:146
 msgid "Greek"
 msgstr ""
 
-#: ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:147
 msgid "Hungarian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:148
 msgid "Croatian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:149
 msgid "Israeli"
 msgstr ""
 
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:150
 msgid "Israeli (Phonetic)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr ""
+
+#: ../../keyboard.pm_.c:152
 msgid "Icelandic"
 msgstr ""
 
-#: ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:153
 msgid "Italian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:154
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: ../../keyboard.pm_.c:155
 msgid "Latin American"
 msgstr ""
 
-#: ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:156
 msgid "Dutch"
 msgstr ""
 
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:157
 msgid "Lithuanian AZERTY (old)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:159
 msgid "Lithuanian AZERTY (new)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:160
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr ""
 
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:161
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr ""
 
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:163
 msgid "Polish (qwerty layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:164
 msgid "Polish (qwertz layout)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:165
 msgid "Portuguese"
 msgstr ""
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:166
 msgid "Canadian (Quebec)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:168
 msgid "Russian (Yawerty)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:169
 msgid "Swedish"
 msgstr ""
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:170
 msgid "Slovenian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:171
 msgid "Slovakian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:172
 msgid "Thai keyboard"
 msgstr ""
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:173
 msgid "Turkish (traditional \"F\" model)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:174
 msgid "Turkish (modern \"Q\" model)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:175
 msgid "Ukrainian"
 msgstr ""
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:178
 msgid "US keyboard (international)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:179
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr ""
+
+#: ../../keyboard.pm_.c:180
 msgid "Yugoslavian (latin layout)"
 msgstr ""
 
-# 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.
-#
-#: ../../lilo.pm_.c:176
-#, c-format
+#: ../../mouse.pm_.c:25
+msgid "Sun - Mouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr ""
+
+#: ../../mouse.pm_.c:32
+msgid "Logitech MouseMan+"
+msgstr ""
+
+#: ../../mouse.pm_.c:33 ../../mouse.pm_.c:51
+msgid "Microsoft IntelliMouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:34
+msgid "GlidePoint"
+msgstr ""
+
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:61
+msgid "Kensington Thinking Mouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:57
+msgid "Genius NetMouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:38
+msgid "Genius NetScroll"
+msgstr ""
+
+#: ../../mouse.pm_.c:43
+msgid "Generic"
+msgstr "Splo�no"
+
+#: ../../mouse.pm_.c:44
+#, fuzzy
+msgid "Wheel"
+msgstr "stopnja"
+
+#: ../../mouse.pm_.c:47
+msgid "serial"
+msgstr ""
+
+#: ../../mouse.pm_.c:49
+msgid "Generic 2 Button Mouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:50
+msgid "Generic 3 Button Mouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:52
+msgid "Logitech MouseMan"
+msgstr ""
+
+#: ../../mouse.pm_.c:53
+#, fuzzy
+msgid "Mouse Systems"
+msgstr "Tip mi�ke: %s\n"
+
+#: ../../mouse.pm_.c:55
+msgid "Logitech CC Series"
+msgstr ""
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr ""
+
+#: ../../mouse.pm_.c:58
+msgid "MM Series"
+msgstr ""
+
+#: ../../mouse.pm_.c:59
+msgid "MM HitTablet"
+msgstr ""
+
+#: ../../mouse.pm_.c:60
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr ""
+
+#: ../../mouse.pm_.c:64
+msgid "busmouse"
+msgstr ""
+
+#: ../../mouse.pm_.c:66
+msgid "2 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:67
+msgid "3 buttons"
+msgstr ""
+
+#: ../../mouse.pm_.c:70
+msgid "none"
+msgstr "ni�"
+
+#: ../../mouse.pm_.c:72
+msgid "No mouse"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:243
+msgid "Next ->"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:486
+msgid "Is this correct?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:93
+#, fuzzy
+msgid "Internet configuration"
+msgstr "Nastavitev zaslona"
+
+#: ../../netconnect.pm_.c:94
+#, fuzzy
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Xconfigurator bo zdaj zagnal X in preveril nastavitve."
+
+#: ../../netconnect.pm_.c:101
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Nastavitev RAMDAC"
+
+#: ../../netconnect.pm_.c:106
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Kateri frekven�ni �ip (ang. clockchip) imate?"
+
+#: ../../netconnect.pm_.c:107
+#, fuzzy
 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"
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Nastavitev zaslona"
+
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
+#, fuzzy
+msgid "ISDN Configuration"
+msgstr "Nastavitev zaslona"
+
+#: ../../netconnect.pm_.c:141
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
 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
-#
-#: ../../lilo.pm_.c:431
-msgid "Welcome to GRUB the operating system chooser!"
+#: ../../netconnect.pm_.c:158
+#, fuzzy
+msgid "Connection Configuration"
+msgstr "Nastavitev zaslona"
+
+#: ../../netconnect.pm_.c:159
+msgid "Please fill or check the field below"
 msgstr ""
 
-#: ../../lilo.pm_.c:432
-#, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
+#: ../../netconnect.pm_.c:161
+msgid "Card IRQ"
 msgstr ""
 
-#: ../../lilo.pm_.c:433
-msgid "Press enter to boot the selected OS, 'e' to edit the"
+#: ../../netconnect.pm_.c:162
+msgid "Card mem (DMA)"
 msgstr ""
 
-#: ../../lilo.pm_.c:434
-msgid "commands before booting, or 'c' for a command-line."
+#: ../../netconnect.pm_.c:163
+msgid "Card IO"
 msgstr ""
 
-#: ../../lilo.pm_.c:435
-#, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
+#: ../../netconnect.pm_.c:164
+msgid "Card IO_0"
 msgstr ""
 
-#: ../../lilo.pm_.c:439
-msgid "not enough room in /boot"
+#: ../../netconnect.pm_.c:165
+msgid "Card IO_1"
 msgstr ""
 
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:518
-msgid "Desktop"
+#: ../../netconnect.pm_.c:166
+msgid "Your personal phone number"
 msgstr ""
 
-#: ../../lilo.pm_.c:518
-msgid "Start Menu"
+#: ../../netconnect.pm_.c:168
+msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: ../../mouse.pm_.c:21
-msgid "Sun - Mouse"
+#: ../../netconnect.pm_.c:169
+msgid "Provider phone number"
 msgstr ""
 
-#: ../../mouse.pm_.c:23
-msgid "Apple ADB Mouse"
+#: ../../netconnect.pm_.c:170
+msgid "Provider dns 1"
 msgstr ""
 
-#: ../../mouse.pm_.c:24
-msgid "Apple ADB Mouse (2 Buttons)"
+#: ../../netconnect.pm_.c:171
+msgid "Provider dns 2"
 msgstr ""
 
-#: ../../mouse.pm_.c:25
-msgid "Apple ADB Mouse (3+ Buttons)"
+#: ../../netconnect.pm_.c:172
+msgid "Dialing mode"
 msgstr ""
 
-#: ../../mouse.pm_.c:26
-msgid "Apple USB Mouse"
+#: ../../netconnect.pm_.c:174
+msgid "Account Login (user name)"
 msgstr ""
 
-#: ../../mouse.pm_.c:27
-msgid "Apple USB Mouse (2 Buttons)"
+#: ../../netconnect.pm_.c:175
+msgid "Account Password"
 msgstr ""
 
-#: ../../mouse.pm_.c:28
-msgid "Apple USB Mouse (3+ Buttons)"
+#: ../../netconnect.pm_.c:176
+msgid "Confirm Password"
 msgstr ""
 
-#: ../../mouse.pm_.c:30
-msgid "Generic Mouse (PS/2)"
+#: ../../netconnect.pm_.c:208
+msgid "Europe"
 msgstr ""
 
-#: ../../mouse.pm_.c:31
-msgid "Logitech MouseMan/FirstMouse (ps/2)"
+#: ../../netconnect.pm_.c:208
+msgid "Europe (EDSS1)"
 msgstr ""
 
-#: ../../mouse.pm_.c:32
-msgid "Generic 3 Button Mouse (PS/2)"
+#: ../../netconnect.pm_.c:210
+#, fuzzy
+msgid "Rest of the world"
+msgstr "Preizkus nastavitev"
+
+#: ../../netconnect.pm_.c:210
+msgid "Rest of the world - no D-Channel (leased lines)"
 msgstr ""
 
-#: ../../mouse.pm_.c:33
-msgid "ALPS GlidePoint (PS/2)"
+#: ../../netconnect.pm_.c:214
+#, fuzzy
+msgid "Which protocol do you want to use ?"
+msgstr "Kateri stre�nik potrebujete?"
+
+#: ../../netconnect.pm_.c:224
+msgid "ISA / PCMCIA"
 msgstr ""
 
-#: ../../mouse.pm_.c:34
-msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
+#: ../../netconnect.pm_.c:226
+msgid "PCI"
 msgstr ""
 
-#: ../../mouse.pm_.c:35
-msgid "Kensington Thinking Mouse (PS/2)"
+#: ../../netconnect.pm_.c:228
+msgid "I don't know"
 msgstr ""
 
-#: ../../mouse.pm_.c:36
-msgid "ASCII MieMouse (PS/2)"
+#: ../../netconnect.pm_.c:233
+msgid "What kind of card do you have?"
 msgstr ""
 
-#: ../../mouse.pm_.c:37
-msgid "Genius NetMouse (PS/2)"
+#: ../../netconnect.pm_.c:239
+msgid "Continue"
 msgstr ""
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetMouse Pro (PS/2)"
+#: ../../netconnect.pm_.c:241
+msgid "Abort"
 msgstr ""
 
-#: ../../mouse.pm_.c:39
-msgid "Genius NetScroll (PS/2)"
+#: ../../netconnect.pm_.c:245
+msgid ""
+"\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
+"\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
 
-#: ../../mouse.pm_.c:40
-msgid "Microsoft IntelliMouse (PS/2)"
+#: ../../netconnect.pm_.c:257
+#, fuzzy
+msgid "Which is your ISDN card ?"
+msgstr "Kateri stre�nik potrebujete?"
+
+#: ../../netconnect.pm_.c:281
+msgid "I have found an ISDN Card:\n"
 msgstr ""
 
-#: ../../mouse.pm_.c:41
-msgid "ATI Bus Mouse"
+#: ../../netconnect.pm_.c:287
+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 ""
 
-#: ../../mouse.pm_.c:42
-msgid "Microsoft Bus Mouse"
+#: ../../netconnect.pm_.c:299
+msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 
-#: ../../mouse.pm_.c:43
-msgid "Logitech Bus Mouse"
+#: ../../netconnect.pm_.c:331
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
 
-#: ../../mouse.pm_.c:44
-msgid "USB Mouse"
+#: ../../netconnect.pm_.c:335 ../../standalone/drakgw_.c:222
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "Izberite kartico"
+
+#: ../../netconnect.pm_.c:336
+#, fuzzy
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Kateri stre�nik potrebujete?"
+
+#: ../../netconnect.pm_.c:351 ../../netconnect.pm_.c:623
+#: ../../netconnect.pm_.c:754 ../../standalone/drakgw_.c:217
+msgid "Network interface"
 msgstr ""
 
-#: ../../mouse.pm_.c:45
-msgid "USB Mouse (3 buttons or more)"
+#: ../../netconnect.pm_.c:352
+msgid ""
+"\n"
+"Do you agree?"
 msgstr ""
 
-#: ../../mouse.pm_.c:47
-msgid "No Mouse"
+#: ../../netconnect.pm_.c:352
+#, fuzzy
+msgid "I'm about to restart the network device:\n"
+msgstr "�elite preizkusiti nastavitev?"
+
+#: ../../netconnect.pm_.c:468
+#, fuzzy
+msgid "ADSL configuration"
+msgstr "Nastavitev zaslona"
+
+#: ../../netconnect.pm_.c:469
+#, fuzzy
+msgid "Do you want to start your connection at boot?"
+msgstr "Ali �elite zdaj zagnati ,X -probeonly`?"
+
+#: ../../netconnect.pm_.c:529
+msgid "Try to find a modem?"
 msgstr ""
 
-#: ../../mouse.pm_.c:48
-msgid "Microsoft Rev 2.1A or higher (serial)"
+#: ../../netconnect.pm_.c:539
+#, fuzzy
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Kateri stre�nik potrebujete?"
+
+#: ../../netconnect.pm_.c:544
+#, fuzzy
+msgid "Dialup options"
+msgstr "Izberite stre�nik"
+
+#: ../../netconnect.pm_.c:545
+#, fuzzy
+msgid "Connection name"
+msgstr "Nastavitev zaslona"
+
+#: ../../netconnect.pm_.c:546
+msgid "Phone number"
 msgstr ""
 
-#: ../../mouse.pm_.c:49
-msgid "Logitech CC Series (serial)"
+#: ../../netconnect.pm_.c:547
+#, fuzzy
+msgid "Login ID"
+msgstr "Nastavitev zaslona"
+
+#: ../../netconnect.pm_.c:549
+msgid "Authentication"
 msgstr ""
 
-#: ../../mouse.pm_.c:50
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+#: ../../netconnect.pm_.c:549
+msgid "PAP"
 msgstr ""
 
-#: ../../mouse.pm_.c:51
-msgid "ASCII MieMouse (serial)"
+#: ../../netconnect.pm_.c:549
+msgid "Script-based"
 msgstr ""
 
-#: ../../mouse.pm_.c:52
-msgid "Genius NetMouse (serial)"
+#: ../../netconnect.pm_.c:549
+msgid "Terminal-based"
 msgstr ""
 
-#: ../../mouse.pm_.c:53
-msgid "Microsoft IntelliMouse (serial)"
+#: ../../netconnect.pm_.c:550
+msgid "Domain name"
+msgstr ""
+
+#: ../../netconnect.pm_.c:552
+#, fuzzy
+msgid "First DNS Server"
+msgstr "Izberite stre�nik"
+
+#: ../../netconnect.pm_.c:553
+#, fuzzy
+msgid "Second DNS Server"
+msgstr "Izberite stre�nik"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid ""
+"\n"
+"You can connect to Internet or reconfigure your connection."
+msgstr "Nastavitev zaslona"
+
+#: ../../netconnect.pm_.c:582 ../../netconnect.pm_.c:586
+#, fuzzy
+msgid ""
+"\n"
+"You can reconfigure your connection."
+msgstr "Nastavitev RAMDAC"
+
+#: ../../netconnect.pm_.c:582
+#, fuzzy
+msgid "You are not currently connected to Internet."
+msgstr "Kateri frekven�ni �ip (ang. clockchip) imate?"
+
+#: ../../netconnect.pm_.c:586
+msgid ""
+"\n"
+"You can disconnect or reconfigure your connection."
 msgstr ""
 
-#: ../../mouse.pm_.c:54
-msgid "MM Series (serial)"
+#: ../../netconnect.pm_.c:586
+#, fuzzy
+msgid "You are currently connected to internet."
+msgstr "Kateri frekven�ni �ip (ang. clockchip) imate?"
+
+#: ../../netconnect.pm_.c:590
+#, fuzzy
+msgid "Connect to Internet"
+msgstr "Kateri frekven�ni �ip (ang. clockchip) imate?"
+
+#: ../../netconnect.pm_.c:592
+#, fuzzy
+msgid "Disconnect from Internet"
+msgstr "Kateri frekven�ni �ip (ang. clockchip) imate?"
+
+#: ../../netconnect.pm_.c:594
+#, fuzzy
+msgid "Configure network connection (LAN or Internet)"
+msgstr "Nastavitev RAMDAC"
+
+#: ../../netconnect.pm_.c:597
+#, fuzzy
+msgid "Internet connection & configuration"
+msgstr "Izberite stre�nik"
+
+#: ../../netconnect.pm_.c:624 ../../netconnect.pm_.c:755
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
 msgstr ""
 
-#: ../../mouse.pm_.c:55
-msgid "MM HitTablet (serial)"
+#: ../../netconnect.pm_.c:641
+#, fuzzy
+msgid "Configure a normal modem connection"
+msgstr "Nastavitev RAMDAC"
+
+#: ../../netconnect.pm_.c:661
+#, fuzzy
+msgid "Configure an ISDN connection"
+msgstr "Nastavitev RAMDAC"
+
+#: ../../netconnect.pm_.c:666
+msgid "Internal ISDN card"
 msgstr ""
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech Mouse (serial, old C7 type)"
+#: ../../netconnect.pm_.c:668
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Napredni na�in"
+
+#: ../../netconnect.pm_.c:671 ../../netconnect.pm_.c:705
+#: ../../netconnect.pm_.c:717 ../../netconnect.pm_.c:741
+#: ../../netconnect.pm_.c:786
+#, fuzzy
+msgid "Connect to the Internet"
+msgstr "Kateri frekven�ni �ip (ang. clockchip) imate?"
+
+#: ../../netconnect.pm_.c:672
+#, fuzzy
+msgid "What kind is your ISDN connection?"
+msgstr "Kateri stre�nik potrebujete?"
+
+#: ../../netconnect.pm_.c:691
+#, fuzzy
+msgid "Configure a DSL (or ADSL) connection"
+msgstr "Nastavitev RAMDAC"
+
+#: ../../netconnect.pm_.c:700
+#, fuzzy
+msgid "France"
+msgstr "Preklic"
+
+#: ../../netconnect.pm_.c:702
+msgid "Other countries"
 msgstr ""
 
-#: ../../mouse.pm_.c:57
-msgid "Logitech MouseMan/FirstMouse (serial)"
+#: ../../netconnect.pm_.c:706
+msgid "In which country are you located ?"
 msgstr ""
 
-#: ../../mouse.pm_.c:58
-msgid "Generic Mouse (serial)"
+#: ../../netconnect.pm_.c:712
+msgid "Alcatel modem"
 msgstr ""
 
-#: ../../mouse.pm_.c:59
-msgid "Microsoft compatible (serial)"
+#: ../../netconnect.pm_.c:714
+#, fuzzy
+msgid "ECI modem"
+msgstr "Napredni na�in"
+
+#: ../../netconnect.pm_.c:718
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
 msgstr ""
 
-#: ../../mouse.pm_.c:60
-msgid "Generic 3 Button Mouse (serial)"
+#: ../../netconnect.pm_.c:736
+msgid "use pppoe"
 msgstr ""
 
-#: ../../mouse.pm_.c:61
-msgid "Mouse Systems (serial)"
+#: ../../netconnect.pm_.c:738
+msgid "don't use pppoe"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:459
-msgid "Is this correct?"
+#: ../../netconnect.pm_.c:742
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, some connections only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+
+#: ../../netconnect.pm_.c:765
+#, fuzzy
+msgid "Configure a cable connection"
+msgstr "Nastavitev RAMDAC"
+
+#: ../../netconnect.pm_.c:787
+#, fuzzy
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Kateri stre�nik potrebujete?"
+
+#: ../../netconnect.pm_.c:800
+#, fuzzy
+msgid "Disable Internet Connection"
+msgstr "Nastavitev RAMDAC"
+
+#: ../../netconnect.pm_.c:811
+#, fuzzy
+msgid "Configure local network"
+msgstr "Nastavitev zaslona"
+
+#: ../../netconnect.pm_.c:815
+#, fuzzy
+msgid "Network configuration"
+msgstr "Nastavitev zaslona"
+
+#: ../../netconnect.pm_.c:816
+#, fuzzy
+msgid "Do you want to restart the network"
+msgstr "�elite preizkusiti nastavitev?"
+
+#: ../../netconnect.pm_.c:824
+#, fuzzy
+msgid "Disable networking"
+msgstr "Nastavitev omre�ja"
+
+#: ../../netconnect.pm_.c:834
+#, fuzzy
+msgid "Configure the Internet connection / Configure local Network"
+msgstr "Nastavitev zaslona"
+
+#: ../../netconnect.pm_.c:835
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+
+#: ../../netconnect.pm_.c:836
+#, fuzzy
+msgid "How do you want to connect to the Internet?"
+msgstr "Kateri frekven�ni �ip (ang. clockchip) imate?"
+
+#: ../../netconnect.pm_.c:858
+#, fuzzy
+msgid "Network Configuration"
+msgstr "Nastavitev zaslona"
+
+#: ../../netconnect.pm_.c:859
+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"
+msgstr ""
+
+#: ../../network.pm_.c:253
+msgid "no network card found"
+msgstr ""
+
+#: ../../network.pm_.c:273 ../../network.pm_.c:340
+#, fuzzy
+msgid "Configuring network"
+msgstr "Nastavitev zaslona"
+
+#: ../../network.pm_.c:274
+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 ""
+
+#: ../../network.pm_.c:278 ../../network.pm_.c:345
+msgid "Host name"
+msgstr ""
+
+#: ../../network.pm_.c:297
+msgid ""
+"WARNING: This device has been previously configured to connect to the "
+"Internet.\n"
+"Simply press OK to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+
+#: ../../network.pm_.c:302
+msgid ""
+"Please enter the IP configuration for this machine.\n"
+"Each item should be entered as an IP address in dotted-decimal\n"
+"notation (for example, 1.2.3.4)."
+msgstr ""
+
+#: ../../network.pm_.c:311 ../../network.pm_.c:312
+#, fuzzy, c-format
+msgid "Configuring network device %s"
+msgstr "Nastavitev RAMDAC"
+
+#: ../../network.pm_.c:314
+#, fuzzy
+msgid "Automatic IP"
+msgstr "Prilagojeno"
+
+#: ../../network.pm_.c:314
+msgid "IP address"
+msgstr ""
+
+#: ../../network.pm_.c:314
+msgid "Netmask"
+msgstr ""
+
+#: ../../network.pm_.c:315
+msgid "(bootp/dhcp)"
+msgstr ""
+
+#: ../../network.pm_.c:321 ../../printerdrake.pm_.c:98
+msgid "IP address should be in format 1.2.3.4"
+msgstr ""
+
+#: ../../network.pm_.c:341
+msgid ""
+"Please enter your host name.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''.\n"
+"You may also enter the IP address of the gateway if you have one"
+msgstr ""
+
+#: ../../network.pm_.c:346
+#, fuzzy
+msgid "DNS server"
+msgstr "Izberite stre�nik"
+
+#: ../../network.pm_.c:347
+msgid "Gateway"
+msgstr ""
+
+#: ../../network.pm_.c:348
+#, fuzzy
+msgid "Gateway device"
+msgstr "Zagonska naprava"
+
+#: ../../network.pm_.c:358
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Nastavitev zaslona"
+
+#: ../../network.pm_.c:359
+msgid "HTTP proxy"
 msgstr ""
 
-#: ../../partition_table.pm_.c:528
+#: ../../network.pm_.c:360
+msgid "FTP proxy"
+msgstr ""
+
+#: ../../network.pm_.c:366
+msgid "Proxy should be http://..."
+msgstr ""
+
+#: ../../network.pm_.c:367
+msgid "Proxy should be ftp://..."
+msgstr ""
+
+#: ../../partition_table.pm_.c:540
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:558
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions"
 msgstr ""
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:651
 #, c-format
 msgid "Error reading file %s"
 msgstr ""
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:658
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr ""
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:660
 msgid "Bad backup file"
 msgstr ""
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:681
 #, c-format
 msgid "Error writing to file %s"
 msgstr ""
@@ -3602,42 +5130,54 @@ msgstr ""
 msgid "maybe"
 msgstr ""
 
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
 msgid "i18n (important)"
 msgstr ""
 
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
 msgid "i18n (very nice)"
 msgstr ""
 
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
 msgid "i18n (nice)"
 msgstr ""
 
-#: ../../placeholder.pm_.c:5
-msgid "Show less"
+#: ../../printer.pm_.c:19
+msgid "Local printer"
 msgstr ""
 
-#: ../../placeholder.pm_.c:6
-msgid "Show more"
-msgstr ""
+#: ../../printer.pm_.c:20
+#, fuzzy
+msgid "Remote printer"
+msgstr "Odstrani vnos"
 
-#: ../../printer.pm_.c:244
-msgid "Local printer"
+#: ../../printer.pm_.c:21
+msgid "Remote CUPS server"
 msgstr ""
 
-#: ../../printer.pm_.c:245
-msgid "Remote lpd"
+#: ../../printer.pm_.c:22
+msgid "Remote lpd server"
 msgstr ""
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "Network printer (socket)"
+msgstr "Izberite stre�nik"
+
+#: ../../printer.pm_.c:24
 msgid "SMB/Windows 95/98/NT"
 msgstr ""
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:25
 msgid "NetWare"
 msgstr ""
 
+#: ../../printer.pm_.c:26 ../../printerdrake.pm_.c:154
+#: ../../printerdrake.pm_.c:156
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Izberite stre�nik"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr ""
@@ -3651,45 +5191,45 @@ msgstr ""
 msgid "A printer, model \"%s\", has been detected on "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:48
 msgid "Local Printer Device"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:49
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:51
 #, fuzzy
 msgid "Printer Device"
 msgstr "Izberite stre�nik"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:70
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:71
 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."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:74
 msgid "Remote hostname"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:75
 msgid "Remote queue"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:84
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:85
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -3698,29 +5238,29 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:90
 #, fuzzy
 msgid "SMB server host"
 msgstr "Izberite stre�nik"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:91
 #, fuzzy
 msgid "SMB server IP"
 msgstr "Izberite stre�nik"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:92
 msgid "Share name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:95
 msgid "Workgroup"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:120
 msgid "NetWare Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:121
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -3728,143 +5268,211 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:125
 #, fuzzy
 msgid "Printer Server"
 msgstr "Izberite stre�nik"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:126
 msgid "Print Queue Name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:138
+#, fuzzy
+msgid "Socket Printer Options"
+msgstr "Izberite stre�nik"
+
+#: ../../printerdrake.pm_.c:139
+msgid ""
+"To print to a socket printer, you need to provide the\n"
+"hostname of the printer and optionally the port number."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141
+#, fuzzy
+msgid "Printer Hostname"
+msgstr "Izberite stre�nik"
+
+#: ../../printerdrake.pm_.c:142
+#, fuzzy
+msgid "Port"
+msgstr "Formatiraj"
+
+#: ../../printerdrake.pm_.c:155
+msgid "You can specify directly the URI to access the printer with CUPS."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:188 ../../printerdrake.pm_.c:240
+msgid "What type of printer do you have?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:200 ../../printerdrake.pm_.c:307
+#, fuzzy
+msgid "Do you want to test printing?"
+msgstr "Xconfigurator bo zdaj zagnal X in preveril nastavitve."
+
+#: ../../printerdrake.pm_.c:203 ../../printerdrake.pm_.c:318
+msgid "Printing test page(s)..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:210 ../../printerdrake.pm_.c:326
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:330
+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?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:230
 msgid "Yes, print ASCII test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:231
 msgid "Yes, print PostScript test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:232
 msgid "Yes, print both test pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:239
 msgid "Configure Printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:272
 #, fuzzy
 msgid "Printer options"
 msgstr "Izberite stre�nik"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:273
 msgid "Paper Size"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:274
 msgid "Eject page after job?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:279
 msgid "Uniprint driver options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:280
 msgid "Color depth options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:282
 msgid "Print text as PostScript?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:283
 msgid "Reverse page order"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:285
 msgid "Fix stair-stepping text?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:288
 msgid "Number of pages per output pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:289
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:290
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:293
 msgid "Extra GhostScript options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:296
 msgid "Extra Text options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:198
+#: ../../printerdrake.pm_.c:346
 #, fuzzy
-msgid "Do you want to test printing?"
-msgstr "Xconfigurator bo zdaj zagnal X in preveril nastavitve."
+msgid "Printer"
+msgstr "Izberite stre�nik"
 
-#: ../../printerdrake.pm_.c:210
-msgid "Printing test page(s)..."
+#: ../../printerdrake.pm_.c:347
+msgid "Would you like to configure a printer?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:218
-#, c-format
+#: ../../printerdrake.pm_.c:350
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
+"Here are the following print queues.\n"
+"You can add some more or change the existing ones."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:222
-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?"
+#: ../../printerdrake.pm_.c:365
+#, fuzzy
+msgid "CUPS starting"
+msgstr "Zaganjam X"
+
+#: ../../printerdrake.pm_.c:365
+msgid "Reading CUPS drivers database..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:379 ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:411 ../../printerdrake.pm_.c:418
+msgid "Select Printer Connection"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:380 ../../printerdrake.pm_.c:412
+msgid "How is the printer connected?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:387
 #, fuzzy
-msgid "Printer"
+msgid "Select Remote Printer Connection"
 msgstr "Izberite stre�nik"
 
-#: ../../printerdrake.pm_.c:239
-msgid "Would you like to configure a printer?"
+#: ../../printerdrake.pm_.c:388
+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 ""
 
-#: ../../printerdrake.pm_.c:243
-msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:418
+msgid "Remove queue"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
-msgid "Select Printer Connection"
+#: ../../printerdrake.pm_.c:400
+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 ""
 
-#: ../../printerdrake.pm_.c:267
-msgid "How is the printer connected?"
+#: ../../printerdrake.pm_.c:404
+msgid "Name of printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:272
-msgid "Remove queue"
+#: ../../printerdrake.pm_.c:405
+#, fuzzy
+msgid "Description"
+msgstr "Izberite stre�nik"
+
+#: ../../printerdrake.pm_.c:406
+msgid "Location"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:273
+#: ../../printerdrake.pm_.c:419
 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"
@@ -3872,58 +5480,58 @@ msgid ""
 "connected?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:422
 msgid "Name of queue"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:423
 msgid "Spool directory"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:424
 #, fuzzy
 msgid "Printer Connection"
 msgstr "Izberite stre�nik"
 
-#: ../../raid.pm_.c:36
+#: ../../raid.pm_.c:32
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr ""
 
-#: ../../raid.pm_.c:106
+#: ../../raid.pm_.c:102
 msgid "Can't write file $file"
 msgstr ""
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed"
 msgstr ""
 
-#: ../../raid.pm_.c:131
+#: ../../raid.pm_.c:127
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr ""
 
-#: ../../raid.pm_.c:147
+#: ../../raid.pm_.c:143
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr ""
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr ""
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:16
 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 ""
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:18
 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:19
+#: ../../services.pm_.c:20
 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 "
@@ -3931,7 +5539,7 @@ msgid ""
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -3939,13 +5547,13 @@ msgid ""
 "and includes support for pop-up menus on the console."
 msgstr ""
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:26
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
 msgstr ""
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:28
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -3955,51 +5563,51 @@ msgid ""
 "all of the services it is responsible for."
 msgstr ""
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:32
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
 "You should leave this enabled for most machines."
 msgstr ""
 
-#: ../../services.pm_.c:34
+#: ../../services.pm_.c:35
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:37
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:39
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:41
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:43
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP networks.\n"
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:46
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:48
 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 "
@@ -4007,7 +5615,7 @@ msgid ""
 "it installed on machines that don't need it."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:51
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -4015,91 +5623,243 @@ msgid ""
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:54
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr ""
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:56
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:58
 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:60
+#: ../../services.pm_.c:61
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:63
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:65
 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:66
+#: ../../services.pm_.c:67
 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:68
+#: ../../services.pm_.c:69
 msgid "This startup script try to load your modules for your usb mouse."
 msgstr ""
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:70
 msgid "Starts and stops the X Font Server at boot time and shutdown."
 msgstr ""
 
-#: ../../services.pm_.c:92
+#: ../../services.pm_.c:99
 msgid "Choose which services should be automatically started at boot time"
 msgstr ""
 
-#: ../../silo.pm_.c:146
-#, c-format
+#: ../../standalone/diskdrake_.c:61
 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"
+"I can't read your partition table, it's too corrupted for me :(\n"
+"I'll try to go on blanking bad partitions"
 msgstr ""
 
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
 msgid "Configure LILO/GRUB"
 msgstr ""
 
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
 msgid "Create a boot floppy"
 msgstr ""
 
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
 #, fuzzy
 msgid "Format floppy"
 msgstr "Izberite stre�nik"
 
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
 #, fuzzy
 msgid "Choice"
 msgstr "Preklic"
 
+#: ../../standalone/drakboot_.c:59
+msgid "Installation of LILO failed. The following error occured:"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:103
+msgid "Internet Connection Sharing currently enabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:104
+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 ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "disable"
+msgstr "Tabela"
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:137
+msgid "dismiss"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126
+#, fuzzy
+msgid "reconfigure"
+msgstr "Nastavitev X"
+
+#: ../../standalone/drakgw_.c:122
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:123
+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 ""
+
+#: ../../standalone/drakgw_.c:126 ../../standalone/drakgw_.c:127
+#, fuzzy
+msgid "enable"
+msgstr "Tabela"
+
+#: ../../standalone/drakgw_.c:141
+msgid "Config file content could not be interpreted."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:151
+#, fuzzy
+msgid "Internet Connection Sharing"
+msgstr "Izberite stre�nik"
+
+#: ../../standalone/drakgw_.c:152
+msgid ""
+"Your computer can be configured to share its Internet connection.\n"
+"\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?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:177
+msgid "using module"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:210
+msgid "No network adapter on your system!"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:211
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:218
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your Local Area Network with that adapter?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:223
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:233
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:258
+msgid "Potential LAN address conflict found in current config of $_!\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:268
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "Nastavitev zaslona"
+
+#: ../../standalone/drakgw_.c:269
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:282
+#, fuzzy
+msgid "Configuring..."
+msgstr "Nastavitev zaslona"
+
+#: ../../standalone/drakgw_.c:306
+msgid "Could not install ipchains RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:456
+msgid "Could not install dhcp RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:480
+msgid "Could not install linuxconf RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:496
+msgid "Could not install bind RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:500
+msgid "Could not install caching-nameserver RPM with urpmi."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:512
+#, fuzzy
+msgid "Congratulations!"
+msgstr "Nastavitev zaslona"
+
+#: ../../standalone/drakgw_.c:513
+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/draksec_.c:28
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
@@ -4148,23 +5908,30 @@ msgstr ""
 msgid "Choose the tool you want to use"
 msgstr "Ali �elite zdaj zagnati ,X -probeonly`?"
 
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
+#: ../../standalone/livedrake_.c:23
+#, fuzzy
+msgid "Change Cd-Rom"
+msgstr "Spremeni lo�ljivost"
+
+#: ../../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 ""
 
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
+#: ../../standalone/livedrake_.c:34
+msgid "Unable to start live upgrade !!!\n"
 msgstr ""
 
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
 msgid "no serial_usb found\n"
 msgstr ""
 
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
 msgid "Emulate third button?"
 msgstr ""
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
 #, fuzzy
 msgid "Which serial port is your mouse connected to?"
 msgstr "Kateri stre�nik potrebujete?"
@@ -4378,6 +6145,570 @@ msgstr ""
 msgid "Finding leaves takes some time"
 msgstr ""
 
+# ../../share/compssUsers
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Information Management"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+#, fuzzy
+msgid "Internet Tools"
+msgstr "Nastavitev zaslona"
+
+# ../../share/compssUsers
+msgid "Internet"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Personnal Finance"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+#, fuzzy
+msgid "Office"
+msgstr "Preklic"
+
+# ../../share/compssUsers
+msgid "Databases clients and servers (mysql and postgresql)"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Ve�predstavnost"
+
+# ../../share/compssUsers
+msgid "Video players and editors"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file "
+"transfer tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# ../../share/compssUsers
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Ve�predstavnost"
+
+# ../../share/compssUsers
+msgid "KDE"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+msgid "Multimedia"
+msgstr "Ve�predstavnost"
+
+# ../../share/compssUsers
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Ve�predstavnost"
+
+#, fuzzy
+msgid "Gnome"
+msgstr "ni�"
+
+# ../../share/compssUsers
+msgid "Documentation"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Programs to manage your finance, such as gnucash"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Graphics Manipulation"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Games"
+msgstr ""
+
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Ve�predstavnost"
+
+# ../../share/compssUsers
+msgid "Communication facilities"
+msgstr ""
+
+# ../../share/compssUsers
+msgid "Databases"
+msgstr ""
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Izberite velikost, ki jo �elite namestiti"
+
+#~ msgid "Total size: "
+#~ msgstr "Celotna velikost: "
+
+#, fuzzy
+#~ msgid "Reconfigure local network"
+#~ msgstr "Nastavitev zaslona"
+
+#, fuzzy
+#~ msgid "Connect to Internet with a normal modem"
+#~ msgstr "Nastavitev zaslona"
+
+#, fuzzy
+#~ msgid "Connect to Internet using ISDN"
+#~ msgstr "Kateri frekven�ni �ip (ang. clockchip) imate?"
+
+#, fuzzy
+#~ msgid "Connect to Internet using DSL (or ADSL)"
+#~ msgstr "Kateri frekven�ni �ip (ang. clockchip) imate?"
+
+#, fuzzy
+#~ msgid "Connect to Internet using Cable"
+#~ msgstr "Kateri frekven�ni �ip (ang. clockchip) imate?"
+
+#, fuzzy
+#~ msgid "What do you wish to do?"
+#~ msgstr "kaj �elite narediti?"
+
+#~ msgid "Which partition type do you want?"
+#~ msgstr "Kateri tip razdelka �elite?"
+
+#, 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 already "
+#~ "installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Recommended: If you have never installed GNU/Linux before, choose this.\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"
+#~ msgstr ""
+#~ "Izberite \"Namestitev\", �e nimate name��ene �e nobene razli�ice\n"
+#~ "GNU/Linux-a ali �e �elite uporabljati ve� razli�nih distribucij.\n"
+#~ "\n"
+#~ "Izberite \"Re�evanje\", �e �elite re�iti prej�njo razli�ico Linux-a "
+#~ "Mandrake:\n"
+#~ "%s ali %s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Izberite:\n"
+#~ "\n"
+#~ " - Priporo�en: �e niste �e nikdar name��ali GNU/Linux-a, izberite to "
+#~ "mo�nost.\n"
+#~ "\n"
+#~ " - Prilagojen: �e ste dovolj seznanjeni z GNU/Linux-om, lahko izberete\n"
+#~ "   primaren namen uporabe va�ega sistema. Glejte spodaj za podrobnosti.\n"
+#~ "\n"
+#~ " - Napreden: Priporo�eno samo �e ste z GNU/Linux-om zelo dobro seznanjeni\n"
+#~ "   in �elite opraviti zelo prilagojeno namestitev. Tudi tukaj boste lahko\n"
+#~ "   izbrali primaren namen uporabe va�ega sistema.\n"
+#~ "   IZBERITE TO MO�NOST, �E RESNI�NO VESTE KAJ DELATE!\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ "- Ctrl-c  to create a new partition (when an empty partition is selected)\n"
+#~ "\n"
+#~ "- Ctrl-d  to delete a partition\n"
+#~ "\n"
+#~ "- Ctrl-m  to set the mount point\n"
+#~ msgstr ""
+#~ "Na tej to�ki lahko izberete, katere razdeleke boste uporabili za namestitev\n"
+#~ "sistema Linux-Mandrake, �e so �e definirani (iz prej�njih namestitev "
+#~ "GNU/Linux\n"
+#~ "ali z drugimi orodji za razdelke). V drugih primerih je potrebo na trdem "
+#~ "disku\n"
+#~ "definirati razdelke. S tem razdelite kapaciteto trdega diska v lo�ena "
+#~ "logi�na podro�ja.\n"
+#~ "\n"
+#~ "\n"
+#~ "�e morate ustvariti nove razdelke, uporabite za samodejno ustvarjanje "
+#~ "razdelkov\n"
+#~ "GNU/Linux \"Samodejno alociranje\". Trdi disk izberete s pritiskom na "
+#~ "\"hda\"\n"
+#~ "za prvi IDE disk, \"hdb\" za drugi ali \"sda\" za prvi SCSI disk itd.\n"
+#~ "\n"
+#~ "Dva pogosta razdelka sta: korenski razdelek (/), ki je za�etna to�ka\n"
+#~ "zgradbe imenika datote�nega sistema in /boot, ki vsebuje vse datoteke\n"
+#~ "potrebne za zagon operacijskega sistema, po vklopu ra�unalnika.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ker so u�inki tega koraka nepovratni, je lahko ustvarjanje razdelkov\n"
+#~ "za neizku�enega uporabnika nevarno in zastra�ujo�e. DiskDrake vam\n"
+#~ "bo pri tem koraku karseda olaj�al delo. Preden nadaljujete si vzemite\n"
+#~ "�as in poglejte dokumentacijo.\n"
+#~ "\n"
+#~ "\n"
+#~ "Do vsake mo�nosti lahko pridete z tipkami: med razdelki izbirate z\n"
+#~ "uporabo tipke Tab in pu��ic Navzgor/Navzdol. Ko izberete razdelek "
+#~ "pritisnite:\n"
+#~ "\n"
+#~ "- Ctrl-c za ustvarjanje novega razdelka (�e ste izbrali prazen razdelek)\n"
+#~ "\n"
+#~ "- Ctrl-d za brisanje razdelka\n"
+#~ "\n"
+#~ "- Ctrl-m za nastavitev to�ke priklopa\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."
+#~ msgstr ""
+#~ "Vsi, na novo ustvarjeni razdelki morajo biti pred uporabo formatirani\n"
+#~ "(formatiranje pomenu ustvarjanje datote�nega sistema). Na tej to�ki\n"
+#~ "lahko ponovno formatirate obstoje�e razdelke, tako da bodo podatki, ki\n"
+#~ "jih vsebujejo izbrisani. Opozorilo: obstoje�ih razdelkov vam ni potrebno\n"
+#~ "ponovno formatirati, posebej, �e vsebujejo datoteke ali podatke, ki jih "
+#~ "�elite obdr�ati. Ponavadi sta to razdelka /home in /usr/local."
+
+#~ 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."
+#~ msgstr ""
+#~ "Izbrani paketi se sedaj name��ajo. Ta operacija bo trajala nekaj\n"
+#~ "minut, razen �e ste izbrali nadgradnjo obstoje�ega sistema, v tem\n"
+#~ "primeru lahko prete�e ve� �asa celo preden se bo nadgradnja za�ela."
+
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "In case of a serial mouse, you will also have to tell DrakX\n"
+#~ "which serial port it is connected to."
+#~ msgstr ""
+#~ "�e DrakX ni na�el va�e mi�ke ali �e �elite preveriti izbiro, boste\n"
+#~ "sedaj spodaj videli seznam mi�k.\n"
+#~ "\n"
+#~ "\n"
+#~ "�e se strinjate z nastavitvami DrakX, pritisnite 'V redu'.\n"
+#~ "Druga�e lahko iz menija izberete mi�ko, ki se bolje ujema z va�o.\n"
+#~ "\n"
+#~ "\n"
+#~ "V primeru serijske mi�ke, boste morali nastaviti tudi serijska vrata\n"
+#~ "na katera je priklju�ena."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area\n"
+#~ "network (LAN) or a modem.\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"
+#~ "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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "Ta del je posve�en nastavitvi lokalnega omre�ja (LAN)\n"
+#~ "ali modema.\n"
+#~ "\n"
+#~ "Izberite \"Lokalno omre�je\" in DrakX bo posku�al\n"
+#~ "najti mre�no kartico v va�em ra�unalniku. PCI kartice\n"
+#~ "bi morale biti najdene in inicializirane samodejno.\n"
+#~ "�e imate kartico tipa ISA, samodejna prepoznava ne bo delovala, tako\n"
+#~ "da boste morali izbrati gonilnik iz seznama, ki se bo prikazal.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tako kot za SCSI krmilnike, lahko tudi tukaj prvi� prepustite iskanje\n"
+#~ "naprave gonilniku, druga�e pa morate gonilniku podati pravilne nastavitve,\n"
+#~ "ki jih lahko najdete s pomo�jo dokumentacije va�e strojne opreme.\n"
+#~ "\n"
+#~ "\n"
+#~ "�e name��ate sistem Linux-Mandrake na ra�unalnik, ki je del �e obstoje�ega\n"
+#~ "omre�ja, vam bo va� vzdr�evalec omre�ja posredoval vse potrebne\n"
+#~ "informacije (naslov IP, omre�na maska in ime ra�unalnika). �e doma\n"
+#~ "postavljate privatno omre�je samo za primer, izberite naslov sami.\n"
+#~ "\n"
+#~ "\n"
+#~ "Izberite \"Klicanje z modemom\" za nastavitev modemske povezave v\n"
+#~ "internet. DrakX bo posku�al najti va� modem, �e ne bo uspel, boste\n"
+#~ "morali nastaviti pravilna serijska vrata, na katerih imate priklju�en\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"
+#~ "\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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "GNU/Linux omogo�a uporabo mnogih tipov tiskalnikov. Vsak tip\n"
+#~ "zahteva razli�ne nastavitve. Upo�tevajte pa, da je prevzeto ime\n"
+#~ "za tiskalnik, ki ga uporablja sistem, 'lp'; tako da morate imeti\n"
+#~ "tiskalnik s tem imenom; lahko pa tiskalniku daste ve� imen, lo�enih z\n"
+#~ "znakom '|'. �e �elite imeti bolj smiselno ime za tiskalnik, ga dajte\n"
+#~ "na prvo mesto npr: \"Moj tiskalnik|lp\".\n"
+#~ "Tiskalnik, ki bo imel v imenu \"lp\" bo prevzet tiskalnik.\n"
+#~ "\n"
+#~ "\n"
+#~ "�e je tiskalnik fizi�no povezan z va�im ra�unalnikom izberite\n"
+#~ "\"Lokalen tiskalnik\". Nato boste morali izbrati primeren filter in\n"
+#~ "vrata, na katera je tiskalnik priklju�en.\n"
+#~ "\n"
+#~ "\n"
+#~ "�e �elite uporabljati tiskalnik, ki se nahaja na drugem ra�unalniku Unix,\n"
+#~ "morate izbrati \"Oddaljen lpd\". Za delovanje ni potrebno vnesti\n"
+#~ "uporabni�kega imena in gesla, vnesti morate samo ime tiskalni�ke vrste\n"
+#~ "(printer queue) na oddaljenem stre�niku.\n"
+#~ "\n"
+#~ "\n"
+#~ "�e �elite uporabljati tiskalnik SMB (tiskalnik, ki je priklju�en na "
+#~ "ra�unalnik\n"
+#~ "z operacijskim sistemom Okna 9x/NT), morate poznati njegovo SMB ime (to ni\n"
+#~ "njegovo TCP/IP ime) in verjetno �e njegov naslov IP. Za dostop pa boste\n"
+#~ "potrebovali �e uporabni�ko ime, geslo in delovno skupino. Enako velja za\n"
+#~ "tiskalnik priklju�en na Netware okolje, le da zanj ne potrebujete delovne\n"
+#~ "skupine."
+
+#~ 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."
+#~ msgstr ""
+#~ "Zelo priporo�ljivo je, da tukaj odgovorite z \"Da\". �e boste kasneje\n"
+#~ "name��ali Microsoft Okna, bodo Okna povozila zagonski sektor.\n"
+#~ "Razen, �e boste naredili zagonski disk kot predlagano, ne boste mogli ve�\n"
+#~ "zagnati sistema GNU/Linux."
+
+#~ msgid "Move your wheel!"
+#~ msgstr "Premaknite kolesce!"
+
+#~ msgid "Forget the changes?"
+#~ msgstr "Pozabi spremembe?"
+
+#, fuzzy
+#~ msgid "Cable connection"
+#~ msgstr "Izberite stre�nik"
+
+#~ msgid "Automatic resolutions"
+#~ msgstr "Samodejna lo�ljivost"
+
+#~ 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"
+#~ msgstr ""
+#~ "Za zaznavo mo�nih lo�ljivosti, bodo sedaj razli�ne preizku�ene.\n"
+#~ "Zaslon bo utripal...\n"
+#~ "�e �elite, ga lahko izklopite, po koncu boste sli�ali pisk"
+
+#~ 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?"
+#~ msgstr ""
+#~ "Mo�ne lo�ljivosti se lahko poi��ejo samodejno (npr: 800x600).\n"
+#~ "V�asih lahko pride do nepredvidene ustavitve sistema.\n"
+#~ "�elite poskusiti?"
+
+#~ msgid ""
+#~ "No valid modes found\n"
+#~ "Try with another video card or monitor"
+#~ msgstr ""
+#~ "Najden ni bil noben veljaven na�in\n"
+#~ "Poskusite z drugo grafi�no kartico ali monitorjem"
+
+#~ msgid "Automatical resolutions search"
+#~ msgstr "Samodejno iskanje lo�ljivosti"
+
+#~ msgid "nfs mount failed"
+#~ msgstr "nfs priklop neuspe�en"
+
+#, fuzzy
+#~ msgid "Configure LAN"
+#~ msgstr "Nastavitev zaslona"
+
+#, fuzzy
+#~ msgid "End configuration"
+#~ msgstr "Nastavitev zaslona"
+
+#, fuzzy
+#~ msgid "Local Printer Device (URI)"
+#~ msgstr "Izberite stre�nik"
+
+#, fuzzy
+#~ msgid "default"
+#~ msgstr "Uporabljam privzeto"
+
+#, fuzzy
+#~ msgid "Everything configured!"
+#~ msgstr "Nastavitev zaslona"
+
+#, fuzzy
+#~ msgid "Normal"
+#~ msgstr "Obi�ajni DAC"
+
+#, fuzzy
+#~ msgid "Modem Configuration"
+#~ msgstr "Nastavitev zaslona"
+
+#, fuzzy
+#~ msgid "Autologin - Choose default user"
+#~ msgstr "Izberite kartico"
+
+#, fuzzy
+#~ msgid "Shutting down"
+#~ msgstr "Zaganjam X"
+
 #, fuzzy
 #~ msgid "Do you want to use LILO?"
 #~ msgstr "Ali �elite zdaj zagnati ,X -probeonly`?"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index a1b39187b..764c374f0 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: 2000-10-06 21:29+0200\n"
+"POT-Creation-Date: 2000-10-09 15:58+0200\n"
 "PO-Revision-Date: 1999-08-09 16:39+0200\n"
 "Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
 "Language-Team: Serbian (cyrillic)\n"
@@ -476,7 +476,7 @@ msgstr "��� ����� �� ����������� �������?"
 msgid "LILO/grub Installation"
 msgstr "LILO/grub �����������"
 
-#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:725
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:732
 msgid "None"
 msgstr "�������"
 
@@ -512,15 +512,15 @@ msgstr "����� ���"
 msgid "Delay before booting default image"
 msgstr "����� ��� �������� default image-�"
 
-#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:753
-#: ../../install_steps_interactive.pm_.c:804 ../../netconnect.pm_.c:549
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:811 ../../netconnect.pm_.c:548
 #: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
 #: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "�������"
 
-#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:754
-#: ../../install_steps_interactive.pm_.c:805
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:812
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "������� (��������)"
@@ -543,14 +543,14 @@ msgid ""
 msgstr ""
 "������``���������� �������� ������ - ������'' �� ������������� ��� �������"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:763
-#: ../../install_steps_interactive.pm_.c:818
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "�������� ������"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:763
-#: ../../install_steps_interactive.pm_.c:818
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:825
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "������������� �������"
@@ -569,7 +569,7 @@ msgid "Add"
 msgstr "�����"
 
 #: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
-#: ../../install_steps_interactive.pm_.c:798 ../../netconnect.pm_.c:831
+#: ../../install_steps_interactive.pm_.c:805 ../../netconnect.pm_.c:830
 #: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "�������"
@@ -627,7 +627,7 @@ msgid "Default"
 msgstr "�������������"
 
 #: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
-#: ../../install_steps_interactive.pm_.c:751 ../../interactive.pm_.c:76
+#: ../../install_steps_interactive.pm_.c:758 ../../interactive.pm_.c:76
 #: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
 #: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
 #: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
@@ -663,13 +663,13 @@ msgid "Do you have any %s interfaces?"
 msgstr "����� �� ��� %s ����������?"
 
 #: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
-#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:466
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:465
 #: ../../printerdrake.pm_.c:233
 msgid "No"
 msgstr "��"
 
 #: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
-#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:464
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:463
 msgid "Yes"
 msgstr "��"
 
@@ -1360,9 +1360,7 @@ msgstr "����� ������� �������e %s �������j� ��� ������  �� ���� ���������"
 msgid "Choose the new size"
 msgstr "��������� ���� ��������"
 
-#: ../../diskdrake.pm_.c:609 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-#: ../../install_steps_interactive.pm_.c:511
+#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:518
 #: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
@@ -2824,7 +2822,7 @@ msgstr "���������� ����"
 msgid "Choose your keyboard"
 msgstr "������� ���������"
 
-#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:499
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:497
 msgid "Miscellaneous"
 msgstr "����� ������"
 
@@ -2860,8 +2858,8 @@ msgstr "������ �������"
 msgid "Configure printer"
 msgstr "������ �������"
 
-#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:751
-#: ../../install_steps_interactive.pm_.c:752
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:758
+#: ../../install_steps_interactive.pm_.c:759
 msgid "Set root password"
 msgstr "����� root �������"
 
@@ -2889,7 +2887,7 @@ msgstr "���� �����������a ������a "
 msgid "Exit install"
 msgstr "����� �� �����������"
 
-#: ../../install_any.pm_.c:583
+#: ../../install_any.pm_.c:584
 msgid "Error reading file $f"
 msgstr "������ ��� �������� ����� $f"
 
@@ -2926,11 +2924,11 @@ msgstr ""
 "�� ���, ��������� ��������� (��� �������� �� ���������).\n"
 "����� ��������� \"����� ���������\" � �������� �� `/'"
 
-#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:46
 msgid "You must have a swap partition"
 msgstr "������ ����� swap ���������"
 
-#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:47
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -3119,12 +3117,12 @@ msgstr ""
 "������, ��� ������ ���� �� �� ��������.\n"
 "��������� �� ��� �����!"
 
-#: ../../install_steps.pm_.c:197
+#: ../../install_steps.pm_.c:196
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "��������a ����� ��������� %s"
 
-#: ../../install_steps.pm_.c:376
+#: ../../install_steps.pm_.c:375
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -3136,12 +3134,12 @@ msgstr ""
 "��������e cdrom �� ������������ ����j����� ������e�e \"rpm -qpl "
 "Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:450
 #, c-format
 msgid "Welcome to %s"
 msgstr "�������� �  %s"
 
-#: ../../install_steps.pm_.c:663
+#: ../../install_steps.pm_.c:662
 msgid "No floppy drive available"
 msgstr "������������� �������� ������"
 
@@ -3151,80 +3149,6 @@ msgstr "������������� �������� ������"
 msgid "Entering step `%s'\n"
 msgstr "�������� ����� `%s'\n"
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "��������� �������� ���������� �� �����������"
-
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "������ ��������: "
-
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:353
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "�������: %s\n"
-
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:354
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "��������: %d KB\n"
-
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:260
-msgid "Choose the packages you want to install"
-msgstr "������� ������ �� �����������"
-
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:263
-msgid "Info"
-msgstr "����"
-
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:268
-#: ../../install_steps_interactive.pm_.c:216 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "����������"
-
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:466
-#: ../../install_steps_interactive.pm_.c:587
-msgid "Installing"
-msgstr "����������"
-
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:472
-msgid "Please wait, "
-msgstr "����� ���������"
-
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:474
-msgid "Time remaining "
-msgstr "��������� �����"
-
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:475
-msgid "Total time "
-msgstr "������ �����"
-
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:484
-#: ../../install_steps_interactive.pm_.c:587
-msgid "Preparing installation"
-msgstr "��������� �����������"
-
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:500
-#, c-format
-msgid "Installing package %s"
-msgstr "���������� ����� %s"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:569
-#: ../../install_steps_gtk.pm_.c:573
-msgid "Go on anyway?"
-msgstr "�������� ��������� ���� ?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:569
-msgid "There was an error ordering packages:"
-msgstr "������ � ����� ������:"
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:992
-msgid "Use existing configuration for X11?"
-msgstr "�� �� �� �������� ��������� ������������� �� X11 ?"
-
 #: ../../install_steps_gtk.pm_.c:136
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
@@ -3286,6 +3210,19 @@ msgstr "���� ���� �� �� ���������� ������ � ������e� ������."
 msgid "Percentage of packages to install"
 msgstr "�������� �����a �� �����������"
 
+#: ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr "������� ������ �� �����������"
+
+#: ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr "����"
+
+#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "����������"
+
 #: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "���������e  ����������"
@@ -3311,6 +3248,16 @@ msgstr "��� �����"
 msgid "Name: %s\n"
 msgstr "���:  %s\n"
 
+#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "�������: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "��������: %d KB\n"
+
 #: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
@@ -3358,10 +3305,26 @@ msgstr ""
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "�� ������ ������������� ���j �����.�� ���� ���� a�������"
 
+#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:594
+msgid "Installing"
+msgstr "����������"
+
 #: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "����������"
 
+#: ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr "����� ���������"
+
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr "��������� �����"
+
+#: ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr "������ �����"
+
 #: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
 #: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
 #: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
@@ -3369,11 +3332,20 @@ msgstr "����������"
 msgid "Cancel"
 msgstr "��������"
 
+#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:594
+msgid "Preparing installation"
+msgstr "��������� �����������"
+
 #: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d ������"
 
+#: ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr "���������� ����� %s"
+
 #: ../../install_steps_gtk.pm_.c:531
 msgid ""
 "\n"
@@ -3428,6 +3400,14 @@ msgstr ""
 msgid "Refuse"
 msgstr "������"
 
+#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr "�������� ��������� ���� ?"
+
+#: ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr "������ � ����� ������:"
+
 #: ../../install_steps_gtk.pm_.c:573
 msgid "There was an error installing packages:"
 msgstr "������ ��� ���������j� �����a:"
@@ -3580,7 +3560,7 @@ msgid "You can choose other languages that will be available after install"
 msgstr "������ �������� ����� j���� ��j� �� ���� �������� ����� ���������je "
 
 #: ../../install_steps_interactive.pm_.c:173
-#: ../../install_steps_interactive.pm_.c:513
+#: ../../install_steps_interactive.pm_.c:520
 msgid "All"
 msgstr "��e"
 
@@ -3763,38 +3743,38 @@ msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr "�a� ������ ���� ������� ����� �� ���������j� ��� a�����a�e (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:453
+#: ../../install_steps_interactive.pm_.c:449
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "��������a (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:453
+#: ../../install_steps_interactive.pm_.c:449
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "��������a (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:453
+#: ../../install_steps_interactive.pm_.c:449
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "����������� (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:459
+#: ../../install_steps_interactive.pm_.c:455
 msgid "Custom"
 msgstr "����� �� �e��"
 
-#: ../../install_steps_interactive.pm_.c:466
+#: ../../install_steps_interactive.pm_.c:462
 msgid "Select the size you want to install"
 msgstr "��������� ��������  ����������e"
 
-#: ../../install_steps_interactive.pm_.c:501
+#: ../../install_steps_interactive.pm_.c:508
 msgid "Package Group Selection"
 msgstr "������ ����� ������"
 
-#: ../../install_steps_interactive.pm_.c:514
+#: ../../install_steps_interactive.pm_.c:521
 msgid "Individual package selection"
 msgstr "��j����a��� ���a�� �����a"
 
-#: ../../install_steps_interactive.pm_.c:563
+#: ../../install_steps_interactive.pm_.c:570
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -3805,12 +3785,12 @@ msgstr ""
 "��� ��� �������j�  ���� ���� CD-��� , ���������j�e �x, � ���� �������� ��  "
 "Ok."
 
-#: ../../install_steps_interactive.pm_.c:568
+#: ../../install_steps_interactive.pm_.c:575
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom ���a��� ��� \"%s"
 
-#: ../../install_steps_interactive.pm_.c:596
+#: ../../install_steps_interactive.pm_.c:603
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -3818,11 +3798,11 @@ msgstr ""
 "���������� ������ %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:605
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Post-install configuration"
 msgstr "���������������� ������������a"
 
-#: ../../install_steps_interactive.pm_.c:630
+#: ../../install_steps_interactive.pm_.c:637
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3878,92 +3858,92 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:661
+#: ../../install_steps_interactive.pm_.c:668
 msgid "Choose a mirror from which to get the packages"
 msgstr "��������� mirror �� ��� ���� ������� ������"
 
-#: ../../install_steps_interactive.pm_.c:669
+#: ../../install_steps_interactive.pm_.c:676
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "������������� mirror �� ����� ������� ������"
 
-#: ../../install_steps_interactive.pm_.c:672
+#: ../../install_steps_interactive.pm_.c:679
 msgid "Please choose the packages you want to install."
 msgstr "��������� ������ �� �����������"
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Which is your timezone?"
 msgstr "��j� j� �a�� ��������� ���a ?"
 
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Is your hardware clock set to GMT?"
 msgstr "�� �� �� ��� ��������� (BIOS) �������� ������� �� GMT ?"
 
-#: ../../install_steps_interactive.pm_.c:724
+#: ../../install_steps_interactive.pm_.c:731
 msgid "Which printing system do you want to use?"
 msgstr "���� ������ �� �����a�� ������ �� ��������e ?"
 
-#: ../../install_steps_interactive.pm_.c:751
+#: ../../install_steps_interactive.pm_.c:758
 msgid "No password"
 msgstr "��� �������"
 
-#: ../../install_steps_interactive.pm_.c:756
+#: ../../install_steps_interactive.pm_.c:763
 msgid "Use shadow file"
 msgstr "������� shadow ����"
 
-#: ../../install_steps_interactive.pm_.c:756
+#: ../../install_steps_interactive.pm_.c:763
 msgid "shadow"
 msgstr "����a"
 
-#: ../../install_steps_interactive.pm_.c:757
+#: ../../install_steps_interactive.pm_.c:764
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:757
+#: ../../install_steps_interactive.pm_.c:764
 msgid "Use MD5 passwords"
 msgstr "�������  MD5 �������"
 
-#: ../../install_steps_interactive.pm_.c:759
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Use NIS"
 msgstr "������� NIS"
 
-#: ../../install_steps_interactive.pm_.c:759
+#: ../../install_steps_interactive.pm_.c:766
 msgid "yellow pages"
 msgstr "���� ��������"
 
-#: ../../install_steps_interactive.pm_.c:765
+#: ../../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "��� ������� j� �����e j���������a (����� �a ��� ��� %d �������)"
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:779
 msgid "Authentification NIS"
 msgstr "��������������� NIS"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Domain"
 msgstr "NIS �����"
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:780
 msgid "NIS Server"
 msgstr "NIS ������"
 
-#: ../../install_steps_interactive.pm_.c:798
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "�������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:798
+#: ../../install_steps_interactive.pm_.c:805
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "����� ���������"
 
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s ��� �������)"
 
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:806
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3973,48 +3953,48 @@ msgstr ""
 "����� ���������\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:801
+#: ../../install_steps_interactive.pm_.c:808
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "����� ���"
 
-#: ../../install_steps_interactive.pm_.c:802 ../../printerdrake.pm_.c:93
+#: ../../install_steps_interactive.pm_.c:809 ../../printerdrake.pm_.c:93
 #: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "���������� ���"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:814
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:809
+#: ../../install_steps_interactive.pm_.c:816
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "����a"
 
-#: ../../install_steps_interactive.pm_.c:819
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "��� ������� �� ������� ������"
 
-#: ../../install_steps_interactive.pm_.c:820
+#: ../../install_steps_interactive.pm_.c:827
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "�������� ���������� ���"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "���������� ��� ���� �������� ���� ���� �����, �������, `-' � `_'"
 
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:829
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "��� ���������� ��� ��� �������"
 
-#: ../../install_steps_interactive.pm_.c:846
+#: ../../install_steps_interactive.pm_.c:853
 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 "
@@ -4040,19 +4020,19 @@ msgstr ""
 "������� ������ �� �������� ������� ������� �� ��� ������������� ������� � "
 "����� � ���������� \"��\"."
 
-#: ../../install_steps_interactive.pm_.c:862
+#: ../../install_steps_interactive.pm_.c:869
 msgid "First floppy drive"
 msgstr "���� ����� ��e��j "
 
-#: ../../install_steps_interactive.pm_.c:863
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Second floppy drive"
 msgstr "����� ����� ��e��j"
 
-#: ../../install_steps_interactive.pm_.c:864
+#: ../../install_steps_interactive.pm_.c:871
 msgid "Skip"
 msgstr "��������"
 
-#: ../../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:876
 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 "
@@ -4073,33 +4053,33 @@ msgstr ""
 "'������ �� ���������', ��� �������� �������� � ������� ���� ��������.\n"
 "�� �� ����� �� �������� ������� ������� �� ��� ������?"
 
-#: ../../install_steps_interactive.pm_.c:878
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Sorry, no floppy drive available"
 msgstr "�� ������, ���� ������e"
 
-#: ../../install_steps_interactive.pm_.c:881
+#: ../../install_steps_interactive.pm_.c:888
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 "���������� �������� ������ ���� ���� ���������  �� �������� ������ �������"
 
-#: ../../install_steps_interactive.pm_.c:887
+#: ../../install_steps_interactive.pm_.c:894
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "������� ������ ������� � ������ %s"
 
-#: ../../install_steps_interactive.pm_.c:890
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Creating bootdisk"
 msgstr "������� ������� ����..."
 
-#: ../../install_steps_interactive.pm_.c:897
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Preparing bootloader"
 msgstr "��������� �������..."
 
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:913
 msgid "Do you want to use aboot?"
 msgstr "�� �� ������ �� ��������� aboot ?"
 
-#: ../../install_steps_interactive.pm_.c:909
+#: ../../install_steps_interactive.pm_.c:916
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -4107,80 +4087,80 @@ msgstr ""
 "��e��� ��� ���������j� aboot-a, \n"
 "�� �� �a ������ �� ���������� ��� ��� �� ���� �����e�� ���� �������je?"
 
-#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:925
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "����������� �������a ��������. ������ ��:"
 
-#: ../../install_steps_interactive.pm_.c:932 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:939 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "�������� ��� K�����a"
 
-#: ../../install_steps_interactive.pm_.c:933 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "�����"
 
-#: ../../install_steps_interactive.pm_.c:934 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "����"
 
-#: ../../install_steps_interactive.pm_.c:935 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:942 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:936 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:943 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:937 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:944 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "����������"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Miscellaneous questions"
 msgstr "����a ������"
 
-#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:959
 msgid "(may cause data corruption)"
 msgstr "(���� ���������� ������)"
 
-#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:959
 msgid "Use hard drive optimisations?"
 msgstr "��������� ���� ���� ������������ ?"
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:960 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "��������� ���������� ����"
 
-#: ../../install_steps_interactive.pm_.c:954
+#: ../../install_steps_interactive.pm_.c:961
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "�������� �������� RAM ��� �� �������� (����������� �� %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:956
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Removable media automounting"
 msgstr "������������� ���������� ������"
 
-#: ../../install_steps_interactive.pm_.c:958
+#: ../../install_steps_interactive.pm_.c:965
 msgid "Clean /tmp at each boot"
 msgstr "������ /tmp ��� ������ �����a��"
 
-#: ../../install_steps_interactive.pm_.c:961
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Enable multi profiles"
 msgstr "������� �����-������� "
 
-#: ../../install_steps_interactive.pm_.c:963
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Enable num lock at startup"
 msgstr "��������� Num Lock ������ ��� ��������"
 
-#: ../../install_steps_interactive.pm_.c:966
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Give the ram size in MB"
 msgstr "������� �������� RAM-� � Mb"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Can't use supermount in high security level"
 msgstr "��j� ������ ���������� supermount ���  '������' ����������� �����"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:977
 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"
@@ -4196,7 +4176,7 @@ msgstr ""
 "���������.\n"
 "��������� ��e."
 
-#: ../../install_steps_interactive.pm_.c:975
+#: ../../install_steps_interactive.pm_.c:982
 msgid ""
 "Be carefull, having numlock enabled causes a lot of keystrokes to\n"
 "give digits instead of normal letters (eg: pressing `p' gives `6')"
@@ -4204,22 +4184,26 @@ msgstr ""
 "������ �a�����, ������� �������� numlock ��  ���� ������� �� ���a �� ����a\n"
 "������� ��j� ���je�� ������ ����a (���: ��������� �� `p' ����j��� `6')"
 
-#: ../../install_steps_interactive.pm_.c:1021
+#: ../../install_steps_interactive.pm_.c:999
+msgid "Use existing configuration for X11?"
+msgstr "�� �� �� �������� ��������� ������������� �� X11 ?"
+
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 "�a �� ������ �� �������� ���������������� ����� �� ���������j� ������� ?"
 
-#: ../../install_steps_interactive.pm_.c:1023
+#: ../../install_steps_interactive.pm_.c:1030
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "������� ������ ������� � ������ %s"
 
-#: ../../install_steps_interactive.pm_.c:1038
-#: ../../install_steps_interactive.pm_.c:1068
+#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1075
 msgid "Creating auto install floppy"
 msgstr "������� ���� ������������ �����"
 
-#: ../../install_steps_interactive.pm_.c:1093
+#: ../../install_steps_interactive.pm_.c:1100
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -4229,7 +4213,7 @@ msgstr ""
 "\n"
 "�� �� ������� ������ �� �������� ?"
 
-#: ../../install_steps_interactive.pm_.c:1102
+#: ../../install_steps_interactive.pm_.c:1109
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -4650,25 +4634,24 @@ msgid "Testing your connection..."
 msgstr "������ �������� �����������j�"
 
 #: ../../netconnect.pm_.c:106
-msgid ""
-"The system is now connected to Internet! Congratulation.\n"
-"Feel free to launch draknet at any time to setup your connection.\n"
-msgstr ""
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "����� ����������� �� ��������"
 
-#: ../../netconnect.pm_.c:108
+#: ../../netconnect.pm_.c:107
 #, fuzzy
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
 msgstr "�������j �� �������� / ������ ������� �����"
 
-#: ../../netconnect.pm_.c:142 ../../netconnect.pm_.c:214
-#: ../../netconnect.pm_.c:233 ../../netconnect.pm_.c:245
-#: ../../netconnect.pm_.c:257
+#: ../../netconnect.pm_.c:141 ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:232 ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:256
 msgid "ISDN Configuration"
 msgstr "ISDN ������������a"
 
-#: ../../netconnect.pm_.c:142
+#: ../../netconnect.pm_.c:141
 msgid ""
 "Select your provider.\n"
 " If it's not in the list, choose Unlisted"
@@ -4676,115 +4659,115 @@ msgstr ""
 "��������� ���� �����j�e�a.\n"
 " ������� ��j� �� �����, ��������� Unlisted"
 
-#: ../../netconnect.pm_.c:159
+#: ../../netconnect.pm_.c:158
 msgid "Connection Configuration"
 msgstr "������������� �������� �������je"
 
-#: ../../netconnect.pm_.c:160
+#: ../../netconnect.pm_.c:159
 msgid "Please fill or check the field below"
 msgstr "����� ��� �� �������� ��� ���a���� ���� �����"
 
-#: ../../netconnect.pm_.c:162
+#: ../../netconnect.pm_.c:161
 msgid "Card IRQ"
 msgstr "IRQ ������e"
 
-#: ../../netconnect.pm_.c:163
+#: ../../netconnect.pm_.c:162
 msgid "Card mem (DMA)"
 msgstr "(DMA) ������e"
 
-#: ../../netconnect.pm_.c:164
+#: ../../netconnect.pm_.c:163
 msgid "Card IO"
 msgstr " IO ������e"
 
-#: ../../netconnect.pm_.c:165
+#: ../../netconnect.pm_.c:164
 msgid "Card IO_0"
 msgstr " IO_0 ������e"
 
-#: ../../netconnect.pm_.c:166
+#: ../../netconnect.pm_.c:165
 msgid "Card IO_1"
 msgstr "IO_1 ������e"
 
-#: ../../netconnect.pm_.c:167
+#: ../../netconnect.pm_.c:166
 msgid "Your personal phone number"
 msgstr "�a� ����� ���j �������a"
 
-#: ../../netconnect.pm_.c:169
+#: ../../netconnect.pm_.c:168
 msgid "Provider name (ex provider.net)"
 msgstr "��� �����j���� (���. provider.net)"
 
-#: ../../netconnect.pm_.c:170
+#: ../../netconnect.pm_.c:169
 msgid "Provider phone number"
 msgstr "���� �������� �����j���a"
 
-#: ../../netconnect.pm_.c:171
+#: ../../netconnect.pm_.c:170
 msgid "Provider dns 1"
 msgstr "�����j����� dns 1"
 
-#: ../../netconnect.pm_.c:172
+#: ../../netconnect.pm_.c:171
 msgid "Provider dns 2"
 msgstr "�����j����� dns 2"
 
-#: ../../netconnect.pm_.c:173
+#: ../../netconnect.pm_.c:172
 msgid "Dialing mode"
 msgstr "��� �� ���a�e"
 
-#: ../../netconnect.pm_.c:175
+#: ../../netconnect.pm_.c:174
 msgid "Account Login (user name)"
 msgstr "�����a�� �� �a��� (���������� ���)"
 
-#: ../../netconnect.pm_.c:176
+#: ../../netconnect.pm_.c:175
 msgid "Account Password"
 msgstr "������� �� �a���"
 
-#: ../../netconnect.pm_.c:177
+#: ../../netconnect.pm_.c:176
 msgid "Confirm Password"
 msgstr "������� �������"
 
-#: ../../netconnect.pm_.c:209
+#: ../../netconnect.pm_.c:208
 msgid "Europe"
 msgstr "������"
 
-#: ../../netconnect.pm_.c:209
+#: ../../netconnect.pm_.c:208
 msgid "Europe (EDSS1)"
 msgstr "������ (EDSS1)"
 
-#: ../../netconnect.pm_.c:211
+#: ../../netconnect.pm_.c:210
 msgid "Rest of the world"
 msgstr "������� ����a"
 
-#: ../../netconnect.pm_.c:211
+#: ../../netconnect.pm_.c:210
 msgid "Rest of the world - no D-Channel (leased lines)"
 msgstr "������� ����� - ��� � -������ (��������� ����j�)"
 
-#: ../../netconnect.pm_.c:215
+#: ../../netconnect.pm_.c:214
 msgid "Which protocol do you want to use ?"
 msgstr "���� �������� ������ �� ��������e ?"
 
-#: ../../netconnect.pm_.c:225
+#: ../../netconnect.pm_.c:224
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:227
+#: ../../netconnect.pm_.c:226
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:229
+#: ../../netconnect.pm_.c:228
 msgid "I don't know"
 msgstr "�� ����"
 
-#: ../../netconnect.pm_.c:234
+#: ../../netconnect.pm_.c:233
 msgid "What kind of card do you have?"
 msgstr "�a��� ����� ������� �����?"
 
-#: ../../netconnect.pm_.c:240
+#: ../../netconnect.pm_.c:239
 msgid "Continue"
 msgstr "�������"